splice: use ->o.memalign to indicate we want aligned buffers

[fio.git] / engines / splice.c

diff --git a/engines/splice.c b/engines/splice.c
index 2753bfa0ca3b9d154f418c1c3260b0f492fc6e04..aa00234e4576f17098e14ea2ace651b6b771a61c 100644 (file)
--- a/engines/splice.c
+++ b/engines/splice.c
@@ -81,7 +81,6 @@ static int fio_splice_read(struct thread_data *td, struct io_u *io_u)
        off_t offset;
        void *p, *map;
 
-restart:
        ret = 0;
        offset = io_u->offset;
        mmap_len = buflen = io_u->xfer_buflen;
@@ -120,15 +119,18 @@ restart:
                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) {
+                               if (errno == EFAULT &&
+                                   sd->vmsplice_to_user_map) {
                                        sd->vmsplice_to_user_map = 0;
                                        munmap(map, mmap_len);
-                                       goto restart;
+                                       map = NULL;
+                                       p = io_u->xfer_buf;
+                                       iov.iov_base = p;
+                                       continue;
                                }
                                if (errno == EBADF) {
                                        ret = -EBADF;
@@ -144,6 +146,7 @@ restart:
 
                        iov.iov_len -= ret;
                        iov.iov_base += ret;
+                       p += ret;
                }
                if (ret < 0)
                        break;
@@ -201,7 +204,7 @@ 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);
 
@@ -220,8 +223,10 @@ static int fio_spliceio_queue(struct thread_data *td, struct io_u *io_u)
                        ret = fio_splice_read_old(td, io_u);
        } else if (io_u->ddir == DDIR_WRITE)
                ret = fio_splice_write(td, io_u);
+       else if (io_u->ddir == DDIR_TRIM)
+               ret = do_io_u_trim(td, io_u);
        else
-               ret = fsync(io_u->file->fd);
+               ret = do_io_u_sync(td, io_u);
 
        if (ret != (int) io_u->xfer_buflen) {
                if (ret >= 0) {
@@ -232,8 +237,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;
 }
@@ -275,7 +284,7 @@ static int fio_spliceio_init(struct thread_data *td)
         * buffers. Just set ->odirect to force that.
         */
        if (td_read(td))
-               td->o.odirect = 1;
+               td->o.mem_align = 1;
 
        td->io_ops->data = sd;
        return 0;
@@ -289,7 +298,8 @@ static struct ioengine_ops ioengine = {
        .cleanup        = fio_spliceio_cleanup,
        .open_file      = generic_open_file,
        .close_file     = generic_close_file,
-       .flags          = FIO_SYNCIO,
+       .get_file_size  = generic_get_file_size,
+       .flags          = FIO_SYNCIO | FIO_PIPEIO,
 };
 
 #else /* FIO_HAVE_SPLICE */
@@ -301,7 +311,7 @@ static struct ioengine_ops ioengine = {
  */
 static int fio_spliceio_init(struct thread_data fio_unused *td)
 {
-       fprintf(stderr, "fio: splice not available\n");
+       log_err("fio: splice not available\n");
        return 1;
 }