Commit 3a166bdb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-5.19/io_uring-2022-05-22' of git://git.kernel.dk/linux-block 

Pull io_uring updates from Jens Axboe:
 "Here are the main io_uring changes for 5.19. This contains:

   - Fixes for sparse type warnings (Christoph, Vasily)

   - Support for multi-shot accept (Hao)

   - Support for io_uring managed fixed files, rather than always
     needing the applicationt o manage the indices (me)

   - Fix for a spurious poll wakeup (Dylan)

   - CQE overflow fixes (Dylan)

   - Support more types of cancelations (me)

   - Support for co-operative task_work signaling, rather than always
     forcing an IPI (me)

   - Support for doing poll first when appropriate, rather than always
     attempting a transfer first (me)

   - Provided buffer cleanups and support for mapped buffers (me)

   - Improve how io_uring handles inflight SCM files (Pavel)

   - Speedups for registered files (Pavel, me)

   - Organize the completion data in a struct in io_kiocb rather than
     keep it in separate spots (Pavel)

   - task_work improvements (Pavel)

   - Cleanup and optimize the submission path, in general and for
     handling links (Pavel)

   - Speedups for registered resource handling (Pavel)

   - Support sparse buffers and file maps (Pavel, me)

   - Various fixes and cleanups (Almog, Pavel, me)"

* tag 'for-5.19/io_uring-2022-05-22' of git://git.kernel.dk/linux-block: (111 commits)
  io_uring: fix incorrect __kernel_rwf_t cast
  io_uring: disallow mixed provided buffer group registrations
  io_uring: initialize io_buffer_list head when shared ring is unregistered
  io_uring: add fully sparse buffer registration
  io_uring: use rcu_dereference in io_close
  io_uring: consistently use the EPOLL* defines
  io_uring: make apoll_events a __poll_t
  io_uring: drop a spurious inline on a forward declaration
  io_uring: don't use ERR_PTR for user pointers
  io_uring: use a rwf_t for io_rw.flags
  io_uring: add support for ring mapped supplied buffers
  io_uring: add io_pin_pages() helper
  io_uring: add buffer selection support to IORING_OP_NOP
  io_uring: fix locking state for empty buffer group
  io_uring: implement multishot mode for accept
  io_uring: let fast poll support multishot
  io_uring: add REQ_F_APOLL_MULTISHOT for requests
  io_uring: add IORING_ACCEPT_MULTISHOT for accept
  io_uring: only wake when the correct events are set
  io_uring: avoid io-wq -EAGAIN looping for !IOPOLL
  ...
parents 1e57930e 0e7579ca

fs/io-wq.c

+2 −2
Original line number Diff line number Diff line
@@ -871,7 +871,7 @@ static bool io_wq_for_each_worker(struct io_wqe *wqe, 


static bool io_wq_worker_wake(struct io_worker *worker, void *data)

{

	set_notify_signal(worker->task);

	__set_notify_signal(worker->task);

	wake_up_process(worker->task);

	return false;

}
@@ -991,7 +991,7 @@ static bool __io_wq_worker_cancel(struct io_worker *worker, 
{

	if (work && match->fn(work, match->data)) {

		work->flags |= IO_WQ_WORK_CANCEL;

		set_notify_signal(worker->task);

		__set_notify_signal(worker->task);

		return true;

	}

fs/io-wq.h

+1 −0
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ struct io_wq_work_node *wq_stack_extract(struct io_wq_work_node *stack) 
struct io_wq_work {

	struct io_wq_work_node list;

	unsigned flags;

	int cancel_seq;

};



static inline struct io_wq_work *wq_next_work(struct io_wq_work *work)

fs/io_uring.c

+1643 −1018

File changed.

Preview size limit exceeded, changes collapsed.

include/linux/sched/signal.h

+11 −2
Original line number Diff line number Diff line
@@ -355,14 +355,23 @@ static inline void clear_notify_signal(void) 
	smp_mb__after_atomic();

}



/*

 * Returns 'true' if kick_process() is needed to force a transition from

 * user -> kernel to guarantee expedient run of TWA_SIGNAL based task_work.

 */

static inline bool __set_notify_signal(struct task_struct *task)

{

	return !test_and_set_tsk_thread_flag(task, TIF_NOTIFY_SIGNAL) &&

	       !wake_up_state(task, TASK_INTERRUPTIBLE);

}



/*

 * Called to break out of interruptible wait loops, and enter the

 * exit_to_user_mode_loop().

 */

static inline void set_notify_signal(struct task_struct *task)

{

	if (!test_and_set_tsk_thread_flag(task, TIF_NOTIFY_SIGNAL) &&

	    !wake_up_state(task, TASK_INTERRUPTIBLE))

	if (__set_notify_signal(task))

		kick_process(task);

}

include/linux/task_work.h

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ enum task_work_notify_mode { 
	TWA_NONE,

	TWA_RESUME,

	TWA_SIGNAL,

	TWA_SIGNAL_NO_IPI,

};



static inline bool task_work_pending(struct task_struct *task)