6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Josef Bacik Commit 436d48a2ed13112d2d27085325838e5bce6b4507 upstream. A task that exits cancels its tracked requests and waits until they are gone. io_uring_cancel_generic() looks everywhere a request can be, and goes to sleep if it found nothing to cancel. It is woken up each time one of the requests of the task is completed by task work or freed. When io-wq is done with a request that has a link, there is a time in which the next request of the link can't be found: io_worker_handle_work() io_assign_current_work(worker, NULL) io_wq_free_work(work) io_req_find_next() // takes the link off the request io_free_req() // task work for the task io_assign_current_work(worker, linked) io_run_task_work() cond_resched() worker->cur_work = linked It is not pending, it is not the current work of a worker, and it is not yet on the list that it is about to be parked on. If the pass that the exiting task makes because of io_free_req() falls into that time, it finds nothing and the task goes to sleep. The worker then runs the link, which IO_WQ_BIT_EXIT doesn't prevent for bounded work. If that parks the request nothing is completed or freed, and nobody wakes up the task. If it is the process that exits it can't be killed any more either. NOP, IOSQE_ASYNC | IOSQE_IO_LINK FUTEX_WAIT, FUTEX2_PRIVATE exit of the thread, or of the process, up to 63us later With four of these per round 5 to 8 of 10,000 rounds hang (4 CPUs, KVM): io_uring_cancel_generic do_exit Commit f8b632e89a10 ("io_uring: tighten task exit cancellations") is about the same gap, and makes the task look again for whatever happens before io_free_req(). Free the request once the link is the current work of the worker, or pending. Whoever is woken up by that can find the link, until it is parked where cancellations look as well. To do so split io_wq_free_work() in two. [ 6.12: io-wq still calls back through io_wq_data, so a ->put_work callback is added next to ->free_work. io_wq_put_work() keeps the link check of 6.12, without the REQ_F_CQE_SKIP condition that commit 5530a5102e3c adds in 7.3 ] Fixes: 768134d4f481 ("io_uring: don't do flush cancel under inflight_lock") Assisted-by: LLM Signed-off-by: Josef Bacik Link: https://patch.msgid.link/20261015-b4-io-uring-fixes-v1-5-c1556f5d7bf5@toxicpanda.com Signed-off-by: Jens Axboe Co-Authored-By: Claude Fable 5.1 Signed-off-by: Greg Kroah-Hartman --- io_uring/io-wq.c | 22 ++++++++++++++++++---- io_uring/io-wq.h | 4 +++- io_uring/io_uring.c | 29 +++++++++++++++++++++-------- io_uring/io_uring.h | 3 ++- io_uring/tctx.c | 1 + 5 files changed, 45 insertions(+), 14 deletions(-) --- a/io_uring/io-wq.c +++ b/io_uring/io-wq.c @@ -98,6 +98,7 @@ enum { struct io_wq { unsigned long state; + put_work_fn *put_work; free_work_fn *free_work; io_wq_work_fn *do_work; @@ -593,8 +594,9 @@ static void io_worker_handle_work(struct /* handle a whole dependent link */ do { bool do_kill = test_bit(IO_WQ_BIT_EXIT, &wq->state); - struct io_wq_work *next_hashed, *linked; + struct io_wq_work *next_hashed, *linked, *done = work; unsigned int hash = io_get_work_hash(work); + bool last; next_hashed = wq_next_work(work); @@ -611,7 +613,7 @@ static void io_worker_handle_work(struct wq->do_work(work); io_assign_current_work(worker, NULL); - linked = wq->free_work(work); + last = wq->put_work(work, &linked); work = next_hashed; if (!work && linked && !io_wq_is_hashed(linked)) { work = linked; @@ -620,6 +622,13 @@ static void io_worker_handle_work(struct io_assign_current_work(worker, work); if (linked) io_wq_enqueue(wq, linked); + /* + * Not before the link is current or pending work again. + * This may be the last time that a task is woken up + * which exits and looks for requests to cancel. + */ + if (last) + wq->free_work(done); if (hash != -1U && !next_hashed) { /* serialize hash clear with wake_up() */ @@ -920,9 +929,13 @@ static bool io_wq_worker_wake(struct io_ static void io_run_cancel(struct io_wq_work *work, struct io_wq *wq) { do { + struct io_wq_work *linked; + atomic_or(IO_WQ_WORK_CANCEL, &work->flags); wq->do_work(work); - work = wq->free_work(work); + if (wq->put_work(work, &linked)) + wq->free_work(work); + work = linked; } while (work); } @@ -1174,7 +1187,7 @@ struct io_wq *io_wq_create(unsigned boun int ret, i; struct io_wq *wq; - if (WARN_ON_ONCE(!data->free_work || !data->do_work)) + if (WARN_ON_ONCE(!data->put_work || !data->free_work || !data->do_work)) return ERR_PTR(-EINVAL); if (WARN_ON_ONCE(!bounded)) return ERR_PTR(-EINVAL); @@ -1185,6 +1198,7 @@ struct io_wq *io_wq_create(unsigned boun refcount_inc(&data->hash->refs); wq->hash = data->hash; + wq->put_work = data->put_work; wq->free_work = data->free_work; wq->do_work = data->do_work; --- a/io_uring/io-wq.h +++ b/io_uring/io-wq.h @@ -21,7 +21,8 @@ enum io_wq_cancel { IO_WQ_CANCEL_NOTFOUND, /* work not found */ }; -typedef struct io_wq_work *(free_work_fn)(struct io_wq_work *); +typedef bool (put_work_fn)(struct io_wq_work *, struct io_wq_work **); +typedef void (free_work_fn)(struct io_wq_work *); typedef void (io_wq_work_fn)(struct io_wq_work *); struct io_wq_hash { @@ -40,6 +41,7 @@ struct io_wq_data { struct io_wq_hash *hash; struct task_struct *task; io_wq_work_fn *do_work; + put_work_fn *put_work; free_work_fn *free_work; }; --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -1770,17 +1770,30 @@ int io_poll_issue(struct io_kiocb *req, IO_URING_F_COMPLETE_DEFER); } -struct io_wq_work *io_wq_free_work(struct io_wq_work *work) +/* + * io-wq is done with @work. Returns true if it held the last reference, and + * hands out the next request of the link then. The caller has to make sure + * that cancellations can find the latter before it calls io_wq_free_work(). + */ +bool io_wq_put_work(struct io_wq_work *work, struct io_wq_work **linked) { struct io_kiocb *req = container_of(work, struct io_kiocb, work); struct io_kiocb *nxt = NULL; - if (req_ref_put_and_test_atomic(req)) { - if (req->flags & IO_REQ_LINK_FLAGS) - nxt = io_req_find_next(req); - io_free_req(req); - } - return nxt ? &nxt->work : NULL; + *linked = NULL; + if (!req_ref_put_and_test_atomic(req)) + return false; + + if (req->flags & IO_REQ_LINK_FLAGS) + nxt = io_req_find_next(req); + if (nxt) + *linked = &nxt->work; + return true; +} + +void io_wq_free_work(struct io_wq_work *work) +{ + io_free_req(container_of(work, struct io_kiocb, work)); } void io_wq_submit_work(struct io_wq_work *work) @@ -1791,7 +1804,7 @@ void io_wq_submit_work(struct io_wq_work bool needs_poll = false; int ret = 0, err = -ECANCELED; - /* one will be dropped by ->io_wq_free_work() after returning to io-wq */ + /* one will be dropped by ->put_work() after returning to io-wq */ if (!(req->flags & REQ_F_REFCOUNT)) __io_req_set_refcount(req, 2); else --- a/io_uring/io_uring.h +++ b/io_uring/io_uring.h @@ -101,7 +101,8 @@ int io_submit_sqes(struct io_ring_ctx *c int io_do_iopoll(struct io_ring_ctx *ctx, bool force_nonspin); void __io_submit_flush_completions(struct io_ring_ctx *ctx); -struct io_wq_work *io_wq_free_work(struct io_wq_work *work); +bool io_wq_put_work(struct io_wq_work *work, struct io_wq_work **linked); +void io_wq_free_work(struct io_wq_work *work); void io_wq_submit_work(struct io_wq_work *work); void io_free_req(struct io_kiocb *req); --- a/io_uring/tctx.c +++ b/io_uring/tctx.c @@ -35,6 +35,7 @@ static struct io_wq *io_init_wq_offload( data.hash = hash; data.task = task; + data.put_work = io_wq_put_work; data.free_work = io_wq_free_work; data.do_work = io_wq_submit_work;