pre_read fixes

[fio.git] / engines / splice.c

diff --git a/engines/splice.c b/engines/splice.c
index 440196b8a16e485e530e06b9f8694c8c7d702d4b..28e1fb04efa79f6d99a695aff0b1fe8fd1b62379 100644 (file)
--- a/engines/splice.c
+++ b/engines/splice.c
@@ -20,6 +20,7 @@
 struct spliceio_data {
        int pipe[2];
        int vmsplice_to_user;
+       int vmsplice_to_user_map;
 };
 
 /*
@@ -76,20 +77,27 @@ static int fio_splice_read(struct thread_data *td, struct io_u *io_u)
        struct spliceio_data *sd = td->io_ops->data;
        struct fio_file *f = io_u->file;
        struct iovec iov;
-       int ret = 0 , buflen, mmap_len;
+       int ret , buflen, mmap_len;
        off_t offset;
        void *p, *map;
 
+       ret = 0;
        offset = io_u->offset;
        mmap_len = buflen = io_u->xfer_buflen;
 
-       map = mmap(io_u->xfer_buf, buflen, PROT_READ, MAP_PRIVATE|OS_MAP_ANON, 0, 0);
-       if (map == MAP_FAILED) {
-               td_verror(td, errno, "mmap io_u");
-               return -1;
+       if (sd->vmsplice_to_user_map) {
+               map = mmap(io_u->xfer_buf, buflen, PROT_READ, MAP_PRIVATE|OS_MAP_ANON, 0, 0);
+               if (map == MAP_FAILED) {
+                       td_verror(td, errno, "mmap io_u");
+                       return -1;
+               }
+
+               p = map;
+       } else {
+               map = NULL;
+               p = io_u->xfer_buf;
        }
 
-       p = map;
        while (buflen) {
                int this_len = buflen;
                int flags = 0;
@@ -111,11 +119,23 @@ static int fio_splice_read(struct thread_data *td, struct io_u *io_u)
                buflen -= ret;
                iov.iov_base = p;
                iov.iov_len = ret;
-               p += ret;
 
                while (iov.iov_len) {
                        ret = vmsplice(sd->pipe[0], &iov, 1, SPLICE_F_MOVE);
                        if (ret < 0) {
+                               if (errno == EFAULT &&
+                                   sd->vmsplice_to_user_map) {
+                                       sd->vmsplice_to_user_map = 0;
+                                       munmap(map, mmap_len);
+                                       map = NULL;
+                                       p = io_u->xfer_buf;
+                                       iov.iov_base = p;
+                                       continue;
+                               }
+                               if (errno == EBADF) {
+                                       ret = -EBADF;
+                                       break;
+                               }
                                td_verror(td, errno, "vmsplice");
                                break;
                        } else if (!ret) {
@@ -126,12 +146,13 @@ static int fio_splice_read(struct thread_data *td, struct io_u *io_u)
 
                        iov.iov_len -= ret;
                        iov.iov_base += ret;
+                       p += ret;
                }
                if (ret < 0)
                        break;
        }
 
-       if (munmap(map, mmap_len) < 0) {
+       if (sd->vmsplice_to_user_map && munmap(map, mmap_len) < 0) {
                td_verror(td, errno, "munnap io_u");
                return -1;
        }
@@ -183,7 +204,9 @@ static int fio_splice_write(struct thread_data *td, struct io_u *io_u)
 static int fio_spliceio_queue(struct thread_data *td, struct io_u *io_u)
 {
        struct spliceio_data *sd = td->io_ops->data;
-       int ret;
+       int uninitialized_var(ret);
+
+       fio_ro_check(td, io_u);
 
        if (io_u->ddir == DDIR_READ) {
                if (sd->vmsplice_to_user) {
@@ -212,8 +235,12 @@ static int fio_spliceio_queue(struct thread_data *td, struct io_u *io_u)
                        io_u->error = errno;
        }
 
-       if (io_u->error)
+       if (io_u->error) {
                td_verror(td, io_u->error, "xfer");
+               if (io_u->error == EINVAL)
+                       log_err("fio: looks like splice doesn't work on this"
+                                       " file system\n");
+       }
 
        return FIO_Q_COMPLETED;
 }
@@ -226,7 +253,6 @@ static void fio_spliceio_cleanup(struct thread_data *td)
                close(sd->pipe[0]);
                close(sd->pipe[1]);
                free(sd);
-               td->io_ops->data = NULL;
        }
 }
 
@@ -245,6 +271,12 @@ static int fio_spliceio_init(struct thread_data *td)
         */
        sd->vmsplice_to_user = 1;
 
+       /*
+        * Works with "real" vmsplice to user, eg mapping pages directly.
+        * Reset if we fail.
+        */
+       sd->vmsplice_to_user_map = 1;
+
        /*
         * And if vmsplice_to_user works, we definitely need aligned
         * buffers. Just set ->odirect to force that.
@@ -264,6 +296,7 @@ static struct ioengine_ops ioengine = {
        .cleanup        = fio_spliceio_cleanup,
        .open_file      = generic_open_file,
        .close_file     = generic_close_file,
+       .get_file_size  = generic_get_file_size,
        .flags          = FIO_SYNCIO,
 };