From: Jens Axboe <axboe@kernel.dk>
Date: Mon, 25 Jul 2022 00:41:03 +0000 (-0600)
Subject: Merge branch 'for-5.20/io_uring' into for-5.20/io_uring-zerocopy-send
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=4effe18fc0da27ae5d51a702841e87fa13b8a32d;p=linux.git

Merge branch 'for-5.20/io_uring' into for-5.20/io_uring-zerocopy-send

* for-5.20/io_uring: (716 commits)
  io_uring: ensure REQ_F_ISREG is set async offload
  net: fix compat pointer in get_compat_msghdr()
  io_uring: Don't require reinitable percpu_ref
  io_uring: fix types in io_recvmsg_multishot_overflow
  io_uring: Use atomic_long_try_cmpxchg in __io_account_mem
  io_uring: support multishot in recvmsg
  net: copy from user before calling __get_compat_msghdr
  net: copy from user before calling __copy_msghdr
  io_uring: support 0 length iov in buffer select in compat
  io_uring: fix multishot ending when not polled
  io_uring: add netmsg cache
  io_uring: impose max limit on apoll cache
  io_uring: add abstraction around apoll cache
  io_uring: move apoll cache to poll.c
  io_uring: consolidate hash_locked io-wq handling
  io_uring: clear REQ_F_HASH_LOCKED on hash removal
  io_uring: don't race double poll setting REQ_F_ASYNC_DATA
  io_uring: don't miss setting REQ_F_DOUBLE_POLL
  io_uring: disable multishot recvmsg
  io_uring: only trace one of complete or overflow
  ...

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

4effe18fc0da27ae5d51a702841e87fa13b8a32d
diff --cc net/compat.c
index 6cd2e7683dd06,ed880729d159b..fe9be3c56ef71
--- a/net/compat.c
+++ b/net/compat.c
@@@ -80,9 -75,6 +75,7 @@@ int __get_compat_msghdr(struct msghdr *
  		return -EMSGSIZE;
  
  	kmsg->msg_iocb = NULL;
 +	kmsg->msg_ubuf = NULL;
- 	*ptr = msg.msg_iov;
- 	*len = msg.msg_iovlen;
  	return 0;
  }
  
diff --cc net/socket.c
index 82af3882b8767,843545c21ec23..ec9ef13a702ec
--- a/net/socket.c
+++ b/net/socket.c
@@@ -2406,9 -2400,6 +2401,7 @@@ int __copy_msghdr(struct msghdr *kmsg
  		return -EMSGSIZE;
  
  	kmsg->msg_iocb = NULL;
 +	kmsg->msg_ubuf = NULL;
- 	*uiov = msg.msg_iov;
- 	*nsegs = msg.msg_iovlen;
  	return 0;
  }