Enable preadv2/pwritev2 engines by default on Linux

[fio.git] / engines / sync.c

diff --git a/engines/sync.c b/engines/sync.c
index 41612dfa8c31ba0f8fc81436d162fee1ece500da..433e4fa24afaa6e7f94cb0d5cfa3ea2176558342 100644 (file)
--- a/engines/sync.c
+++ b/engines/sync.c
@@ -13,6 +13,7 @@
 #include <assert.h>
 
 #include "../fio.h"
+#include "../optgroup.h"
 
 /*
  * Sync engine uses engine_data to store last offset
@@ -31,6 +32,28 @@ struct syncio_data {
        enum fio_ddir last_ddir;
 };
 
+#ifdef FIO_HAVE_PWRITEV2
+struct psyncv2_options {
+       void *pad;
+       unsigned int hipri;
+};
+
+static struct fio_option options[] = {
+       {
+               .name   = "hipri",
+               .lname  = "RWF_HIPRI",
+               .type   = FIO_OPT_STR_SET,
+               .off1   = offsetof(struct psyncv2_options, hipri),
+               .help   = "Set RWF_HIPRI for pwritev2/preadv2",
+               .category = FIO_OPT_C_ENGINE,
+               .group  = FIO_OPT_G_INVALID,
+       },
+       {
+               .name   = NULL,
+       },
+};
+#endif
+
 static int fio_syncio_prep(struct thread_data *td, struct io_u *io_u)
 {
        struct fio_file *f = io_u->file;
@@ -63,8 +86,10 @@ static int fio_io_end(struct thread_data *td, struct io_u *io_u, int ret)
                        io_u->error = errno;
        }
 
-       if (io_u->error)
+       if (io_u->error) {
+               io_u_log_error(td, io_u);
                td_verror(td, io_u->error, "xfer");
+       }
 
        return FIO_Q_COMPLETED;
 }
@@ -96,6 +121,38 @@ static int fio_pvsyncio_queue(struct thread_data *td, struct io_u *io_u)
 }
 #endif
 
+#ifdef FIO_HAVE_PWRITEV2
+static int fio_pvsyncio2_queue(struct thread_data *td, struct io_u *io_u)
+{
+       struct syncio_data *sd = td->io_ops->data;
+       struct psyncv2_options *o = td->eo;
+       struct iovec *iov = &sd->iovecs[0];
+       struct fio_file *f = io_u->file;
+       int ret, flags = 0;
+
+       fio_ro_check(td, io_u);
+
+       if (o->hipri)
+               flags |= RWF_HIPRI;
+
+       iov->iov_base = io_u->xfer_buf;
+       iov->iov_len = io_u->xfer_buflen;
+
+       if (io_u->ddir == DDIR_READ)
+               ret = preadv2(f->fd, iov, 1, io_u->offset, flags);
+       else if (io_u->ddir == DDIR_WRITE)
+               ret = pwritev2(f->fd, iov, 1, io_u->offset, flags);
+       else if (io_u->ddir == DDIR_TRIM) {
+               do_io_u_trim(td, io_u);
+               return FIO_Q_COMPLETED;
+       } else
+               ret = do_io_u_sync(td, io_u);
+
+       return fio_io_end(td, io_u, ret);
+}
+#endif
+
+
 static int fio_psyncio_queue(struct thread_data *td, struct io_u *io_u)
 {
        struct fio_file *f = io_u->file;
@@ -315,9 +372,11 @@ static void fio_vsyncio_cleanup(struct thread_data *td)
 {
        struct syncio_data *sd = td->io_ops->data;
 
-       free(sd->iovecs);
-       free(sd->io_us);
-       free(sd);
+       if (sd) {
+               free(sd->iovecs);
+               free(sd->io_us);
+               free(sd);
+       }
 }
 
 static struct ioengine_ops ioengine_rw = {
@@ -370,6 +429,22 @@ static struct ioengine_ops ioengine_pvrw = {
 };
 #endif
 
+#ifdef FIO_HAVE_PWRITEV2
+static struct ioengine_ops ioengine_pvrw2 = {
+       .name           = "pvsync2",
+       .version        = FIO_IOOPS_VERSION,
+       .init           = fio_vsyncio_init,
+       .cleanup        = fio_vsyncio_cleanup,
+       .queue          = fio_pvsyncio2_queue,
+       .open_file      = generic_open_file,
+       .close_file     = generic_close_file,
+       .get_file_size  = generic_get_file_size,
+       .flags          = FIO_SYNCIO,
+       .options        = options,
+       .option_struct_size     = sizeof(struct psyncv2_options),
+};
+#endif
+
 static void fio_init fio_syncio_register(void)
 {
        register_ioengine(&ioengine_rw);
@@ -378,6 +453,9 @@ static void fio_init fio_syncio_register(void)
 #ifdef CONFIG_PWRITEV
        register_ioengine(&ioengine_pvrw);
 #endif
+#ifdef FIO_HAVE_PWRITEV2
+       register_ioengine(&ioengine_pvrw2);
+#endif
 }
 
 static void fio_exit fio_syncio_unregister(void)
@@ -388,4 +466,7 @@ static void fio_exit fio_syncio_unregister(void)
 #ifdef CONFIG_PWRITEV
        unregister_ioengine(&ioengine_pvrw);
 #endif
+#ifdef FIO_HAVE_PWRITEV2
+       unregister_ioengine(&ioengine_pvrw2);
+#endif
 }