From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 23 May 2022 19:51:04 +0000 (-0700)
Subject: Merge tag 'for-5.19/io_uring-net-2022-05-22' of git://git.kernel.dk/linux-block
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e1a8fde7203fa8a3e3f35d4f9df47477d23529c1;p=linux.git

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

Pull io_uring 'more data in socket' support from Jens Axboe:
 "To be able to fully utilize the 'poll first' support in the core
  io_uring branch, it's advantageous knowing if the socket was empty
  after a receive. This adds support for that"

* tag 'for-5.19/io_uring-net-2022-05-22' of git://git.kernel.dk/linux-block:
  io_uring: return hint on whether more data is available after receive
  tcp: pass back data left in socket after receive
---

e1a8fde7203fa8a3e3f35d4f9df47477d23529c1
diff --cc fs/io_uring.c
index d9529275a0306,20c5d29e5b6c9..1015dd49e7e55
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@@ -6115,6 -5947,8 +6115,7 @@@ static int io_recvmsg(struct io_kiocb *
  	struct io_async_msghdr iomsg, *kmsg;
  	struct io_sr_msg *sr = &req->sr_msg;
  	struct socket *sock;
 -	struct io_buffer *kbuf;
+ 	unsigned int cflags;
  	unsigned flags;
  	int ret, min_ret = 0;
  	bool force_nonblock = issue_flags & IO_URING_F_NONBLOCK;
@@@ -6154,7 -5982,10 +6155,8 @@@
  	if (flags & MSG_WAITALL)
  		min_ret = iov_iter_count(&kmsg->msg.msg_iter);
  
+ 	kmsg->msg.msg_get_inq = 1;
 -
 -	ret = __sys_recvmsg_sock(sock, &kmsg->msg, req->sr_msg.umsg,
 -					kmsg->uaddr, flags);
 +	ret = __sys_recvmsg_sock(sock, &kmsg->msg, sr->umsg, kmsg->uaddr, flags);
  	if (ret < min_ret) {
  		if (ret == -EAGAIN && force_nonblock)
  			return io_setup_async_msg(req, kmsg);
@@@ -6184,10 -6018,13 +6189,11 @@@
  
  static int io_recv(struct io_kiocb *req, unsigned int issue_flags)
  {
 -	struct io_buffer *kbuf;
  	struct io_sr_msg *sr = &req->sr_msg;
  	struct msghdr msg;
 -	void __user *buf = sr->buf;
  	struct socket *sock;
  	struct iovec iov;
+ 	unsigned int cflags;
  	unsigned flags;
  	int ret, min_ret = 0;
  	bool force_nonblock = issue_flags & IO_URING_F_NONBLOCK;
@@@ -6214,13 -6045,14 +6220,14 @@@
  		goto out_free;
  
  	msg.msg_name = NULL;
+ 	msg.msg_namelen = 0;
  	msg.msg_control = NULL;
+ 	msg.msg_get_inq = 1;
+ 	msg.msg_flags = 0;
  	msg.msg_controllen = 0;
- 	msg.msg_namelen = 0;
  	msg.msg_iocb = NULL;
- 	msg.msg_flags = 0;
  
 -	flags = req->sr_msg.msg_flags;
 +	flags = sr->msg_flags;
  	if (force_nonblock)
  		flags |= MSG_DONTWAIT;
  	if (flags & MSG_WAITALL)