test timeout updates
v2 cover test timeout updates
v2: [1/2] bit 1 for IORING_TIMEOUT_UPDATE
[2/2] test sqpoll
Pavel Begunkov (2):
Add timeout update
test/timeout: test timeout updates
src/include/liburing.h | 9 ++ src/include/liburing/io_uring.h | 1 + test/timeout.c | 272 +++++++++++++++++++++++++++++++- 3 files changed, 281 insertions(+), 1 deletion(-)
Signature · 1 line
2.24.0
PATCH v2 1/2 Add timeout update
Add io_uring_prep_timeout_update() helper and update io_uring.h.
Signed-off-by Pavel Begunkov <[email protected]>
--- src/include/liburing.h | 9 +++++++++ src/include/liburing/io_uring.h | 1 + 2 files changed, 10 insertions(+)
src/include/liburing.h +9 -0
@@ -326,6 +326,15 @@ static inline void io_uring_prep_timeout_remove(struct io_uring_sqe *sqe, sqe->timeout_flags = flags; } +static inline void io_uring_prep_timeout_update (struct io_uring_sqe *sqe, +struct __kernel_timespec *ts, +__u64 user_data,unsigned flags) +{ +io_uring_prep_rw (IORING_OP_TIMEOUT_REMOVE , sqe,-1 , + (void *)(unsigned long )user_data,0 , (__u64 )ts); + sqe->timeout_flags = flags |IORING_TIMEOUT_UPDATE ; +} +static inline void io_uring_prep_accept (struct io_uring_sqe *sqe,int fd,struct sockaddr *addr,socklen_t *addrlen,int flags)
src/include/liburing/io_uring.h +1 -0
@@ -155,6 +155,7 @@ enum {* sqe->timeout_flags */ #define IORING_TIMEOUT_ABS (1U << 0) +#define IORING_TIMEOUT_UPDATE (1U << 1)/* * sqe->splice_flags
Signature · 1 line
2.24.0
PATCH v2 2/2 test/timeout: test timeout updates
In reply to Pavel BegunkovTest timeout updates if supported. Fuzzy checks that it sustains specified timings. Tests async/linked update, rel/abs, short and longer delays.
Signed-off-by Pavel Begunkov <[email protected]>
--- test/timeout.c | 272 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 271 insertions(+), 1 deletion(-)
test/timeout.c +271 -1
@@ -965,10 +965,213 @@ err:return 1 ; } +static int test_update_timeout (struct io_uring *ring,unsigned long ms, +bool abs,bool async,bool linked) +{ +struct io_uring_sqe *sqe; +struct io_uring_cqe *cqe; +struct __kernel_timespec ts, ts_upd; +unsigned long long exp_ms, base_ms =10000 ; +struct timeval tv; +int ret, i, nr =2 ; +__u32 mode = abs ?IORING_TIMEOUT_ABS :0 ; + +msec_to_ts (&ts_upd, ms); +gettimeofday (&tv,NULL ); + + sqe =io_uring_get_sqe (ring); +if (!sqe) { +fprintf (stderr,"%s: get sqe failed\n" , __FUNCTION__); + goto err; + } +msec_to_ts (&ts, base_ms); +io_uring_prep_timeout (sqe, &ts,0 ,0 ); + sqe->user_data =1 ; + +if (linked) { + sqe =io_uring_get_sqe (ring); +if (!sqe) { +fprintf (stderr,"%s: get sqe failed\n" , __FUNCTION__); + goto err; + } +io_uring_prep_nop (sqe); + sqe->user_data =3 ; + sqe->flags =IOSQE_IO_LINK ; +if (async) + sqe->flags |=IOSQE_ASYNC ; + nr++; + } + + sqe =io_uring_get_sqe (ring); +if (!sqe) { +fprintf (stderr,"%s: get sqe failed\n" , __FUNCTION__); + goto err; + } +io_uring_prep_timeout_update (sqe, &ts_upd,1 , mode); + sqe->user_data =2 ; +if (async) + sqe->flags |=IOSQE_ASYNC ; + + ret =io_uring_submit (ring); +if (ret != nr) { +fprintf (stderr,"%s: sqe submit failed: %d\n" , __FUNCTION__, ret); + goto err; + } + +for (i =0 ; i < nr; i++) { + ret =io_uring_wait_cqe (ring, &cqe); +if (ret <0 ) { +fprintf (stderr,"%s: wait completion %d\n" , __FUNCTION__, ret); + goto err; + } + +switch (cqe->user_data) { +case 1 : +if (cqe->res != -ETIME ) { +fprintf (stderr,"%s: got %d, wanted %d\n" , + __FUNCTION__, cqe->res, -ETIME ); + goto err; + } +break ; +case 2 : +if (cqe->res !=0 ) { +fprintf (stderr,"%s: got %d, wanted %d\n" , + __FUNCTION__, cqe->res, +0 ); + goto err; + } +break ; +case 3 : +if (cqe->res !=0 ) { +fprintf (stderr,"nop failed\n" ); + goto err; + } +break ; +default : + goto err; + } +io_uring_cqe_seen (ring, cqe); + } + + exp_ms =mtime_since_now (&tv); +if (exp_ms >= base_ms /2 ) { +fprintf (stderr,"too long, timeout wasn't updated\n" ); + goto err; + } +if (ms >=1000 && !abs && exp_ms < ms /2 ) { +fprintf (stderr,"fired too early, potentially updated to 0 ms" +"instead of %lu\n" , ms); + goto err; + } +return 0 ; +err: +return 1 ; +} + +static int test_update_nonexistent_timeout (struct io_uring *ring) +{ +struct io_uring_sqe *sqe; +struct io_uring_cqe *cqe; +struct __kernel_timespec ts; +int ret; + + sqe =io_uring_get_sqe (ring); +if (!sqe) { +fprintf (stderr,"%s: get sqe failed\n" , __FUNCTION__); + goto err; + } +msec_to_ts (&ts,0 ); +io_uring_prep_timeout_update (sqe, &ts,42 ,0 ); + + ret =io_uring_submit (ring); +if (ret !=1 ) { +fprintf (stderr,"%s: sqe submit failed: %d\n" , __FUNCTION__, ret); + goto err; + } + + ret =io_uring_wait_cqe (ring, &cqe); +if (ret <0 ) { +fprintf (stderr,"%s: wait completion %d\n" , __FUNCTION__, ret); + goto err; + } + + ret = cqe->res; +if (ret == -ENOENT ) + ret =0 ; +io_uring_cqe_seen (ring, cqe); +return ret; +err: +return 1 ; +} + +static int test_update_invalid_flags (struct io_uring *ring) +{ +struct io_uring_sqe *sqe; +struct io_uring_cqe *cqe; +struct __kernel_timespec ts; +int ret; + + sqe =io_uring_get_sqe (ring); +if (!sqe) { +fprintf (stderr,"%s: get sqe failed\n" , __FUNCTION__); + goto err; + } +io_uring_prep_timeout_remove (sqe,0 ,IORING_TIMEOUT_ABS ); + + ret =io_uring_submit (ring); +if (ret !=1 ) { +fprintf (stderr,"%s: sqe submit failed: %d\n" , __FUNCTION__, ret); + goto err; + } + + ret =io_uring_wait_cqe (ring, &cqe); +if (ret <0 ) { +fprintf (stderr,"%s: wait completion %d\n" , __FUNCTION__, ret); + goto err; + } +if (cqe->res != -EINVAL ) { +fprintf (stderr,"%s: got %d, wanted %d\n" , + __FUNCTION__, cqe->res, -EINVAL ); + goto err; + } +io_uring_cqe_seen (ring, cqe); + + + sqe =io_uring_get_sqe (ring); +if (!sqe) { +fprintf (stderr,"%s: get sqe failed\n" , __FUNCTION__); + goto err; + } +msec_to_ts (&ts,0 ); +io_uring_prep_timeout_update (sqe, &ts,0 ,-1 ); + + ret =io_uring_submit (ring); +if (ret !=1 ) { +fprintf (stderr,"%s: sqe submit failed: %d\n" , __FUNCTION__, ret); + goto err; + } + + ret =io_uring_wait_cqe (ring, &cqe); +if (ret <0 ) { +fprintf (stderr,"%s: wait completion %d\n" , __FUNCTION__, ret); + goto err; + } +if (cqe->res != -EINVAL ) { +fprintf (stderr,"%s: got %d, wanted %d\n" , + __FUNCTION__, cqe->res, -EINVAL ); + goto err; + } +io_uring_cqe_seen (ring, cqe); + +return 0 ; +err: +return 1 ; +}int main (int argc,char *argv[]) { -struct io_uring ring; +struct io_uring ring, sqpoll_ring; +bool has_timeout_update, sqpoll;int ret;if (argc >1 )
@@ -980,6 +1183,9 @@ int main(int argc, char *argv[])return 1 ; } + ret =io_uring_queue_init (8 , &sqpoll_ring,IORING_SETUP_SQPOLL ); + sqpoll = !ret; + ret =test_single_timeout (&ring);if (ret) {fprintf (stderr,"test_single_timeout failed\n" );
@@ -1054,6 +1260,68 @@ int main(int argc, char *argv[])return ret; } + ret =test_update_nonexistent_timeout (&ring); + has_timeout_update = (ret != -EINVAL ); +if (has_timeout_update) { +if (ret) { +fprintf (stderr,"test_update_nonexistent_timeout failed\n" ); +return ret; + } + + ret =test_update_invalid_flags (&ring); +if (ret) { +fprintf (stderr,"test_update_invalid_flags failed\n" ); +return ret; + } + + ret =test_update_timeout (&ring,0 , false, false, false); +if (ret) { +fprintf (stderr,"test_update_timeout failed\n" ); +return ret; + } + + ret =test_update_timeout (&ring,1 , false, false, false); +if (ret) { +fprintf (stderr,"test_update_timeout 1ms failed\n" ); +return ret; + } + + ret =test_update_timeout (&ring,1000 , false, false, false); +if (ret) { +fprintf (stderr,"test_update_timeout 1s failed\n" ); +return ret; + } + + ret =test_update_timeout (&ring,0 , true, true, false); +if (ret) { +fprintf (stderr,"test_update_timeout abs failed\n" ); +return ret; + } + + + ret =test_update_timeout (&ring,0 , false, true, false); +if (ret) { +fprintf (stderr,"test_update_timeout async failed\n" ); +return ret; + } + + ret =test_update_timeout (&ring,0 , false, false, true); +if (ret) { +fprintf (stderr,"test_update_timeout linked failed\n" ); +return ret; + } + +if (sqpoll) { + ret =test_update_timeout (&sqpoll_ring,0 , false, false, + false); +if (ret) { +fprintf (stderr,"test_update_timeout sqpoll" +"failed\n" ); +return ret; + } + } + } +/* * this test must go last, it kills the ring */
@@ -1063,5 +1331,7 @@ int main(int argc, char *argv[])return ret; } +if (sqpoll) +io_uring_queue_exit (&sqpoll_ring);return 0 ; }
Signature · 1 line
2.24.0
Quoted 11 lines · Pavel Begunkov
v2: [1/2] bit 1 for
IORING_TIMEOUT_UPDATE[2/2] test sqpollPavel Begunkov (2):
Add timeout update
test/timeout: test timeout updatessrc/include/liburing.h | 9 ++ src/include/liburing/io_uring.h | 1 + test/timeout.c | 272 +++++++++++++++++++++++++++++++- 3 files changed, 281 insertions(+), 1 deletion(-)
Applied, thanks.
Signature · 1 line
Jens Axboe