diff options
| author | Pavel Begunkov <asml.silence@gmail.com> | 2023-01-05 12:22:20 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2023-01-29 23:17:39 +0100 |
| commit | 0c4fe008c9cb2215b3f838769886857ae986014b (patch) | |
| tree | 570f6ccfe1b4f7c9b7284b4570f60f4f9de7d711 /io_uring | |
| parent | Linux 6.2-rc6 (diff) | |
| download | linux-0c4fe008c9cb2215b3f838769886857ae986014b.tar.xz linux-0c4fe008c9cb2215b3f838769886857ae986014b.zip | |
io_uring: rearrange defer list checks
There should be nothing in the ->work_llist for non DEFER_TASKRUN rings,
so we can skip flag checks and test the list emptiness directly. Also
move it out of io_run_local_work() for inlining.
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/331d63fd15ca79b35b95c82a82d9246110686392.1672916894.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.c | 3 | ||||
| -rw-r--r-- | io_uring/io_uring.h | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c index db623b3185c8..da9b0397f9a1 100644 --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -1343,9 +1343,6 @@ int io_run_local_work(struct io_ring_ctx *ctx) bool locked; int ret; - if (llist_empty(&ctx->work_llist)) - return 0; - __set_current_state(TASK_RUNNING); locked = mutex_trylock(&ctx->uring_lock); ret = __io_run_local_work(ctx, &locked); diff --git a/io_uring/io_uring.h b/io_uring/io_uring.h index ab4b2a1c3b7e..7607a4992a94 100644 --- a/io_uring/io_uring.h +++ b/io_uring/io_uring.h @@ -289,7 +289,7 @@ static inline int io_run_task_work_ctx(struct io_ring_ctx *ctx) int ret = 0; int ret2; - if (ctx->flags & IORING_SETUP_DEFER_TASKRUN) + if (!llist_empty(&ctx->work_llist)) ret = io_run_local_work(ctx); /* want to run this after in case more is added */ |