splice: update to new vmsplice-to-user interface

[fio.git] / engines / splice.c

diff --git a/engines/splice.c b/engines/splice.c
index 9386983c5daae1b899e491ae434ba0f4d26e1ed0..440196b8a16e485e530e06b9f8694c8c7d702d4b 100644 (file)
--- a/engines/splice.c
+++ b/engines/splice.c
@@ -11,6 +11,7 @@
 #include <errno.h>
 #include <assert.h>
 #include <sys/poll.h>
+#include <sys/mman.h>
 
 #include "../fio.h"
 
@@ -75,25 +76,36 @@ 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, buflen;
+       int ret = 0 , buflen, mmap_len;
        off_t offset;
-       void *p;
+       void *p, *map;
 
        offset = io_u->offset;
-       buflen = io_u->xfer_buflen;
-       p = io_u->xfer_buf;
+       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;
+       }
+
+       p = map;
        while (buflen) {
                int this_len = buflen;
+               int flags = 0;
 
-               if (this_len > SPLICE_DEF_SIZE)
+               if (this_len > SPLICE_DEF_SIZE) {
                        this_len = SPLICE_DEF_SIZE;
+                       flags = SPLICE_F_MORE;
+               }
 
-               ret = splice(f->fd, &offset, sd->pipe[1], NULL, this_len, SPLICE_F_MORE);
+               ret = splice(f->fd, &offset, sd->pipe[1], NULL, this_len,flags);
                if (ret < 0) {
                        if (errno == ENODATA || errno == EAGAIN)
                                continue;
 
-                       return -errno;
+                       td_verror(td, errno, "splice-from-fd");
+                       break;
                }
 
                buflen -= ret;
@@ -103,15 +115,28 @@ static int fio_splice_read(struct thread_data *td, struct io_u *io_u)
 
                while (iov.iov_len) {
                        ret = vmsplice(sd->pipe[0], &iov, 1, SPLICE_F_MOVE);
-                       if (ret < 0)
-                               return -errno;
-                       else if (!ret)
-                               return -ENODATA;
+                       if (ret < 0) {
+                               td_verror(td, errno, "vmsplice");
+                               break;
+                       } else if (!ret) {
+                               td_verror(td, ENODATA, "vmsplice");
+                               ret = -1;
+                               break;
+                       }
 
                        iov.iov_len -= ret;
                        iov.iov_base += ret;
                }
+               if (ret < 0)
+                       break;
+       }
+
+       if (munmap(map, mmap_len) < 0) {
+               td_verror(td, errno, "munnap io_u");
+               return -1;
        }
+       if (ret < 0)
+               return ret;
 
        return io_u->xfer_buflen;
 }
@@ -220,6 +245,13 @@ static int fio_spliceio_init(struct thread_data *td)
         */
        sd->vmsplice_to_user = 1;
 
+       /*
+        * And if vmsplice_to_user works, we definitely need aligned
+        * buffers. Just set ->odirect to force that.
+        */
+       if (td_read(td))
+               td->o.odirect = 1;
+
        td->io_ops->data = sd;
        return 0;
 }