Commit 216c7a03 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'io_uring-6.19-20260116' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux 

Pull io_uring fix from Jens Axboe:
 "Just a single fix moving local task_work inside the cancelation loop,
  rather than only before cancelations.

  If any cancelations generate task_work, we do need to re-run it"

* tag 'io_uring-6.19-20260116' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux:
  io_uring: move local task_work in exit cancel loop
parents 39d33893 da579f05

io_uring/io_uring.c

+4 −4
Original line number Diff line number Diff line
@@ -3003,12 +3003,12 @@ static __cold void io_ring_exit_work(struct work_struct *work) 
			mutex_unlock(&ctx->uring_lock);

		}



		/* The SQPOLL thread never reaches this path */

		do {

			if (ctx->flags & IORING_SETUP_DEFER_TASKRUN)

				io_move_task_work_from_local(ctx);



		/* The SQPOLL thread never reaches this path */

		while (io_uring_try_cancel_requests(ctx, NULL, true, false))

			cond_resched();

		} while (io_uring_try_cancel_requests(ctx, NULL, true, false));



		if (ctx->sq_data) {

			struct io_sq_data *sqd = ctx->sq_data;