Skip to content

Commit d96c449

Browse files
axboegregkh
authored andcommitted
io_uring/tw: serialize ctx->retry_llist with ->uring_lock
commit 17666e2 upstream. The DEFER_TASKRUN local task work paths all run under ctx->uring_lock, which serializes them with each other and with the rest of the ring's hot paths. io_move_task_work_from_local() is the exception - it's called from io_ring_exit_work() on a kworker without holding the lock and from the iopoll cancelation side right after dropping it. ->work_llist is fine with this, as it's only ever updated via the expected paths. But the ->retry_llist is updated while runing, and hence it could potentially race between normal task_work running and the task-has-exited shutdown path. Simply grab ->uring_lock while moving the local work to the fallback list for exit purposes, which nicely serializes it across both the normal additions and the exit prune path. Cc: stable@vger.kernel.org Fixes: f46b9cd ("io_uring: limit local tw done") Reported-by: Robert Femmer <robert.femmer@x41-dsec.de> Reported-by: Christian Reitter <invd@inhq.net> Reported-by: Michael Rodler <michael.rodler@x41-dsec.de> Signed-off-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 930a9cc commit d96c449

1 file changed

Lines changed: 11 additions & 1 deletion

File tree

io_uring/tw.c

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,8 +273,18 @@ void io_req_task_work_add_remote(struct io_kiocb *req, unsigned flags)
273273

274274
void __cold io_move_task_work_from_local(struct io_ring_ctx *ctx)
275275
{
276-
struct llist_node *node = llist_del_all(&ctx->work_llist);
276+
struct llist_node *node;
277277

278+
/*
279+
* Running the work items may utilize ->retry_llist as a means
280+
* for capping the number of task_work entries run at the same
281+
* time. But that list can potentially race with moving the work
282+
* from here, if the task is exiting. As any normal task_work
283+
* running holds ->uring_lock already, just guard this slow path
284+
* with ->uring_lock to avoid racing on ->retry_llist.
285+
*/
286+
guard(mutex)(&ctx->uring_lock);
287+
node = llist_del_all(&ctx->work_llist);
278288
__io_fallback_tw(node, false);
279289
node = llist_del_all(&ctx->retry_llist);
280290
__io_fallback_tw(node, false);

0 commit comments

Comments
 (0)