Skip to content

Commit 3db6122

Browse files
committed
Merge tag 'io_uring-6.0-2022-09-23' of git://git.kernel.dk/linux
Pull io_uring fix from Jens Axboe: "Just a single fix for an issue with un-reaped IOPOLL requests on ring exit" * tag 'io_uring-6.0-2022-09-23' of git://git.kernel.dk/linux: io_uring: ensure that cached task references are always put on exit
2 parents 0be27f7 + e775f93 commit 3db6122

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

io_uring/io_uring.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2648,6 +2648,9 @@ static __cold void io_ring_ctx_wait_and_kill(struct io_ring_ctx *ctx)
26482648
io_kill_timeouts(ctx, NULL, true);
26492649
/* if we failed setting up the ctx, we might not have any rings */
26502650
io_iopoll_try_reap_events(ctx);
2651+
/* drop cached put refs after potentially doing completions */
2652+
if (current->io_uring)
2653+
io_uring_drop_tctx_refs(current);
26512654
}
26522655

26532656
INIT_WORK(&ctx->exit_work, io_ring_exit_work);

0 commit comments

Comments
 (0)