io_uring/napi: check napi_enabled in io_napi_add() before proceeding

[ Upstream commit 84f2eecf95018386c145ada19bb45b03bdb80d9e ]

doing so avoids the overhead of adding napi ids to all the rings that do
not enable napi.

if no id is added to napi_list because napi is disabled,
__io_napi_busy_loop() will not be called.

Signed-off-by: Olivier Langlois <olivier@trillion01.com>
Fixes: b4ccc4dd1330 ("io_uring/napi: enable even with a timeout of 0")
Link: https://lore.kernel.org/r/bd989ccef5fda14f5fd9888faf4fefcf66bd0369.1723400131.git.olivier@trillion01.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/io_uring/napi.c b/io_uring/napi.c
index 6bdb267e9c33c1d5239ac5450c779f41975c0d8e..ab5d68d4440c4f14b16576dce24a3501ff921f0e 100644 (file)
--- a/io_uring/napi.c
+++ b/io_uring/napi.c
@@ -311,7 +311,7 @@ void __io_napi_busy_loop(struct io_ring_ctx *ctx, struct io_wait_queue *iowq)
 {
        iowq->napi_prefer_busy_poll = READ_ONCE(ctx->napi_prefer_busy_poll);
 
-       if (!(ctx->flags & IORING_SETUP_SQPOLL) && ctx->napi_enabled)
+       if (!(ctx->flags & IORING_SETUP_SQPOLL))
                io_napi_blocking_busy_loop(ctx, iowq);
 }
 

diff --git a/io_uring/napi.h b/io_uring/napi.h
index babbee36cd3eb6ff45b4fe9dc18f9626613fb1a3..341d010cf66bcc7cea195f022fc706e9d10bc727 100644 (file)
--- a/io_uring/napi.h
+++ b/io_uring/napi.h
@@ -55,7 +55,7 @@ static inline void io_napi_add(struct io_kiocb *req)
        struct io_ring_ctx *ctx = req->ctx;
        struct socket *sock;
 
-       if (!READ_ONCE(ctx->napi_busy_poll_dt))
+       if (!READ_ONCE(ctx->napi_enabled))
                return;
 
        sock = sock_from_file(req->file);