X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=engines%2Fsplice.c;h=be16cbbfdf4a95341de6da7d1572f6612c13841b;hb=4aae38a645f3315ca2f8cc57a7ec4110ba7d8319;hp=5a288b5532c013d7e3cb8d58a6c131b76c488d82;hpb=3a6d267d644226983a430cf0f217c27f4c38cd45;p=fio.git

diff --git a/engines/splice.c b/engines/splice.c
index 5a288b55..be16cbbf 100644
--- 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;
 }
@@ -246,7 +255,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;
 	}
 }
 
@@ -290,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 */
@@ -302,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;
 }