Commit 3a7efd1a authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

io_uring: reinforce cancel on flush during exit 



What 84965ff8 ("io_uring: if we see flush on exit, cancel related tasks")
really wants is to cancel all relevant REQ_F_INFLIGHT requests reliably.
That can be achieved by io_uring_cancel_files(), but we'll miss it
calling io_uring_cancel_task_requests(files=NULL) from io_uring_flush(),
because it will go through __io_uring_cancel_task_requests().

Just always call io_uring_cancel_files() during cancel, it's good enough
for now.

Cc: stable@vger.kernel.org # 5.9+
Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 70b2c60d

fs/io_uring.c

+1 −2
Original line number Diff line number Diff line
@@ -8976,10 +8976,9 @@ static void io_uring_cancel_task_requests(struct io_ring_ctx *ctx, 
	io_cancel_defer_files(ctx, task, files);

	io_cqring_overflow_flush(ctx, true, task, files);



	io_uring_cancel_files(ctx, task, files);

	if (!files)

		__io_uring_cancel_task_requests(ctx, task);

	else

		io_uring_cancel_files(ctx, task, files);



	if ((ctx->flags & IORING_SETUP_SQPOLL) && ctx->sq_data) {

		atomic_dec(&task->io_uring->in_idle);