X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=engines%2Fsplice.c;h=28e1fb04efa79f6d99a695aff0b1fe8fd1b62379;hp=2753bfa0ca3b9d154f418c1c3260b0f492fc6e04;hb=cd98801fbed25dcc49f58cf1451af22f0455a6e6;hpb=2992b059b8f54ac91e723a8bde629b4d8fed513e

diff --git a/engines/splice.c b/engines/splice.c
index 2753bfa0..28e1fb04 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);
 
@@ -232,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;
 }
@@ -289,6 +296,7 @@ static struct ioengine_ops ioengine = {
 	.cleanup	= fio_spliceio_cleanup,
 	.open_file	= generic_open_file,
 	.close_file	= generic_close_file,
+	.get_file_size	= generic_get_file_size,
 	.flags		= FIO_SYNCIO,
 };