Let fadvise_hint also apply too mmap engine and madvise

[fio.git] / engines / mmap.c

diff --git a/engines/mmap.c b/engines/mmap.c
index 6464cbada7f2cc189abbb23a282be37e6fbac7c9..28d63b7c30642e5700e6218cd901e3874e4d76c6 100644 (file)
--- a/engines/mmap.c
+++ b/engines/mmap.c
@@ -15,12 +15,11 @@
 #include "../verify.h"
 
 /*
- * Limits us to 1GB of mapped files in total
+ * Limits us to 1GiB of mapped files in total
  */
 #define MMAP_TOTAL_SZ  (1 * 1024 * 1024 * 1024UL)
 
 static unsigned long mmap_map_size;
-static unsigned long mmap_map_mask;
 
 struct fio_mmap_data {
        void *mmap_ptr;
@@ -28,15 +27,48 @@ struct fio_mmap_data {
        off_t mmap_off;
 };
 
+static bool fio_madvise_file(struct thread_data *td, struct fio_file *f,
+                            size_t length)
+
+{
+       struct fio_mmap_data *fmd = FILE_ENG_DATA(f);
+
+       if (!td->o.fadvise_hint)
+               return true;
+
+       if (!td_random(td)) {
+               if (posix_madvise(fmd->mmap_ptr, length, POSIX_MADV_SEQUENTIAL) < 0) {
+                       td_verror(td, errno, "madvise");
+                       return false;
+               }
+       } else {
+               if (posix_madvise(fmd->mmap_ptr, length, POSIX_MADV_RANDOM) < 0) {
+                       td_verror(td, errno, "madvise");
+                       return false;
+               }
+       }
+       if (posix_madvise(fmd->mmap_ptr, length, POSIX_MADV_DONTNEED) < 0) {
+               td_verror(td, errno, "madvise");
+               return false;
+       }
+
+#ifdef FIO_MADV_FREE
+       if (f->filetype == FIO_TYPE_BLOCK)
+               (void) posix_madvise(fmd->mmap_ptr, fmd->mmap_sz, FIO_MADV_FREE);
+#endif
+
+       return true;
+}
+
 static int fio_mmap_file(struct thread_data *td, struct fio_file *f,
                         size_t length, off_t off)
 {
        struct fio_mmap_data *fmd = FILE_ENG_DATA(f);
        int flags = 0;
 
-       if (td_rw(td))
+       if (td_rw(td) && !td->o.verify_only)
                flags = PROT_READ | PROT_WRITE;
-       else if (td_write(td)) {
+       else if (td_write(td) && !td->o.verify_only) {
                flags = PROT_WRITE;
 
                if (td->o.verify != VERIFY_NONE)
@@ -51,17 +83,8 @@ static int fio_mmap_file(struct thread_data *td, struct fio_file *f,
                goto err;
        }
 
-       if (!td_random(td)) {
-               if (posix_madvise(fmd->mmap_ptr, length, POSIX_MADV_SEQUENTIAL) < 0) {
-                       td_verror(td, errno, "madvise");
-                       goto err;
-               }
-       } else {
-               if (posix_madvise(fmd->mmap_ptr, length, POSIX_MADV_RANDOM) < 0) {
-                       td_verror(td, errno, "madvise");
-                       goto err;
-               }
-       }
+       if (!fio_madvise_file(td, f, length))
+               goto err;
 
 err:
        if (td->error && fmd->mmap_ptr)
@@ -103,6 +126,11 @@ static int fio_mmapio_prep_full(struct thread_data *td, struct io_u *io_u)
 
        if (fio_file_partial_mmap(f))
                return EINVAL;
+       if (io_u->offset != (size_t) io_u->offset ||
+           f->io_size != (size_t) f->io_size) {
+               fio_file_set_partial_mmap(f);
+               return EINVAL;
+       }
 
        fmd->mmap_sz = f->io_size;
        fmd->mmap_off = 0;
@@ -124,7 +152,7 @@ static int fio_mmapio_prep(struct thread_data *td, struct io_u *io_u)
         * It fits within existing mapping, use it
         */
        if (io_u->offset >= fmd->mmap_off &&
-           io_u->offset + io_u->buflen < fmd->mmap_off + fmd->mmap_sz)
+           io_u->offset + io_u->buflen <= fmd->mmap_off + fmd->mmap_sz)
                goto done;
 
        /*
@@ -193,26 +221,15 @@ static int fio_mmapio_queue(struct thread_data *td, struct io_u *io_u)
 static int fio_mmapio_init(struct thread_data *td)
 {
        struct thread_options *o = &td->o;
-       unsigned long shift, mask;
 
-       if ((td->o.rw_min_bs & page_mask) &&
+       if ((o->rw_min_bs & page_mask) &&
            (o->odirect || o->fsync_blocks || o->fdatasync_blocks)) {
                log_err("fio: mmap options dictate a minimum block size of "
                        "%llu bytes\n", (unsigned long long) page_size);
                return 1;
        }
 
-       mmap_map_size = MMAP_TOTAL_SZ / td->o.nr_files;
-       mask = mmap_map_size;
-       shift = 0;
-       do {
-               mask >>= 1;
-               if (!mask)
-                       break;
-               shift++;
-       } while (1);
-
-       mmap_map_mask = 1UL << shift;
+       mmap_map_size = MMAP_TOTAL_SZ / o->nr_files;
        return 0;
 }
 
@@ -227,8 +244,8 @@ static int fio_mmapio_open_file(struct thread_data *td, struct fio_file *f)
 
        fmd = calloc(1, sizeof(*fmd));
        if (!fmd) {
-               int fio_unused ret;
-               ret = generic_close_file(td, f);
+               int fio_unused __ret;
+               __ret = generic_close_file(td, f);
                return 1;
        }
 
@@ -242,24 +259,11 @@ static int fio_mmapio_close_file(struct thread_data *td, struct fio_file *f)
 
        FILE_SET_ENG_DATA(f, NULL);
        free(fmd);
+       fio_file_clear_partial_mmap(f);
 
        return generic_close_file(td, f);
 }
 
-static int fio_mmapio_invalidate(struct thread_data *td, struct fio_file *f)
-{
-       struct fio_mmap_data *fmd = FILE_ENG_DATA(f);
-       int ret;
-
-       ret = posix_madvise(fmd->mmap_ptr, fmd->mmap_sz, POSIX_MADV_DONTNEED);
-#ifdef FIO_MADV_FREE
-       if (f->filetype == FIO_TYPE_BD)
-               (void) posix_madvise(fmd->mmap_ptr, fmd->mmap_sz, FIO_MADV_FREE);
-#endif
-
-       return ret;
-}
-
 static struct ioengine_ops ioengine = {
        .name           = "mmap",
        .version        = FIO_IOOPS_VERSION,
@@ -268,7 +272,6 @@ static struct ioengine_ops ioengine = {
        .queue          = fio_mmapio_queue,
        .open_file      = fio_mmapio_open_file,
        .close_file     = fio_mmapio_close_file,
-       .invalidate     = fio_mmapio_invalidate,
        .get_file_size  = generic_get_file_size,
        .flags          = FIO_SYNCIO | FIO_NOEXTEND,
 };