Commit 3db61221 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 0be27f7b e775f93f

io_uring/io_uring.c

+3 −0
Original line number Diff line number Diff line
@@ -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);