From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 23 May 2022 19:22:49 +0000 (-0700)
Subject: Merge tag 'for-5.19/io_uring-2022-05-22' of git://git.kernel.dk/linux-block
X-Git-Tag: v6.6.17~7551
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3a166bdbf3abc8ca2d7ffe7cffc5c7a65f260e62;p=platform%2Fkernel%2Flinux-rpi.git

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
  ...
---

3a166bdbf3abc8ca2d7ffe7cffc5c7a65f260e62
diff --cc fs/io_uring.c
index e0823f5,0bc5fbf..0c6a142
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@@ -5209,10 -5488,8 +5492,10 @@@ static int io_sendmsg_prep(struct io_ki
  {
  	struct io_sr_msg *sr = &req->sr_msg;
  
- 	if (unlikely(req->ctx->flags & IORING_SETUP_IOPOLL))
+ 	if (unlikely(sqe->file_index))
  		return -EINVAL;
 +	if (unlikely(sqe->addr2 || sqe->file_index))
 +		return -EINVAL;
  
  	sr->umsg = u64_to_user_ptr(READ_ONCE(sqe->addr));
  	sr->len = READ_ONCE(sqe->len);
@@@ -5422,10 -5724,8 +5730,10 @@@ static int io_recvmsg_prep(struct io_ki
  {
  	struct io_sr_msg *sr = &req->sr_msg;
  
- 	if (unlikely(req->ctx->flags & IORING_SETUP_IOPOLL))
+ 	if (unlikely(sqe->file_index))
  		return -EINVAL;
 +	if (unlikely(sqe->addr2 || sqe->file_index))
 +		return -EINVAL;
  
  	sr->umsg = u64_to_user_ptr(READ_ONCE(sqe->addr));
  	sr->len = READ_ONCE(sqe->len);
@@@ -6950,12 -7401,7 +7409,12 @@@ static int io_req_prep(struct io_kiocb 
  
  static int io_req_prep_async(struct io_kiocb *req)
  {
 -	if (!io_op_defs[req->opcode].needs_async_setup)
 +	const struct io_op_def *def = &io_op_defs[req->opcode];
 +
 +	/* assign early for deferred execution for non-fixed file */
 +	if (def->needs_file && !(req->flags & REQ_F_FIXED_FILE))
- 		req->file = io_file_get_normal(req, req->fd);
++		req->file = io_file_get_normal(req, req->cqe.fd);
 +	if (!def->needs_async_setup)
  		return 0;
  	if (WARN_ON_ONCE(req_has_async_data(req)))
  		return -EFAULT;