diff options
| author |  Pavel Begunkov <asml.silence@gmail.com>
| 2023-01-05 11:22:22 +0000 |
|---|---|---|
| committer |  Jens Axboe <axboe@kernel.dk>
| 2023-01-29 15:17:39 -0700 |
| commit | 1414d62985848d095af5a400a4ca074a4888b77f (patch) | |
| tree | ec82b8699777474242f8fb731e79dee22c0b5e72 | |
| parent | io_uring: don't iterate cq wait fast path (diff) | |
| download | linux-1414d62985848d095af5a400a4ca074a4888b77f.tar.gz linux-1414d62985848d095af5a400a4ca074a4888b77f.tar.bz2 linux-1414d62985848d095af5a400a4ca074a4888b77f.zip | |
io_uring: kill io_run_task_work_ctx
There is only one user of io_run_task_work_ctx(), inline it.
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/40953c65f7c88fb00cdc4d870ca5d5319fb3d7ea.1672916894.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
| -rw-r--r-- | io_uring/io_uring.c | 6 | ||||
| -rw-r--r-- | io_uring/io_uring.h | 20 |
2 files changed, 5 insertions, 21 deletions
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c index dfc94654e082..5326e2d94055 100644 --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -2455,7 +2455,11 @@ 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 (io_run_task_work_ctx(ctx) > 0) + if (!llist_empty(&ctx->work_llist)) { + if (io_run_local_work(ctx) > 0) + return 1; + } + if (io_run_task_work() > 0) return 1; if (task_sigpending(current)) return -EINTR; diff --git a/io_uring/io_uring.h b/io_uring/io_uring.h index 7607a4992a94..9d36271eb6d3 100644 --- a/io_uring/io_uring.h +++ b/io_uring/io_uring.h @@ -284,26 +284,6 @@ static inline bool io_task_work_pending(struct io_ring_ctx *ctx) return task_work_pending(current) || !wq_list_empty(&ctx->work_llist); } -static inline int io_run_task_work_ctx(struct io_ring_ctx *ctx) -{ - int ret = 0; - int ret2; - - if (!llist_empty(&ctx->work_llist)) - ret = io_run_local_work(ctx); - - /* want to run this after in case more is added */ - ret2 = io_run_task_work(); - - /* Try propagate error in favour of if tasks were run, - * but still make sure to run them if requested - */ - if (ret >= 0) - ret += ret2; - - return ret; -} - static inline int io_run_local_work_locked(struct io_ring_ctx *ctx) { bool locked; |