projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mmap engine: make sure that page unaligned syncs work
[fio.git]
/
engines
/
mmap.c
diff --git
a/engines/mmap.c
b/engines/mmap.c
index bb4a81a5a54f8eb2c3a047f866b624deea39cc7a..0922e97e045d7baa3e938867bcfd5dcd8556777d 100644
(file)
--- a/
engines/mmap.c
+++ b/
engines/mmap.c
@@
-22,23
+22,31
@@
static int fio_mmapio_queue(struct thread_data *td, struct io_u *io_u)
else if (io_u->ddir == DDIR_WRITE)
memcpy(f->mmap + real_off, io_u->xfer_buf, io_u->xfer_buflen);
else if (io_u->ddir == DDIR_SYNC) {
else if (io_u->ddir == DDIR_WRITE)
memcpy(f->mmap + real_off, io_u->xfer_buf, io_u->xfer_buflen);
else if (io_u->ddir == DDIR_SYNC) {
- if (msync(f->mmap, f->file_size, MS_SYNC))
+ size_t len = (f->file_size + page_size - 1) & ~page_mask;
+
+ if (msync(f->mmap, len, MS_SYNC)) {
io_u->error = errno;
io_u->error = errno;
+ td_verror(td, io_u->error, "msync");
+ }
}
/*
* not really direct, but should drop the pages from the cache
*/
if (td->odirect && io_u->ddir != DDIR_SYNC) {
}
/*
* not really direct, but should drop the pages from the cache
*/
if (td->odirect && io_u->ddir != DDIR_SYNC) {
- if (msync(f->mmap + real_off, io_u->xfer_buflen, MS_SYNC) < 0)
+ size_t len = (io_u->xfer_buflen + page_size - 1) & ~page_mask;
+ unsigned long long off = real_off & ~page_mask;
+
+ if (msync(f->mmap + off, len, MS_SYNC) < 0) {
io_u->error = errno;
io_u->error = errno;
- if (madvise(f->mmap + real_off, io_u->xfer_buflen, MADV_DONTNEED) < 0)
+ td_verror(td, io_u->error, "msync");
+ }
+ if (madvise(f->mmap + off, len, MADV_DONTNEED) < 0) {
io_u->error = errno;
io_u->error = errno;
+ td_verror(td, io_u->error, "madvise");
+ }
}
}
- if (io_u->error)
- td_verror(td, io_u->error, "sync");
-
return FIO_Q_COMPLETED;
}
return FIO_Q_COMPLETED;
}