Commit ebd0df2e authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe

io_uring: optimise task_work submit flushing

tctx_task_work() tries to fetch a next batch of requests, but before it
would flush completions from the previous batch that may be sub-optimal.
E.g. io_req_task_queue() executes a head of the link where all the
linked may be enqueued through the same io_req_task_queue(). And there
are more cases for that.

Do the flushing at the end, so it can cache completions of several waves
of a single tctx_task_work(), and do the flush at the very end.
Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/3cac83934e4fbce520ff8025c3524398b3ae0270.1623949695.git.asml.silence@gmail.comSigned-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 3f18407d
...@@ -1890,13 +1890,13 @@ static void ctx_flush_and_put(struct io_ring_ctx *ctx) ...@@ -1890,13 +1890,13 @@ static void ctx_flush_and_put(struct io_ring_ctx *ctx)
static void tctx_task_work(struct callback_head *cb) static void tctx_task_work(struct callback_head *cb)
{ {
struct io_ring_ctx *ctx = NULL;
struct io_uring_task *tctx = container_of(cb, struct io_uring_task, struct io_uring_task *tctx = container_of(cb, struct io_uring_task,
task_work); task_work);
clear_bit(0, &tctx->task_state); clear_bit(0, &tctx->task_state);
while (!wq_list_empty(&tctx->task_list)) { while (!wq_list_empty(&tctx->task_list)) {
struct io_ring_ctx *ctx = NULL;
struct io_wq_work_list list; struct io_wq_work_list list;
struct io_wq_work_node *node; struct io_wq_work_node *node;
...@@ -1920,11 +1920,12 @@ static void tctx_task_work(struct callback_head *cb) ...@@ -1920,11 +1920,12 @@ static void tctx_task_work(struct callback_head *cb)
node = next; node = next;
} }
ctx_flush_and_put(ctx);
if (!list.first) if (!list.first)
break; break;
cond_resched(); cond_resched();
} }
ctx_flush_and_put(ctx);
} }
static int io_req_task_work_add(struct io_kiocb *req) static int io_req_task_work_add(struct io_kiocb *req)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment