diff options
| author | Jens Axboe <axboe@kernel.dk> | 2026-01-21 16:06:41 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2026-01-22 07:25:30 -0700 |
| commit | dd120bddc43af583e3bc9afe75f58bb9280947b0 (patch) | |
| tree | b94ed3b83f458f07af7d80b0abc53a40fcd1470c | |
| parent | 649dd18f559891bdafc5532d737c7dfb56060a6d (diff) | |
io_uring: add IO_URING_EXIT_WAIT_MAX definition
Add the timeout we normally wait before complaining about things being
stuck waiting for cancelations to complete as a define, and use it in
io_ring_exit_work().
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | io_uring/io_uring.c | 2 | ||||
| -rw-r--r-- | io_uring/io_uring.h | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c index 2cde22af78a3..6c9003a3efae 100644 --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -2962,7 +2962,7 @@ static __cold void io_tctx_exit_cb(struct callback_head *cb) static __cold void io_ring_exit_work(struct work_struct *work) { struct io_ring_ctx *ctx = container_of(work, struct io_ring_ctx, exit_work); - unsigned long timeout = jiffies + HZ * 60 * 5; + unsigned long timeout = jiffies + IO_URING_EXIT_WAIT_MAX; unsigned long interval = HZ / 20; struct io_tctx_exit exit; struct io_tctx_node *node; diff --git a/io_uring/io_uring.h b/io_uring/io_uring.h index c5bbb43b5842..2df861200b4f 100644 --- a/io_uring/io_uring.h +++ b/io_uring/io_uring.h @@ -88,6 +88,12 @@ struct io_ctx_config { IOSQE_BUFFER_SELECT |\ IOSQE_CQE_SKIP_SUCCESS) +/* + * Complaint timeout for io_uring cancelation exits, and for io-wq exit + * worker waiting. + */ +#define IO_URING_EXIT_WAIT_MAX (HZ * 60 * 5) + enum { IOU_COMPLETE = 0, |