[PATCH for-next] io_uring: extend task put optimisations

[PATCH for-next] io_uring: extend task put optimisations

[Pavel Begunkov]

Now with IRQ completions done via IRQ, almost all requests freeing
are done from the context of submitter task, so it makes sense to
extend task_put optimisation from io_req_free_batch_finish() to cover
all the cases including task_work by moving it into io_put_task().

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
---
 fs/io_uring.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/fs/io_uring.c b/fs/io_uring.c
index ba087f395507..5e99473ad6fc 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -1628,10 +1628,14 @@ static inline void io_put_task(struct task_struct *task, int nr)
 {
 	struct io_uring_task *tctx = task->io_uring;
 
-	percpu_counter_sub(&tctx->inflight, nr);
-	if (unlikely(atomic_read(&tctx->in_idle)))
-		wake_up(&tctx->wait);
-	put_task_struct_many(task, nr);
+	if (likely(task == current)) {
+		tctx->cached_refs += nr;
+	} else {
+		percpu_counter_sub(&tctx->inflight, nr);
+		if (unlikely(atomic_read(&tctx->in_idle)))
+			wake_up(&tctx->wait);
+		put_task_struct_many(task, nr);
+	}
 }
 
 static bool io_cqring_event_overflow(struct io_ring_ctx *ctx, u64 user_data,
@@ -2179,9 +2183,7 @@ static void io_req_free_batch_finish(struct io_ring_ctx *ctx,
 {
 	if (rb->ctx_refs)
 		percpu_ref_put_many(&ctx->refs, rb->ctx_refs);
-	if (rb->task == current)
-		current->io_uring->cached_refs += rb->task_refs;
-	else if (rb->task)
+	if (rb->task)
 		io_put_task(rb->task, rb->task_refs);
 }
 
-- 
2.32.0

Re: [PATCH for-next] io_uring: extend task put optimisations

[Jens Axboe]

On 8/18/21 10:01 AM, Pavel Begunkov wrote:
> Now with IRQ completions done via IRQ, almost all requests freeing
> are done from the context of submitter task, so it makes sense to
> extend task_put optimisation from io_req_free_batch_finish() to cover
> all the cases including task_work by moving it into io_put_task().

Applied, thanks.

-- 
Jens Axboe