Commit 483a351e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'io_uring-6.10-20240523' of git://git.kernel.dk/linux 

Pull io_uring fixes from Jens Axboe:
 "Single fix here for a regression in 6.9, and then a simple cleanup
  removing some dead code"

* tag 'io_uring-6.10-20240523' of git://git.kernel.dk/linux:
  io_uring: remove checks for NULL 'sq_offset'
  io_uring/sqpoll: ensure that normal task_work is also run timely
parents c2c80ecd 547988ad

io_uring/io_uring.c

+2 −4
Original line number Diff line number Diff line
@@ -2597,12 +2597,10 @@ static unsigned long rings_size(struct io_ring_ctx *ctx, unsigned int sq_entries 
#endif



	if (ctx->flags & IORING_SETUP_NO_SQARRAY) {

		if (sq_offset)

		*sq_offset = SIZE_MAX;

		return off;

	}



	if (sq_offset)

	*sq_offset = off;



	sq_array_size = array_size(sizeof(u32), sq_entries);

io_uring/sqpoll.c

+4 −2
Original line number Diff line number Diff line
@@ -238,11 +238,13 @@ static unsigned int io_sq_tw(struct llist_node **retry_list, int max_entries) 
	if (*retry_list) {

		*retry_list = io_handle_tw_list(*retry_list, &count, max_entries);

		if (count >= max_entries)

			return count;

			goto out;

		max_entries -= count;

	}



	*retry_list = tctx_task_work_run(tctx, max_entries, &count);

out:

	if (task_work_pending(current))

		task_work_run();

	return count;

}