Add appropriate warning in mmap engine for large maps failing

[fio.git] / engines / mmap.c

diff --git a/engines/mmap.c b/engines/mmap.c
index 604f8b0902e75d9c0af70eca7ad8996b4c77f57d..5b8d800c4190177ff33db12681a87c2659105761 100644 (file)
--- a/engines/mmap.c
+++ b/engines/mmap.c
@@ -9,7 +9,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
-#include <assert.h>
 #include <sys/mman.h>
 
 #include "../fio.h"
@@ -80,8 +79,12 @@ static int fio_mmapio_open(struct thread_data *td, struct fio_file *f)
 
        f->mmap = mmap(NULL, f->io_size, flags, MAP_SHARED, f->fd, f->file_offset);
        if (f->mmap == MAP_FAILED) {
+               int err = errno;
+
                f->mmap = NULL;
-               td_verror(td, errno, "mmap");
+               td_verror(td, err, "mmap");
+               if (err == EINVAL && f->io_size > 2*1024*1024*1024UL)
+                       log_err("fio: mmap size likely too large\n");
                goto err;
        }
 
@@ -107,14 +110,23 @@ err:
        return 1;
 }
 
-static void fio_mmapio_close(struct thread_data fio_unused *td,
-                            struct fio_file *f)
+static int fio_mmapio_close(struct thread_data fio_unused *td,
+                           struct fio_file *f)
 {
+       int ret = 0, ret2;
+
        if (f->mmap) {
-               munmap(f->mmap, f->io_size);
+               if (munmap(f->mmap, f->io_size) < 0)
+                       ret = errno;
+
                f->mmap = NULL;
        }
-       generic_close_file(td, f);
+
+       ret2 = generic_close_file(td, f);
+       if (!ret && ret2)
+               ret = ret2;
+
+       return ret;
 }
 
 static struct ioengine_ops ioengine = {
@@ -123,6 +135,7 @@ static struct ioengine_ops ioengine = {
        .queue          = fio_mmapio_queue,
        .open_file      = fio_mmapio_open,
        .close_file     = fio_mmapio_close,
+       .get_file_size  = generic_get_file_size,
        .flags          = FIO_SYNCIO | FIO_NOEXTEND,
 };