Skip to content

Commit

Permalink
io_uring: don't touch sqd->thread off tw add
Browse files Browse the repository at this point in the history
commit bd2703b upstream.

With IORING_SETUP_SQPOLL all requests are created by the SQPOLL task,
which means that req->task should always match sqd->thread. Since
accesses to sqd->thread should be separately protected, use req->task
in io_req_normal_work_add() instead.

Note, in the eyes of io_req_normal_work_add(), the SQPOLL task struct
is always pinned and alive, and sqd->thread can either be the task or
NULL. It's only problematic if the compiler decides to reload the value
after the null check, which is not so likely.

Cc: stable@vger.kernel.org
Cc: Bui Quang Minh <minhquangbui99@gmail.com>
Reported-by: lizetao <lizetao1@huawei.com>
Fixes: 78f9b61 ("io_uring: wake SQPOLL task when task_work is added to an empty queue")
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/1cbbe72cf32c45a8fee96026463024cd8564a7d7.1736541357.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Pavel Begunkov authored and Greg Kroah-Hartman committed Jan 17, 2025
1 parent ca80f62 commit 476e4c4
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions io_uring/io_uring.c
Original file line number Diff line number Diff line change
Expand Up @@ -1244,10 +1244,7 @@ static void io_req_normal_work_add(struct io_kiocb *req)

/* SQPOLL doesn't need the task_work added, it'll run it itself */
if (ctx->flags & IORING_SETUP_SQPOLL) {
struct io_sq_data *sqd = ctx->sq_data;

if (sqd->thread)
__set_notify_signal(sqd->thread);
__set_notify_signal(req->task);
return;
}

Expand Down

0 comments on commit 476e4c4

Please sign in to comment.