diff options
| author | Jens Axboe <axboe@kernel.dk> | 2024-02-14 12:59:36 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2024-02-14 13:01:25 -0700 |
| commit | 428f13826855e3eea44bf13cedbf33f382ef8794 (patch) | |
| tree | f6d779f7ed0c23be2cf59ff90387b68f204be8c7 /io_uring/napi.c | |
| parent | 3fb1764c6b57808ddab7fe7c242fa04c2479ef0a (diff) | |
io_uring/napi: ensure napi polling is aborted when work is available
While testing io_uring NAPI with DEFER_TASKRUN, I ran into slowdowns and
stalls in packet delivery. Turns out that while
io_napi_busy_loop_should_end() aborts appropriately on regular
task_work, it does not abort if we have local task_work pending.
Move io_has_work() into the private io_uring.h header, and gate whether
we should continue polling on that as well. This makes NAPI polling on
send/receive work as designed with IORING_SETUP_DEFER_TASKRUN as well.
Fixes: 8d0c12a80cde ("io-uring: add napi busy poll support")
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'io_uring/napi.c')
| -rw-r--r-- | io_uring/napi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/io_uring/napi.c b/io_uring/napi.c index 8ec016899539..b234adda7dfd 100644 --- a/io_uring/napi.c +++ b/io_uring/napi.c @@ -122,7 +122,7 @@ static bool io_napi_busy_loop_should_end(void *data, if (signal_pending(current)) return true; - if (io_should_wake(iowq)) + if (io_should_wake(iowq) || io_has_work(iowq->ctx)) return true; if (io_napi_busy_loop_timeout(start_time, iowq->napi_busy_poll_to)) return true; |