Skip to content

Commit 61bc84c

Browse files
committed
io_uring: remove poll entry from list when canceling all
When the ring is exiting, as part of the shutdown, poll requests are removed. But io_poll_remove_all() does not remove entries when finding them, and since completions are done out-of-band, we can find and remove the same entry multiple times. We do guard the poll execution by poll ownership, but that does not exclude us from reissuing a new one once the previous removal ownership goes away. This can race with poll execution as well, where we then end up seeing req->apoll be NULL because a previous task_work requeue finished the request. Remove the poll entry when we find it and get ownership of it. This prevents multiple invocations from finding it. Fixes: aa43477 ("io_uring: poll rework") Reported-by: Dylan Yudaken <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
1 parent 649bb75 commit 61bc84c

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

fs/io_uring.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6275,6 +6275,7 @@ static __cold bool io_poll_remove_all(struct io_ring_ctx *ctx,
62756275
list = &ctx->cancel_hash[i];
62766276
hlist_for_each_entry_safe(req, tmp, list, hash_node) {
62776277
if (io_match_task_safe(req, tsk, cancel_all)) {
6278+
hlist_del_init(&req->hash_node);
62786279
io_poll_cancel_req(req);
62796280
found = true;
62806281
}

0 commit comments

Comments
 (0)