mmap engine: fix open-for-size check

[fio.git] / engines / mmap.c

diff --git a/engines/mmap.c b/engines/mmap.c
index bb4a81a5a54f8eb2c3a047f866b624deea39cc7a..f3d55c167691616a9d6478dba51e51154475ff3f 100644 (file)
--- a/engines/mmap.c
+++ b/engines/mmap.c
@@ -1,5 +1,8 @@
 /*
- * regular read/write sync io engine
+ * mmap engine
+ *
+ * IO engine that reads/writes from files by doing memcpy to/from
+ * a memory mapped region of the file.
  *
  */
 #include <stdio.h>
@@ -10,7 +13,6 @@
 #include <sys/mman.h>
 
 #include "../fio.h"
-#include "../os.h"
 
 static int fio_mmapio_queue(struct thread_data *td, struct io_u *io_u)
 {
@@ -22,23 +24,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->io_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)
+       if (td->o.odirect && io_u->ddir != DDIR_SYNC) {
+               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;
 }
 
@@ -50,17 +60,23 @@ static int fio_mmapio_open(struct thread_data *td, struct fio_file *f)
        if (ret)
                return ret;
 
+       /*
+        * for size checkup, don't mmap anything.
+        */
+       if (!f->io_size)
+               return 0;
+
        if (td_rw(td))
                flags = PROT_READ | PROT_WRITE;
        else if (td_write(td)) {
                flags = PROT_WRITE;
 
-               if (td->verify != VERIFY_NONE)
+               if (td->o.verify != VERIFY_NONE)
                        flags |= PROT_READ;
        } else
                flags = PROT_READ;
 
-       f->mmap = mmap(NULL, f->file_size, flags, MAP_SHARED, f->fd, f->file_offset);
+       f->mmap = mmap(NULL, f->io_size, flags, MAP_SHARED, f->fd, f->file_offset);
        if (f->mmap == MAP_FAILED) {
                f->mmap = NULL;
                td_verror(td, errno, "mmap");
@@ -71,12 +87,12 @@ static int fio_mmapio_open(struct thread_data *td, struct fio_file *f)
                goto err;
 
        if (!td_random(td)) {
-               if (madvise(f->mmap, f->file_size, MADV_SEQUENTIAL) < 0) {
+               if (madvise(f->mmap, f->io_size, MADV_SEQUENTIAL) < 0) {
                        td_verror(td, errno, "madvise");
                        goto err;
                }
        } else {
-               if (madvise(f->mmap, f->file_size, MADV_RANDOM) < 0) {
+               if (madvise(f->mmap, f->io_size, MADV_RANDOM) < 0) {
                        td_verror(td, errno, "madvise");
                        goto err;
                }
@@ -93,7 +109,7 @@ static void fio_mmapio_close(struct thread_data fio_unused *td,
                             struct fio_file *f)
 {
        if (f->mmap) {
-               munmap(f->mmap, f->file_size);
+               munmap(f->mmap, f->io_size);
                f->mmap = NULL;
        }
        generic_close_file(td, f);