diff options
| author |  Jens Axboe <axboe@kernel.dk>
| 2024-02-14 13:56:08 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk>
| 2024-02-14 13:56:08 -0700 |
| commit | 78f9b61bd8e5466f0e90823e64e3d87c41f6258c (patch) | |
| tree | bd83f9d5155de70d4a97cf2ba64df7d414384907 /io_uring | |
| parent | io_uring/napi: ensure napi polling is aborted when work is available (diff) | |
| download | linux-78f9b61bd8e5466f0e90823e64e3d87c41f6258c.tar.gz linux-78f9b61bd8e5466f0e90823e64e3d87c41f6258c.tar.bz2 linux-78f9b61bd8e5466f0e90823e64e3d87c41f6258c.zip | |
io_uring: wake SQPOLL task when task_work is added to an empty queue
If there's no current work on the list, we still need to potentially
wake the SQPOLL task if it is sleeping. This is ordered with the
wait queue addition in sqpoll, which adds to the wait queue before
checking for pending work items.
Fixes: af5d68f8892f ("io_uring/sqpoll: manage task_work privately")
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'io_uring')
| -rw-r--r-- | io_uring/io_uring.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c index 844a7524ed91..45a2f8f3a77c 100644 --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -1370,8 +1370,13 @@ static void io_req_normal_work_add(struct io_kiocb *req) atomic_or(IORING_SQ_TASKRUN, &ctx->rings->sq_flags); /* SQPOLL doesn't need the task_work added, it'll run it itself */ - if (ctx->flags & IORING_SETUP_SQPOLL) + if (ctx->flags & IORING_SETUP_SQPOLL) { + struct io_sq_data *sqd = ctx->sq_data; + + if (wq_has_sleeper(&sqd->wait)) + wake_up(&sqd->wait); return; + } if (likely(!task_work_add(req->task, &tctx->task_work, ctx->notify_method))) return; |