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/io_uring.c | |
| parent | 3fb1764c6b57808ddab7fe7c242fa04c2479ef0a (diff) | |
| download | linux-stable-428f13826855e3eea44bf13cedbf33f382ef8794.tar.gz linux-stable-428f13826855e3eea44bf13cedbf33f382ef8794.tar.bz2 linux-stable-428f13826855e3eea44bf13cedbf33f382ef8794.zip | |
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/io_uring.c')
| -rw-r--r-- | io_uring/io_uring.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c index b25c2217c322..844a7524ed91 100644 --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -122,11 +122,6 @@ #define IO_COMPL_BATCH 32 #define IO_REQ_ALLOC_BATCH 8 -enum { - IO_CHECK_CQ_OVERFLOW_BIT, - IO_CHECK_CQ_DROPPED_BIT, -}; - struct io_defer_entry { struct list_head list; struct io_kiocb *req; @@ -2479,12 +2474,6 @@ int io_submit_sqes(struct io_ring_ctx *ctx, unsigned int nr) return ret; } -static inline bool io_has_work(struct io_ring_ctx *ctx) -{ - return test_bit(IO_CHECK_CQ_OVERFLOW_BIT, &ctx->check_cq) || - !llist_empty(&ctx->work_llist); -} - static int io_wake_function(struct wait_queue_entry *curr, unsigned int mode, int wake_flags, void *key) { |