mmap engine: make sure that page unaligned syncs work

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

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) {
-               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;
+                       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) {
-               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;
-               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;
+                       td_verror(td, io_u->error, "madvise");
+               }
        }
 
-       if (io_u->error)
-               td_verror(td, io_u->error, "sync");
-
        return FIO_Q_COMPLETED;
 }
 

diff --git a/fio.c b/fio.c
index 85eb22be94207c518ac71ef3dec59ffb955d9956..e6bd18a0c037390f1ec91764007a61a07dc7159e 100644 (file)
--- a/fio.c
+++ b/fio.c
@@ -37,7 +37,8 @@
 #include "fio.h"
 #include "os.h"
 
-static unsigned long page_mask;
+unsigned long page_mask;
+unsigned long page_size;
 #define ALIGN(buf)     \
        (char *) (((unsigned long) (buf) + page_mask) & ~page_mask)
 
@@ -1158,6 +1159,7 @@ int main(int argc, char *argv[])
                return 1;
        }
 
+       page_size = ps;
        page_mask = ps - 1;
 
        if (write_bw_log) {

diff --git a/fio.h b/fio.h
index 5098ff8f615d42104f298f04867366a72256a159..7210422643b55dd2ad0a8e837ac9c6f83aded76d 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -534,6 +534,7 @@ extern FILE *f_out;
 extern FILE *f_err;
 extern int temp_stall_ts;
 extern unsigned long long mlock_size;
+extern unsigned long page_mask, page_size;
 
 extern struct thread_data *threads;