Skip to content

Commit

Permalink
Merge tag 'io_uring-6.0-2022-09-23' of git://git.kernel.dk/linux
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Linus Torvalds committed Sep 24, 2022
2 parents 0be27f7 + e775f93 commit 3db6122
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions io_uring/io_uring.c
Original file line number Diff line number Diff line change
Expand Up @@ -2648,6 +2648,9 @@ static __cold void io_ring_ctx_wait_and_kill(struct io_ring_ctx *ctx)
io_kill_timeouts(ctx, NULL, true);
/* if we failed setting up the ctx, we might not have any rings */
io_iopoll_try_reap_events(ctx);
/* drop cached put refs after potentially doing completions */
if (current->io_uring)
io_uring_drop_tctx_refs(current);
}

INIT_WORK(&ctx->exit_work, io_ring_exit_work);
Expand Down

0 comments on commit 3db6122

Please sign in to comment.