tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 216c7a03 39d33893

+4 -4
+4 -4
io_uring/io_uring.c
··· 3003 3003 mutex_unlock(&ctx->uring_lock); 3004 3004 } 3005 3005 3006 - if (ctx->flags & IORING_SETUP_DEFER_TASKRUN) 3007 - io_move_task_work_from_local(ctx); 3008 - 3009 3006 /* The SQPOLL thread never reaches this path */ 3010 - while (io_uring_try_cancel_requests(ctx, NULL, true, false)) 3007 + do { 3008 + if (ctx->flags & IORING_SETUP_DEFER_TASKRUN) 3009 + io_move_task_work_from_local(ctx); 3011 3010 cond_resched(); 3011 + } while (io_uring_try_cancel_requests(ctx, NULL, true, false)); 3012 3012 3013 3013 if (ctx->sq_data) { 3014 3014 struct io_sq_data *sqd = ctx->sq_data;