test that unregister_files processes task work
PATCH v2 1/1 test that unregister_files processes task work
Ensure that unregister_files processes task work from defer_taskrun even when not explicitly flushed.
---
v2:
- fix return code when ring init fails
test/file-register.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+)
test/file-register.c +57 -0
@@ -935,6 +935,55 @@ static int test_zero_range_alloc(struct io_uring *ring, int fds[2])return 0 ; } +static int test_defer_taskrun (void ) +{ +struct io_uring_sqe *sqe; +struct io_uring ring; +int ret, fds[2 ]; +char buff ='x' ; + + ret =io_uring_queue_init (8 , &ring, +IORING_SETUP_DEFER_TASKRUN |IORING_SETUP_SINGLE_ISSUER ); +if (ret) { +fprintf (stderr,"ring init\n" ); +return 1 ; + } + + ret =pipe (fds); +if (ret) { +fprintf (stderr,"bad pipes\n" ); +return 1 ; + } + + ret =io_uring_register_files (&ring, &fds[0 ],2 ); + + sqe =io_uring_get_sqe (&ring); +io_uring_prep_read (sqe,0 , &buff,1 ,0 ); + sqe->flags |=IOSQE_FIXED_FILE ; + ret =io_uring_submit (&ring); +if (ret !=1 ) { +fprintf (stderr,"bad submit\n" ); +return 1 ; + } + + ret =write (fds[1 ], &buff,1 ); +if (ret !=1 ) { +fprintf (stderr,"bad pipe write\n" ); +return 1 ; + } + + ret =io_uring_unregister_files (&ring); +if (ret) { +fprintf (stderr,"bad unregister %d\n" , ret); +return 1 ; + } + +close (fds[0 ]); +close (fds[1 ]); +io_uring_queue_exit (&ring); +return 0 ; +} +static int test_file_alloc_ranges (void ) {struct io_uring ring;
@@ -1120,5 +1169,13 @@ int main(int argc, char *argv[])return T_EXIT_FAIL ; } +if (t_probe_defer_taskrun ()) { + ret =test_defer_taskrun (); +if (ret) { +fprintf (stderr,"test_defer_taskrun failed\n" ); +return T_EXIT_FAIL ; + } + } +return T_EXIT_PASS ; }
base-commit: 754bc068ec482c5338a07dd74b7d3892729bb847
Signature · 1 line
2.30.2
test/file-register.c static int test_zero_range_alloc(struct io_uring *ring, int fds[2]) · line 967
Quoted 10 lines · Dylan Yudaken
test/file-register.c +10
-0+ ret =io_uring_register_files (&ring, &fds[0 ],2 ); + + sqe =io_uring_get_sqe (&ring); +io_uring_prep_read (sqe,0 , &buff,1 ,0 ); + sqe->flags |=IOSQE_FIXED_FILE ; + ret =io_uring_submit (&ring); +if (ret !=1 ) { +fprintf (stderr,"bad submit\n" ); +return 1 ; + }
This assignment is meaningless:
ret = io_uring_register_files().
It's overwritten by ret = io_uring_submit() anyway. I suppose we should have an error handler right after register_files().
Signature · 1 line
Ammar Faizi
Quoted 12 lines · Ammar Faizi
Quoted 10 lines · Dylan Yudaken
+ ret =
io_uring_register_files(&ring, &fds[0], 2); +
+ sqe =io_uring_get_sqe(&ring);
+ io_uring_prep_read(sqe, 0, &buff, 1, 0); + sqe->flags |=IOSQE_FIXED_FILE;
+ ret =io_uring_submit(&ring);
+ if (ret != 1) {
+ fprintf(stderr, "bad submit\n"); + return 1;
+ }
Quoted 7 lines
This assignment is meaningless:
ret =
io_uring_register_files().It's overwritten by ret =
io_uring_submit()anyway. I suppose we should have an error handler right afterregister_files().
right - not my best test case :)
I'll add an error handler