From: Jens Axboe <axboe@kernel.dk>
Date: Thu, 16 May 2013 18:36:57 +0000 (+0200)
Subject: sync engine: add support for pwritev/preadv
X-Git-Tag: fio-2.1.1~28
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=07fc0acd46e024b4df7ac60a3424fa1434a84600

sync engine: add support for pwritev/preadv

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/configure b/configure
index 5939bed7..95765cce 100755
--- a/configure
+++ b/configure
@@ -1066,6 +1066,23 @@ if compile_prog "" "" "RLIMIT_MEMLOCK"; then
 fi
 echo "RLIMIT_MEMLOCK                $rlimit_memlock"
 
+##########################################
+# Check whether we have pwritev/preadv
+pwritev="no"
+cat > $TMPC << EOF
+#include <stdio.h>
+#include <sys/uio.h>
+int main(int argc, char **argv)
+{
+  return pwritev(0, NULL, 1, 0) + preadv(0, NULL, 1, 0);
+}
+EOF
+if compile_prog "" "" "pwritev"; then
+  pwritev="yes"
+fi
+echo "pwritev/preadv                $pwritev"
+
+
 #############################################################################
 
 if test "$wordsize" = "64" ; then
@@ -1181,6 +1198,9 @@ fi
 if test "$rlimit_memlock" = "yes" ; then
   output_sym "CONFIG_RLIMIT_MEMLOCK"
 fi
+if test "$pwritev" = "yes" ; then
+  output_sym "CONFIG_PWRITEV"
+fi
 
 echo "LIBS+=$LIBS" >> $config_host_mak
 echo "CFLAGS+=$CFLAGS" >> $config_host_mak
diff --git a/engines/sync.c b/engines/sync.c
index 87796289..17714588 100644
--- a/engines/sync.c
+++ b/engines/sync.c
@@ -69,6 +69,33 @@ static int fio_io_end(struct thread_data *td, struct io_u *io_u, int ret)
 	return FIO_Q_COMPLETED;
 }
 
+#ifdef CONFIG_PWRITEV
+static int fio_pvsyncio_queue(struct thread_data *td, struct io_u *io_u)
+{
+	struct syncio_data *sd = td->io_ops->data;
+	struct iovec *iov = &sd->iovecs[0];
+	struct fio_file *f = io_u->file;
+	int ret;
+
+	fio_ro_check(td, io_u);
+
+	iov->iov_base = io_u->xfer_buf;
+	iov->iov_len = io_u->xfer_buflen;
+
+	if (io_u->ddir == DDIR_READ)
+		ret = preadv(f->fd, iov, 1, io_u->offset);
+	else if (io_u->ddir == DDIR_WRITE)
+		ret = pwritev(f->fd, iov, 1, io_u->offset);
+	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;
@@ -329,11 +356,26 @@ static struct ioengine_ops ioengine_vrw = {
 	.flags		= FIO_SYNCIO,
 };
 
+#ifdef CONFIG_PWRITEV
+static struct ioengine_ops ioengine_pvrw = {
+	.name		= "pvsync",
+	.version	= FIO_IOOPS_VERSION,
+	.init		= fio_vsyncio_init,
+	.cleanup	= fio_vsyncio_cleanup,
+	.queue		= fio_pvsyncio_queue,
+	.open_file	= generic_open_file,
+	.close_file	= generic_close_file,
+	.get_file_size	= generic_get_file_size,
+	.flags		= FIO_SYNCIO,
+};
+#endif
+
 static void fio_init fio_syncio_register(void)
 {
 	register_ioengine(&ioengine_rw);
 	register_ioengine(&ioengine_prw);
 	register_ioengine(&ioengine_vrw);
+	register_ioengine(&ioengine_pvrw);
 }
 
 static void fio_exit fio_syncio_unregister(void)
@@ -341,4 +383,5 @@ static void fio_exit fio_syncio_unregister(void)
 	unregister_ioengine(&ioengine_rw);
 	unregister_ioengine(&ioengine_prw);
 	unregister_ioengine(&ioengine_vrw);
+	unregister_ioengine(&ioengine_pvrw);
 }
diff --git a/options.c b/options.c
index 7a4e7b57..e9df6a8e 100644
--- a/options.c
+++ b/options.c
@@ -1302,6 +1302,11 @@ struct fio_option fio_options[FIO_MAX_OPTS] = {
 			  { .ival = "vsync",
 			    .help = "Use readv/writev",
 			  },
+#ifdef CONFIG_PWRITEV
+			  { .ival = "pvsync",
+			    .help = "Use preadv/pwritev",
+			  },
+#endif
 #ifdef CONFIG_LIBAIO
 			  { .ival = "libaio",
 			    .help = "Linux native asynchronous IO",