splice/tee testing
cover splice/tee testing
Add tee and improve splice tests
Pavel Begunkov (4):
splice/test: improve splice tests
update io_uring.h with tee()
tee/test: add test for tee(2)
splice/tee/tests: test len=0 splice/tee
src/include/liburing/io_uring.h | 1 + test/splice.c | 538 ++++++++++++++++++++++++++------ 2 files changed, 445 insertions(+), 94 deletions(-)
Signature · 1 line
2.24.0
PATCH 1/4 splice/test: improve splice tests
Split and test functionality separately, better cover registered files cases, and validate file\pipe actual data.
--- test/splice.c | 393 ++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 300 insertions(+), 93 deletions(-)
test/splice.c +300 -93
@@ -8,133 +8,305 @@#include "liburing.h" -static int no_splice =0 ; - -static int copy_single (struct io_uring *ring, -int fd_in,loff_t off_in, -int fd_out,loff_t off_out, -int pipe_fds[2 ], -unsigned int len, -unsigned flags1,unsigned flags2) +#define BUF_SIZE (16 * 4096) + +struct test_ctx { +int real_pipe1[2 ]; +int real_pipe2[2 ]; +int real_fd_in; +int real_fd_out; + +/* fds or for registered files */ +int pipe1[2 ]; +int pipe2[2 ]; +int fd_in; +int fd_out; + +void *buf_in; +void *buf_out; +}; + +static unsigned int splice_flags =0 ; +static unsigned int sqe_flags =0 ; +static int has_splice =0 ; + +static int read_buf (int fd,void *buf,int len) { -struct io_uring_cqe *cqe; -struct io_uring_sqe *sqe; -int i, ret =-1 ; +int ret; + +while (len) { + ret =read (fd, buf, len); +if (ret <0 ) +return ret; + len -= ret; + buf += ret; + } +return 0 ; +} + +static int write_buf (int fd,const void *buf,int len) +{ +int ret; + +while (len) { + ret =write (fd, buf, len); +if (ret <0 ) +return ret; + len -= ret; + buf += ret; + } +return 0 ; +} + +static int check_content (int fd,void *buf,int len,const void *src) +{ +int ret; + + ret =read_buf (fd, buf, len); +if (ret) +return ret; + + ret =memcmp (buf, src, len); +return (ret !=0 ) ?-1 :0 ; +} + +static int create_file (const char *filename) +{ +int fd, save_errno; + + fd =open (filename,O_RDWR |O_CREAT ,0644 ); + save_errno = errno; +unlink (filename); + errno = save_errno; +return fd; +} + +static int init_splice_ctx (struct test_ctx *ctx) +{ +int ret, rnd_fd; - sqe =io_uring_get_sqe (ring); -if (!sqe) { -fprintf (stderr,"get sqe failed\n" ); -return -1 ; + ctx->buf_in =calloc (BUF_SIZE ,1 ); +if (!ctx->buf_in) +return 1 ; + ctx->buf_out =calloc (BUF_SIZE ,1 ); +if (!ctx->buf_out) +return 1 ; + + ctx->fd_in =create_file (".splice-test-in" ); +if (ctx->fd_in <0 ) { +perror ("file open" ); +return 1 ; } -io_uring_prep_splice (sqe, fd_in, off_in, pipe_fds[1 ],-1 , - len, flags1); - sqe->flags =IOSQE_IO_LINK ; - - sqe =io_uring_get_sqe (ring); -if (!sqe) { -fprintf (stderr,"get sqe failed\n" ); -return -1 ; + + ctx->fd_out =create_file (".splice-test-out" ); +if (ctx->fd_out <0 ) { +perror ("file open" ); +return 1 ; } -io_uring_prep_splice (sqe, pipe_fds[0 ],-1 , fd_out, off_out, - len, flags2); - - ret =io_uring_submit (ring); -if (ret <2 ) { -/* submitted just one, kernel likely doesn't support splice */ -if (!io_uring_peek_cqe (ring, &cqe) && - cqe->res == -EINVAL ) { - no_splice =1 ; + +/* get random data */ + rnd_fd =open ("/dev/urandom" ,O_RDONLY ); +if (rnd_fd <0 ) +return 1 ; + + ret =read_buf (rnd_fd, ctx->buf_in,BUF_SIZE ); +if (ret !=0 ) +return 1 ; +close (rnd_fd); + +/* populate file */ + ret =write_buf (ctx->fd_in, ctx->buf_in,BUF_SIZE ); +if (ret) +return ret; + +if (pipe (ctx->pipe1) <0 ) +return 1 ; +if (pipe (ctx->pipe2) <0 ) +return 1 ; + + ctx->real_pipe1[0 ] = ctx->pipe1[0 ]; + ctx->real_pipe1[1 ] = ctx->pipe1[1 ]; + ctx->real_pipe2[0 ] = ctx->pipe2[0 ]; + ctx->real_pipe2[1 ] = ctx->pipe2[1 ]; + ctx->real_fd_in = ctx->fd_in; + ctx->real_fd_out = ctx->fd_out; +return 0 ; +} + +static int do_splice (struct io_uring *ring, +int fd_in,loff_t off_in, +int fd_out,loff_t off_out, +unsigned int len) +{ +struct io_uring_cqe *cqe; +struct io_uring_sqe *sqe; +int ret =-1 ; + +while (len) { + sqe =io_uring_get_sqe (ring); +if (!sqe) { +fprintf (stderr,"get sqe failed\n" );return -1 ; } -fprintf (stderr,"sqe submit failed: %d\n" , ret); -return -1 ; - } +io_uring_prep_splice (sqe, fd_in, off_in, fd_out, off_out, + len, splice_flags); + sqe->flags |= sqe_flags; + sqe->user_data =42 ; + + ret =io_uring_submit (ring); +if (ret !=1 ) { +fprintf (stderr,"sqe submit failed: %d\n" , ret); +return ret; + } -for (i =0 ; i <2 ; i++) { ret =io_uring_wait_cqe (ring, &cqe);if (ret <0 ) {fprintf (stderr,"wait completion %d\n" , cqe->res);return ret; } - ret = cqe->res; -if (ret != len) { -fprintf (stderr,"splice: returned %i, expected %i\n" , - cqe->res, len); -return ret <0 ? ret :-1 ; +if (cqe->res <=0 ) { +io_uring_cqe_seen (ring, cqe); +return cqe->res; } + + len -= cqe->res; +if (off_in !=-1 ) + off_in += cqe->res; +if (off_out !=-1 ) + off_out += cqe->res;io_uring_cqe_seen (ring, cqe); } +return 0 ; } -static int test_splice (struct io_uring *ring) +static void check_splice_support (struct io_uring *ring,struct test_ctx *ctx) { -int ret =-1 , len =4 *4096 ; -int fd_out =-1 , fd_in =-1 ; -int pipe_fds[2 ] = {-1 ,-1 }; - -if (pipe (pipe_fds) <0 ) - goto exit; - fd_in =open ("/dev/urandom" ,O_RDONLY ); -if (fd_in <0 ) - goto exit; - fd_out =open (".splice_fd_out" ,O_CREAT |O_WRONLY ,0644 ); -if (fd_out <0 ) - goto exit; -if (ftruncate (fd_out, len) ==-1 ) - goto exit; - - ret =copy_single (ring, fd_in,-1 , fd_out,-1 , pipe_fds, - len,SPLICE_F_MOVE |SPLICE_F_MORE ,0 ); -if (ret == -EINVAL ) { - no_splice =1 ; - goto exit; - } -if (ret) { -fprintf (stderr,"basic splice-copy failed\n" ); - goto exit; - } +int ret; - ret =copy_single (ring, fd_in,0 , fd_out,0 , pipe_fds, - len,0 ,SPLICE_F_MOVE |SPLICE_F_MORE ); + ret =do_splice (ring,-1 ,0 ,-1 ,0 ,BUF_SIZE ); + has_splice = (ret == -EBADF ); +} + +static int splice_to_pipe (struct io_uring *ring,struct test_ctx *ctx) +{ +int ret; + + ret =lseek (ctx->real_fd_in,0 ,SEEK_SET ); +if (ret) +return ret; + +/* implicit file offset */ + ret =do_splice (ring, ctx->fd_in,-1 , ctx->pipe1[1 ],-1 ,BUF_SIZE ); +if (ret) +return ret; + + ret =check_content (ctx->real_pipe1[0 ], ctx->buf_out,BUF_SIZE , + ctx->buf_in); +if (ret) +return ret; + +/* explicit file offset */ + ret =do_splice (ring, ctx->fd_in,0 , ctx->pipe1[1 ],-1 ,BUF_SIZE ); +if (ret) +return ret; + +return check_content (ctx->real_pipe1[0 ], ctx->buf_out,BUF_SIZE , + ctx->buf_in); +} + +static int splice_from_pipe (struct io_uring *ring,struct test_ctx *ctx) +{ +int ret; + + ret =write_buf (ctx->real_pipe1[1 ], ctx->buf_in,BUF_SIZE ); +if (ret) +return ret; + ret =do_splice (ring, ctx->pipe1[0 ],-1 , ctx->fd_out,0 ,BUF_SIZE ); +if (ret) +return ret; + ret =check_content (ctx->real_fd_out, ctx->buf_out,BUF_SIZE , + ctx->buf_in); +if (ret) +return ret; + + ret =ftruncate (ctx->real_fd_out,0 ); +if (ret) +return ret; +return lseek (ctx->real_fd_out,0 ,SEEK_SET ); +} + +static int splice_pipe_to_pipe (struct io_uring *ring,struct test_ctx *ctx) +{ +int ret; + + ret =do_splice (ring, ctx->fd_in,0 , ctx->pipe1[1 ],-1 ,BUF_SIZE ); +if (ret) +return ret; + ret =do_splice (ring, ctx->pipe1[0 ],-1 , ctx->pipe2[1 ],-1 ,BUF_SIZE ); +if (ret) +return ret; + +return check_content (ctx->real_pipe2[0 ], ctx->buf_out,BUF_SIZE , + ctx->buf_in); +} + +static int fail_splice_pipe_offset (struct io_uring *ring,struct test_ctx *ctx) +{ +int ret; + + ret =do_splice (ring, ctx->fd_in,0 , ctx->pipe1[1 ],0 ,BUF_SIZE ); +if (ret != -ESPIPE && ret != -EINVAL ) +return ret; + + ret =do_splice (ring, ctx->pipe1[0 ],0 , ctx->fd_out,0 ,BUF_SIZE ); +if (ret != -ESPIPE && ret != -EINVAL ) +return ret; + +return 0 ; +} + +static int test_splice (struct io_uring *ring,struct test_ctx *ctx) +{ +int ret; + + ret =splice_to_pipe (ring, ctx);if (ret) { -fprintf (stderr,"basic splice with offset failed\n" ); - goto exit; +fprintf (stderr,"splice_to_pipe failed %i %i\n" , + ret, errno); +return ret; } - ret =io_uring_register_files (ring, &fd_in,1 ); + ret =splice_from_pipe (ring, ctx);if (ret) { -fprintf (stderr,"%s: register ret=%d\n" , __FUNCTION__, ret); - goto exit; +fprintf (stderr,"splice_from_pipe failed %i %i\n" , + ret, errno); +return ret; } - ret =copy_single (ring,0 ,0 , fd_out,0 , pipe_fds, - len,SPLICE_F_FD_IN_FIXED ,0 ); + ret =splice_pipe_to_pipe (ring, ctx);if (ret) { -fprintf (stderr,"basic splice with reg files failed\n" ); - goto exit; +fprintf (stderr,"splice_pipe_to_pipe failed %i %i\n" , + ret, errno); +return ret; } - ret =0 ; -exit: -if (fd_out >=0 ) { -unlink (".splice_fd_out" ); -close (fd_out); - } -if (fd_in >=0 ) -close (fd_in); -if (pipe_fds[0 ] >=0 ) { -close (pipe_fds[0 ]); -close (pipe_fds[1 ]); + ret =fail_splice_pipe_offset (ring, ctx); +if (ret) { +fprintf (stderr,"fail_splice_pipe_offset failed %i %i\n" , + ret, errno); +return ret; } -return ret; +return 0 ; }int main (int argc,char *argv[]) {struct io_uring ring; +struct test_ctx ctx;int ret; +int reg_fds[6 ]; ret =io_uring_queue_init (8 , &ring,0 );if (ret) {
@@ -142,15 +314,50 @@ int main(int argc, char *argv[])return 1 ; } - ret =test_splice (&ring); -if (ret && no_splice) { + ret =init_splice_ctx (&ctx); +if (ret) { +fprintf (stderr,"init failed %i %i\n" , ret, errno); +return 1 ; + } + +check_splice_support (&ring, &ctx); +if (!has_splice) {fprintf (stdout,"skip, doesn't support splice()\n" );return 0 ; } + + ret =test_splice (&ring, &ctx);if (ret) { -fprintf (stderr,"test_splice failed %i %i\n" , ret, errno); +fprintf (stderr,"basic splice tests failed\n" );return ret; } + reg_fds[0 ] = ctx.real_pipe1[0 ]; + reg_fds[1 ] = ctx.real_pipe1[1 ]; + reg_fds[2 ] = ctx.real_pipe2[0 ]; + reg_fds[3 ] = ctx.real_pipe2[1 ]; + reg_fds[4 ] = ctx.real_fd_in; + reg_fds[5 ] = ctx.real_fd_out; + ret =io_uring_register_files (&ring, reg_fds,6 ); +if (ret) { +fprintf (stderr,"%s: register ret=%d\n" , __FUNCTION__, ret); +return 1 ; + } + +/* remap fds to registered */ + ctx.pipe1[0 ] =0 ; + ctx.pipe1[1 ] =1 ; + ctx.pipe2[0 ] =2 ; + ctx.pipe2[1 ] =3 ; + ctx.fd_in =4 ; + ctx.fd_out =5 ; + + splice_flags =SPLICE_F_FD_IN_FIXED ; + sqe_flags =IOSQE_FIXED_FILE ; + ret =test_splice (&ring, &ctx); +if (ret) { +fprintf (stderr,"registered fds splice tests failed\n" ); +return ret; + }return 0 ; }
Signature · 1 line
2.24.0
PATCH 2/4 update io_uring.h with tee()
In reply to Pavel Begunkov--- src/include/liburing/io_uring.h | 1 + 1 file changed, 1 insertion(+)
src/include/liburing/io_uring.h +1 -0
@@ -129,6 +129,7 @@ enum {IORING_OP_SPLICE ,IORING_OP_PROVIDE_BUFFERS ,IORING_OP_REMOVE_BUFFERS , +IORING_OP_TEE ,/* this goes last, obviously */ IORING_OP_LAST,
Signature · 1 line
2.24.0
PATCH 3/4 tee/test: add test for tee(2)
In reply to Pavel BegunkovAdd tee() tests with pipe data validation
--- test/splice.c | 157 ++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 133 insertions(+), 24 deletions(-)
test/splice.c +133 -24
@@ -29,6 +29,7 @@ struct test_ctx {static unsigned int splice_flags =0 ;static unsigned int sqe_flags =0 ;static int has_splice =0 ; +static int has_tee =0 ;static int read_buf (int fd,void *buf,int len) {
@@ -133,10 +134,11 @@ static int init_splice_ctx(struct test_ctx *ctx)return 0 ; } -static int do_splice (struct io_uring *ring, -int fd_in,loff_t off_in, -int fd_out,loff_t off_out, -unsigned int len) +static int do_splice_op (struct io_uring *ring, +int fd_in,loff_t off_in, +int fd_out,loff_t off_out, +unsigned int len, +__u8 opcode) {struct io_uring_cqe *cqe;struct io_uring_sqe *sqe;
@@ -152,6 +154,7 @@ static int do_splice(struct io_uring *ring, len, splice_flags); sqe->flags |= sqe_flags; sqe->user_data =42 ; + sqe->opcode = opcode; ret =io_uring_submit (ring);if (ret !=1 ) {
@@ -181,6 +184,21 @@ static int do_splice(struct io_uring *ring,return 0 ; } +static int do_splice (struct io_uring *ring, +int fd_in,loff_t off_in, +int fd_out,loff_t off_out, +unsigned int len) +{ +return do_splice_op (ring, fd_in, off_in, fd_out, off_out, len, +IORING_OP_SPLICE ); +} + +static int do_tee (struct io_uring *ring,int fd_in,int fd_out, +unsigned int len) +{ +return do_splice_op (ring, fd_in,0 , fd_out,0 , len,IORING_OP_TEE ); +} +static void check_splice_support (struct io_uring *ring,struct test_ctx *ctx) {int ret;
@@ -189,6 +207,14 @@ static void check_splice_support(struct io_uring *ring, struct test_ctx *ctx) has_splice = (ret == -EBADF ); } +static void check_tee_support (struct io_uring *ring,struct test_ctx *ctx) +{ +int ret; + + ret =do_tee (ring,-1 ,-1 ,BUF_SIZE ); + has_tee = (ret == -EBADF ); +} +static int splice_to_pipe (struct io_uring *ring,struct test_ctx *ctx) {int ret;
@@ -267,37 +293,119 @@ static int fail_splice_pipe_offset(struct io_uring *ring, struct test_ctx *ctx)return 0 ; } -static int test_splice (struct io_uring *ring,struct test_ctx *ctx) +static int fail_tee_nonpipe (struct io_uring *ring,struct test_ctx *ctx) {int ret; - ret =splice_to_pipe (ring, ctx); -if (ret) { -fprintf (stderr,"splice_to_pipe failed %i %i\n" , - ret, errno); + ret =do_tee (ring, ctx->fd_in, ctx->pipe1[1 ],BUF_SIZE ); +if (ret != -ESPIPE && ret != -EINVAL )return ret; - } - ret =splice_from_pipe (ring, ctx); -if (ret) { -fprintf (stderr,"splice_from_pipe failed %i %i\n" , - ret, errno); +return 0 ; +} + +static int fail_tee_offset (struct io_uring *ring,struct test_ctx *ctx) +{ +int ret; + + ret =do_splice_op (ring, ctx->pipe2[0 ],-1 , ctx->pipe1[1 ],0 , +BUF_SIZE ,IORING_OP_TEE ); +if (ret != -ESPIPE && ret != -EINVAL ) +return ret; + + ret =do_splice_op (ring, ctx->pipe2[0 ],0 , ctx->pipe1[1 ],-1 , +BUF_SIZE ,IORING_OP_TEE ); +if (ret != -ESPIPE && ret != -EINVAL ) +return ret; + +return 0 ; +} + +static int check_tee (struct io_uring *ring,struct test_ctx *ctx) +{ +int ret; + + ret =write_buf (ctx->real_pipe1[1 ], ctx->buf_in,BUF_SIZE ); +if (ret) +return ret; + ret =do_tee (ring, ctx->pipe1[0 ], ctx->pipe2[1 ],BUF_SIZE ); +if (ret)return ret; - } - ret =splice_pipe_to_pipe (ring, ctx); + ret =check_content (ctx->real_pipe1[0 ], ctx->buf_out,BUF_SIZE , + ctx->buf_in);if (ret) { -fprintf (stderr,"splice_pipe_to_pipe failed %i %i\n" , - ret, errno); +fprintf (stderr,"tee(), invalid src data\n" );return ret; } - ret =fail_splice_pipe_offset (ring, ctx); + ret =check_content (ctx->real_pipe2[0 ], ctx->buf_out,BUF_SIZE , + ctx->buf_in);if (ret) { -fprintf (stderr,"fail_splice_pipe_offset failed %i %i\n" , - ret, errno); +fprintf (stderr,"tee(), invalid dst data\n" );return ret; } + +return 0 ; +} + +static int test_splice (struct io_uring *ring,struct test_ctx *ctx) +{ +int ret; + +if (has_splice) { + ret =splice_to_pipe (ring, ctx); +if (ret) { +fprintf (stderr,"splice_to_pipe failed %i %i\n" , + ret, errno); +return ret; + } + + ret =splice_from_pipe (ring, ctx); +if (ret) { +fprintf (stderr,"splice_from_pipe failed %i %i\n" , + ret, errno); +return ret; + } + + ret =splice_pipe_to_pipe (ring, ctx); +if (ret) { +fprintf (stderr,"splice_pipe_to_pipe failed %i %i\n" , + ret, errno); +return ret; + } + + ret =fail_splice_pipe_offset (ring, ctx); +if (ret) { +fprintf (stderr,"fail_splice_pipe_offset failed %i %i\n" , + ret, errno); +return ret; + } + } + +if (has_tee) { + ret =fail_tee_nonpipe (ring, ctx); +if (ret) { +fprintf (stderr,"fail_tee_nonpipe() failed %i %i\n" , + ret, errno); +return ret; + } + + ret =fail_tee_offset (ring, ctx); +if (ret) { +fprintf (stderr,"fail_tee_offset failed %i %i\n" , + ret, errno); +return ret; + } + + ret =check_tee (ring, ctx); +if (ret) { +fprintf (stderr,"check_tee() failed %i %i\n" , + ret, errno); +return ret; + } + } +return 0 ; }
@@ -321,10 +429,11 @@ int main(int argc, char *argv[]) }check_splice_support (&ring, &ctx); -if (!has_splice) { +if (!has_splice)fprintf (stdout,"skip, doesn't support splice()\n" ); -return 0 ; - } +check_tee_support (&ring, &ctx); +if (!has_tee) +fprintf (stdout,"skip, doesn't support tee()\n" ); ret =test_splice (&ring, &ctx);if (ret) {
Signature · 1 line
2.24.0
PATCH 4/4 splice/tee/tests: test len=0 splice/tee
In reply to Pavel BegunkovCheck zero-length splice() and tee().
--- test/splice.c | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-)
test/splice.c +36 -2
@@ -144,7 +144,7 @@ static int do_splice_op(struct io_uring *ring,struct io_uring_sqe *sqe;int ret =-1 ; -while (len) { + do { sqe = io_uring_get_sqe(ring); if (!sqe) { fprintf(stderr, "get sqe failed\n");
@@ -179,7 +179,7 @@ static int do_splice_op(struct io_uring *ring,if (off_out !=-1 ) off_out += cqe->res;io_uring_cqe_seen (ring, cqe); - } + }while (len);return 0 ; }
@@ -215,6 +215,21 @@ static void check_tee_support(struct io_uring *ring, struct test_ctx *ctx) has_tee = (ret == -EBADF ); } +static int check_zero_splice (struct io_uring *ring,struct test_ctx *ctx) +{ +int ret; + + ret =do_splice (ring, ctx->fd_in,-1 , ctx->pipe1[1 ],-1 ,0 ); +if (ret) +return ret; + + ret =do_splice (ring, ctx->pipe2[0 ],-1 , ctx->pipe1[1 ],-1 ,0 ); +if (ret) +return ret; + +return 0 ; +} +static int splice_to_pipe (struct io_uring *ring,struct test_ctx *ctx) {int ret;
@@ -349,11 +364,23 @@ static int check_tee(struct io_uring *ring, struct test_ctx *ctx)return 0 ; } +static int check_zero_tee (struct io_uring *ring,struct test_ctx *ctx) +{ +return do_tee (ring, ctx->pipe2[0 ], ctx->pipe1[1 ],0 ); +} +static int test_splice (struct io_uring *ring,struct test_ctx *ctx) {int ret;if (has_splice) { + ret =check_zero_splice (ring, ctx); +if (ret) { +fprintf (stderr,"check_zero_splice failed %i %i\n" , + ret, errno); +return ret; + } + ret =splice_to_pipe (ring, ctx);if (ret) { fprintf(stderr, "splice_to_pipe failed %i %i\n",
@@ -384,6 +411,13 @@ static int test_splice(struct io_uring *ring, struct test_ctx *ctx) }if (has_tee) { + ret =check_zero_tee (ring, ctx); +if (ret) { +fprintf (stderr,"check_zero_tee() failed %i %i\n" , + ret, errno); +return ret; + } + ret =fail_tee_nonpipe (ring, ctx);if (ret) { fprintf(stderr, "fail_tee_nonpipe() failed %i %i\n",
Signature · 1 line
2.24.0
Quoted 11 lines · Pavel Begunkov
Add tee and improve splice tests
Pavel Begunkov (4):
splice/test: improve splice tests
updateio_uring.hwithtee()
tee/test: add test for tee(2)
splice/tee/tests: test len=0 splice/teesrc/include/liburing/io_uring.h | 1 + test/splice.c | 538 ++++++++++++++++++++++++++------ 2 files changed, 445 insertions(+), 94 deletions(-)
Applied, thanks.
Signature · 1 line
Jens Axboe