t/zbd: avoid test case 31 failure with small devices

[fio.git] / engines / mmap.c

diff --git a/engines/mmap.c b/engines/mmap.c
index 28d63b7c30642e5700e6218cd901e3874e4d76c6..55ba1ab36c9a163bec27a788ee05497ef94c6cad 100644 (file)
--- a/engines/mmap.c
+++ b/engines/mmap.c
@@ -7,11 +7,11 @@
  */
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <errno.h>
 #include <sys/mman.h>
 
 #include "../fio.h"
+#include "../optgroup.h"
 #include "../verify.h"
 
 /*
@@ -27,11 +27,40 @@ struct fio_mmap_data {
        off_t mmap_off;
 };
 
+#ifdef CONFIG_HAVE_THP
+struct mmap_options {
+       void *pad;
+       unsigned int thp;
+};
+
+static struct fio_option options[] = {
+       {
+               .name   = "thp",
+               .lname  = "Transparent Huge Pages",
+               .type   = FIO_OPT_INT,
+               .off1   = offsetof(struct mmap_options, thp),
+               .help   = "Memory Advise Huge Page",
+               .category = FIO_OPT_C_ENGINE,
+               .group  = FIO_OPT_G_MMAP,
+       },
+       {
+               .name = NULL,
+       },
+};
+#endif
+
 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);
+#ifdef CONFIG_HAVE_THP
+       struct mmap_options *o = td->eo;
+
+       /* Ignore errors on this optional advisory */
+       if (o->thp)
+               madvise(fmd->mmap_ptr, length, MADV_HUGEPAGE);
+#endif
 
        if (!td->o.fadvise_hint)
                return true;
@@ -47,24 +76,31 @@ static bool fio_madvise_file(struct thread_data *td, struct fio_file *f,
                        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;
 }
 
+#ifdef CONFIG_HAVE_THP
+static int fio_mmap_get_shared(struct thread_data *td)
+{
+       struct mmap_options *o = td->eo;
+
+       if (o->thp)
+               return MAP_PRIVATE;
+       return MAP_SHARED;
+}
+#else
+static int fio_mmap_get_shared(struct thread_data *td)
+{
+       return MAP_SHARED;
+}
+#endif
+
 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;
+       int flags = 0, shared = fio_mmap_get_shared(td);
 
        if (td_rw(td) && !td->o.verify_only)
                flags = PROT_READ | PROT_WRITE;
@@ -76,7 +112,7 @@ static int fio_mmap_file(struct thread_data *td, struct fio_file *f,
        } else
                flags = PROT_READ;
 
-       fmd->mmap_ptr = mmap(NULL, length, flags, MAP_SHARED, f->fd, off);
+       fmd->mmap_ptr = mmap(NULL, length, flags, shared, f->fd, off);
        if (fmd->mmap_ptr == MAP_FAILED) {
                fmd->mmap_ptr = NULL;
                td_verror(td, errno, "mmap");
@@ -86,6 +122,16 @@ static int fio_mmap_file(struct thread_data *td, struct fio_file *f,
        if (!fio_madvise_file(td, f, length))
                goto err;
 
+       if (posix_madvise(fmd->mmap_ptr, length, POSIX_MADV_DONTNEED) < 0) {
+               td_verror(td, errno, "madvise");
+               goto err;
+       }
+
+#ifdef FIO_MADV_FREE
+       if (f->filetype == FIO_TYPE_BLOCK)
+               (void) posix_madvise(fmd->mmap_ptr, fmd->mmap_sz, FIO_MADV_FREE);
+#endif
+
 err:
        if (td->error && fmd->mmap_ptr)
                munmap(fmd->mmap_ptr, length);
@@ -177,7 +223,8 @@ done:
        return 0;
 }
 
-static int fio_mmapio_queue(struct thread_data *td, struct io_u *io_u)
+static enum fio_q_status fio_mmapio_queue(struct thread_data *td,
+                                         struct io_u *io_u)
 {
        struct fio_file *f = io_u->file;
        struct fio_mmap_data *fmd = FILE_ENG_DATA(f);
@@ -274,6 +321,10 @@ static struct ioengine_ops ioengine = {
        .close_file     = fio_mmapio_close_file,
        .get_file_size  = generic_get_file_size,
        .flags          = FIO_SYNCIO | FIO_NOEXTEND,
+#ifdef CONFIG_HAVE_THP
+       .options        = options,
+       .option_struct_size = sizeof(struct mmap_options),
+#endif
 };
 
 static void fio_init fio_mmapio_register(void)