summaryrefslogtreecommitdiffstats
path: root/io_uring
diff options
context:
space:
mode:
authorPavel Begunkov <asml.silence@gmail.com>2023-01-09 14:46:05 +0000
committerJens Axboe <axboe@kernel.dk>2023-01-29 15:17:40 -0700
commit2f413956cc8a72fc11c2779228112559bbca8279 (patch)
treec45e2d3aeb804c9dbeb6dfbb3947c5cea80cdc49 /io_uring
parentbd550173acc2dc782d9c57852f6b6e71f5d9a159 (diff)
downloadlinux-2f413956cc8a72fc11c2779228112559bbca8279.tar.gz
linux-2f413956cc8a72fc11c2779228112559bbca8279.tar.bz2
linux-2f413956cc8a72fc11c2779228112559bbca8279.zip
io_uring: don't set TASK_RUNNING in local tw runner
The CQ waiting loop sets TASK_RUNNING before trying to execute task_work, no need to repeat it in io_run_local_work(). Signed-off-by: Pavel Begunkov <asml.silence@gmail.com> Link: https://lore.kernel.org/r/9d9422c429ef3f9457b4f4b8288bf4789564f33b.1673274244.git.asml.silence@gmail.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'io_uring')
-rw-r--r--io_uring/io_uring.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index 5e1a0845e4b6..e61e2a0f23b1 100644
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -1339,11 +1339,9 @@ again:
int io_run_local_work(struct io_ring_ctx *ctx)
{
- bool locked;
+ bool locked = mutex_trylock(&ctx->uring_lock);
int ret;
- __set_current_state(TASK_RUNNING);
- locked = mutex_trylock(&ctx->uring_lock);
ret = __io_run_local_work(ctx, &locked);
if (locked)
mutex_unlock(&ctx->uring_lock);
@@ -2453,6 +2451,7 @@ static int io_wake_function(struct wait_queue_entry *curr, unsigned int mode,
int io_run_task_work_sig(struct io_ring_ctx *ctx)
{
if (!llist_empty(&ctx->work_llist)) {
+ __set_current_state(TASK_RUNNING);
if (io_run_local_work(ctx) > 0)
return 1;
}