test that unregister_files processes task work
PATCH v4 1/1 test that unregister_files processes task work
Ensure that unregister_files processes task work from defer_taskrun even when not explicitly flushed.
---
v4:
- I didnt actually send the updated patch in v3
v3:
- look at register_files return code
v2:
- fix return code when ring init fails
test/file-register.c | 61 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+)
test/file-register.c +61 -0
@@ -935,6 +935,59 @@ 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 ); +if (ret) { +fprintf (stderr,"bad register %d\n" , ret); +return 1 ; + } + + 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 +1173,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
Quoted 4 lines · Dylan Yudaken
Ensure that
unregister_filesprocesses task work fromdefer_taskruneven when not explicitly flushed.Signed-off-by Dylan Yudaken <[email protected]>
I feel a bit irritated because the close() and io_uring_queue_exit() don't get invoked in the error paths. But not a big deal, since in the test we'll be exiting soon after that :p
Signature · 1 line
Ammar Faizi
Jens Axboe
maintainerQuoted 9 lines · Ammar Faizi
Quoted 4 lines · Dylan Yudaken
Ensure that
unregister_filesprocesses task work fromdefer_taskruneven when not explicitly flushed.Signed-off-by Dylan Yudaken <[email protected]>I feel a bit irritated because the
close()andio_uring_queue_exit()don't get invoked in the error paths. But not a big deal, since in the test we'll be exiting soon after that :p
Yeah, lots of tests to that - in case of error, just return the error and the test will exit anyway. Obviously not kosher for a real application, but I view it like leaking heap data in that regard. It'll get reaped when the application goes away, and is again not something you'd do in a real application.
Signature · 1 line
Jens Axboe
Quoted 4 lines · Dylan Yudaken
Ensure that
unregister_filesprocesses task work fromdefer_taskruneven when not explicitly flushed.
Applied, thanks!
[1/1] test that unregister_files processes task work
commit: 78463f30a5f3235c8cce82cbf1b8ff437f6536cd
Best regards,
Signature · 1 line
Jens Axboe