Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'io_uring-6.11-20240802' of git://git.kernel.dk/linux

Pull io_uring fixes from Jens Axboe:
"Two minor tweaks for the NAPI handling, both from Olivier:

- Kill two unused list definitions

- Ensure that multishot NAPI doesn't age away"

* tag 'io_uring-6.11-20240802' of git://git.kernel.dk/linux:
io_uring: remove unused local list heads in NAPI functions
io_uring: keep multishot request NAPI timeout current

+1 -2
-2
io_uring/napi.c
··· 205 205 void io_napi_free(struct io_ring_ctx *ctx) 206 206 { 207 207 struct io_napi_entry *e; 208 - LIST_HEAD(napi_list); 209 208 unsigned int i; 210 209 211 210 spin_lock(&ctx->napi_lock); ··· 314 315 */ 315 316 int io_napi_sqpoll_busy_poll(struct io_ring_ctx *ctx) 316 317 { 317 - LIST_HEAD(napi_list); 318 318 bool is_stale = false; 319 319 320 320 if (!READ_ONCE(ctx->napi_busy_poll_dt))
+1
io_uring/poll.c
··· 347 347 v &= IO_POLL_REF_MASK; 348 348 } while (atomic_sub_return(v, &req->poll_refs) & IO_POLL_REF_MASK); 349 349 350 + io_napi_add(req); 350 351 return IOU_POLL_NO_ACTION; 351 352 } 352 353