Commit 17712b7e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents d9ef02e5 c3fca4fb

io_uring/napi.c

+0 −2
Original line number Diff line number Diff line
@@ -205,7 +205,6 @@ void io_napi_init(struct io_ring_ctx *ctx) 
void io_napi_free(struct io_ring_ctx *ctx)

{

	struct io_napi_entry *e;

	LIST_HEAD(napi_list);

	unsigned int i;



	spin_lock(&ctx->napi_lock);
@@ -315,7 +314,6 @@ void __io_napi_busy_loop(struct io_ring_ctx *ctx, struct io_wait_queue *iowq) 
 */

int io_napi_sqpoll_busy_poll(struct io_ring_ctx *ctx)

{

	LIST_HEAD(napi_list);

	bool is_stale = false;



	if (!READ_ONCE(ctx->napi_busy_poll_dt))

io_uring/poll.c

+1 −0
Original line number Diff line number Diff line
@@ -347,6 +347,7 @@ static int io_poll_check_events(struct io_kiocb *req, struct io_tw_state *ts) 
		v &= IO_POLL_REF_MASK;

	} while (atomic_sub_return(v, &req->poll_refs) & IO_POLL_REF_MASK);



	io_napi_add(req);

	return IOU_POLL_NO_ACTION;

}