Skip to content

Commit 3a7efd1

Browse files
isilenceaxboe
authored andcommitted
io_uring: reinforce cancel on flush during exit
What 84965ff ("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: Pavel Begunkov <asml.silence@gmail.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 70b2c60 commit 3a7efd1

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

fs/io_uring.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8976,10 +8976,9 @@ static void io_uring_cancel_task_requests(struct io_ring_ctx *ctx,
89768976
io_cancel_defer_files(ctx, task, files);
89778977
io_cqring_overflow_flush(ctx, true, task, files);
89788978

8979+
io_uring_cancel_files(ctx, task, files);
89798980
if (!files)
89808981
__io_uring_cancel_task_requests(ctx, task);
8981-
else
8982-
io_uring_cancel_files(ctx, task, files);
89838982

89848983
if ((ctx->flags & IORING_SETUP_SQPOLL) && ctx->sq_data) {
89858984
atomic_dec(&task->io_uring->in_idle);

0 commit comments

Comments
 (0)