X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=engines%2Fsplice.c;h=f35ae17bc574b7af5928e4c73e6e76f8a744b230;hb=97e1fe78db572a48a44c2a8511f8393a8643fc28;hp=868f6e0d3b6977ee3b9b0dea52ba3c52045c90b8;hpb=8b850243258107412710cd38252f0cfb8802593d;p=fio.git

diff --git a/engines/splice.c b/engines/splice.c
index 868f6e0d..f35ae17b 100644
--- a/engines/splice.c
+++ b/engines/splice.c
@@ -15,8 +15,6 @@
 
 #include "../fio.h"
 
-#ifdef FIO_HAVE_SPLICE
-
 struct spliceio_data {
 	int pipe[2];
 	int vmsplice_to_user;
@@ -81,7 +79,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 +117,22 @@ 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;
+					break;
 				}
 				td_verror(td, errno, "vmsplice");
 				break;
@@ -140,6 +144,7 @@ restart:
 
 			iov.iov_len -= ret;
 			iov.iov_base += ret;
+			p += ret;
 		}
 		if (ret < 0)
 			break;
@@ -197,7 +202,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 ret = 0;
 
 	fio_ro_check(td, io_u);
 
@@ -216,8 +221,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) {
@@ -228,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;
 }
@@ -242,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;
 	}
 }
 
@@ -272,7 +282,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;
@@ -286,30 +296,10 @@ static struct ioengine_ops ioengine = {
 	.cleanup	= fio_spliceio_cleanup,
 	.open_file	= generic_open_file,
 	.close_file	= generic_close_file,
-	.flags		= FIO_SYNCIO,
-};
-
-#else /* FIO_HAVE_SPLICE */
-
-/*
- * When we have a proper configure system in place, we simply wont build
- * and install this io engine. For now install a crippled version that
- * just complains and fails to load.
- */
-static int fio_spliceio_init(struct thread_data fio_unused *td)
-{
-	fprintf(stderr, "fio: splice not available\n");
-	return 1;
-}
-
-static struct ioengine_ops ioengine = {
-	.name		= "splice",
-	.version	= FIO_IOOPS_VERSION,
-	.init		= fio_spliceio_init,
+	.get_file_size	= generic_get_file_size,
+	.flags		= FIO_SYNCIO | FIO_PIPEIO,
 };
 
-#endif
-
 static void fio_init fio_spliceio_register(void)
 {
 	register_ioengine(&ioengine);