From: Arseny Krasnov <arseny.krasnov@kaspersky.com>
To: Stefan Hajnoczi <stefanha@redhat.com>,
Stefano Garzarella <sgarzare@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Jason Wang <jasowang@redhat.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Jorgen Hansen <jhansen@vmware.com>,
Andra Paraschiv <andraprs@amazon.com>,
Colin Ian King <colin.king@canonical.com>,
Norbert Slusarek <nslusarek@gmx.net>,
Alexander Popov <alex.popov@linux.com>
Cc: <kvm@vger.kernel.org>,
<virtualization@lists.linux-foundation.org>,
<netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<stsp2@yandex.ru>, <arseny.krasnov@kaspersky.com>,
<oxffffaa@gmail.com>
Subject: [RFC PATCH v8 03/19] af_vsock: separate receive data loop
Date: Tue, 13 Apr 2021 15:42:34 +0300 [thread overview]
Message-ID: <20210413124237.3399645-1-arseny.krasnov@kaspersky.com> (raw)
In-Reply-To: <20210413123954.3396314-1-arseny.krasnov@kaspersky.com>
Move STREAM specific data receive logic to '__vsock_stream_recvmsg()'
dedicated function, while checks, that will be same for both STREAM
and SEQPACKET sockets, stays in 'vsock_connectible_recvmsg()' shared
functions.
Signed-off-by: Arseny Krasnov <arseny.krasnov@kaspersky.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
---
net/vmw_vsock/af_vsock.c | 116 ++++++++++++++++++++++-----------------
1 file changed, 67 insertions(+), 49 deletions(-)
diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
index ba5ec37a4e12..c4f6bfa1e381 100644
--- a/net/vmw_vsock/af_vsock.c
+++ b/net/vmw_vsock/af_vsock.c
@@ -1896,65 +1896,22 @@ static int vsock_wait_data(struct sock *sk, struct wait_queue_entry *wait,
return data;
}
-static int
-vsock_connectible_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
- int flags)
+static int __vsock_stream_recvmsg(struct sock *sk, struct msghdr *msg,
+ size_t len, int flags)
{
- struct sock *sk;
- struct vsock_sock *vsk;
+ struct vsock_transport_recv_notify_data recv_data;
const struct vsock_transport *transport;
- int err;
- size_t target;
+ struct vsock_sock *vsk;
ssize_t copied;
+ size_t target;
long timeout;
- struct vsock_transport_recv_notify_data recv_data;
+ int err;
DEFINE_WAIT(wait);
- sk = sock->sk;
vsk = vsock_sk(sk);
- err = 0;
-
- lock_sock(sk);
-
transport = vsk->transport;
- if (!transport || sk->sk_state != TCP_ESTABLISHED) {
- /* Recvmsg is supposed to return 0 if a peer performs an
- * orderly shutdown. Differentiate between that case and when a
- * peer has not connected or a local shutdown occured with the
- * SOCK_DONE flag.
- */
- if (sock_flag(sk, SOCK_DONE))
- err = 0;
- else
- err = -ENOTCONN;
-
- goto out;
- }
-
- if (flags & MSG_OOB) {
- err = -EOPNOTSUPP;
- goto out;
- }
-
- /* We don't check peer_shutdown flag here since peer may actually shut
- * down, but there can be data in the queue that a local socket can
- * receive.
- */
- if (sk->sk_shutdown & RCV_SHUTDOWN) {
- err = 0;
- goto out;
- }
-
- /* It is valid on Linux to pass in a zero-length receive buffer. This
- * is not an error. We may as well bail out now.
- */
- if (!len) {
- err = 0;
- goto out;
- }
-
/* We must not copy less than target bytes into the user's buffer
* before returning successfully, so we wait for the consume queue to
* have that much data to consume before dequeueing. Note that this
@@ -2013,6 +1970,67 @@ vsock_connectible_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
if (copied > 0)
err = copied;
+out:
+ return err;
+}
+
+static int
+vsock_connectible_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
+ int flags)
+{
+ struct sock *sk;
+ struct vsock_sock *vsk;
+ const struct vsock_transport *transport;
+ int err;
+
+ DEFINE_WAIT(wait);
+
+ sk = sock->sk;
+ vsk = vsock_sk(sk);
+ err = 0;
+
+ lock_sock(sk);
+
+ transport = vsk->transport;
+
+ if (!transport || sk->sk_state != TCP_ESTABLISHED) {
+ /* Recvmsg is supposed to return 0 if a peer performs an
+ * orderly shutdown. Differentiate between that case and when a
+ * peer has not connected or a local shutdown occurred with the
+ * SOCK_DONE flag.
+ */
+ if (sock_flag(sk, SOCK_DONE))
+ err = 0;
+ else
+ err = -ENOTCONN;
+
+ goto out;
+ }
+
+ if (flags & MSG_OOB) {
+ err = -EOPNOTSUPP;
+ goto out;
+ }
+
+ /* We don't check peer_shutdown flag here since peer may actually shut
+ * down, but there can be data in the queue that a local socket can
+ * receive.
+ */
+ if (sk->sk_shutdown & RCV_SHUTDOWN) {
+ err = 0;
+ goto out;
+ }
+
+ /* It is valid on Linux to pass in a zero-length receive buffer. This
+ * is not an error. We may as well bail out now.
+ */
+ if (!len) {
+ err = 0;
+ goto out;
+ }
+
+ err = __vsock_stream_recvmsg(sk, msg, len, flags);
+
out:
release_sock(sk);
return err;
--
2.25.1
next prev parent reply other threads:[~2021-04-13 12:44 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-13 12:39 [RFC PATCH v8 00/19] virtio/vsock: introduce SOCK_SEQPACKET support Arseny Krasnov
2021-04-13 12:41 ` [RFC PATCH v8 01/19] af_vsock: update functions for connectible socket Arseny Krasnov
2021-04-13 12:42 ` [RFC PATCH v8 02/19] af_vsock: separate wait data loop Arseny Krasnov
2021-04-13 12:42 ` Arseny Krasnov [this message]
2021-04-13 12:42 ` [RFC PATCH v8 04/19] af_vsock: implement SEQPACKET receive loop Arseny Krasnov
2021-04-21 8:37 ` Stefano Garzarella
2021-04-21 14:47 ` Arseny Krasnov
2021-04-13 12:43 ` [RFC PATCH v8 05/19] af_vsock: implement send logic for SEQPACKET Arseny Krasnov
2021-04-13 12:43 ` [RFC PATCH v8 06/19] af_vsock: rest of SEQPACKET support Arseny Krasnov
2021-04-13 12:43 ` [RFC PATCH v8 07/19] af_vsock: update comments for stream sockets Arseny Krasnov
2021-04-13 12:43 ` [RFC PATCH v8 08/19] virtio/vsock: set packet's type in virtio_transport_send_pkt_info() Arseny Krasnov
2021-04-13 12:44 ` [RFC PATCH v8 09/19] virtio/vsock: simplify credit update function API Arseny Krasnov
2021-04-13 12:44 ` [RFC PATCH v8 10/19] virtio/vsock: defines and constants for SEQPACKET Arseny Krasnov
2021-04-13 12:44 ` [RFC PATCH v8 11/19] virtio/vsock: dequeue callback for SOCK_SEQPACKET Arseny Krasnov
2021-04-14 5:21 ` Arseny Krasnov
2021-04-21 8:56 ` Stefano Garzarella
2021-04-21 14:49 ` Arseny Krasnov
2021-04-13 12:45 ` [RFC PATCH v8 12/19] virtio/vsock: add SEQPACKET receive logic Arseny Krasnov
2021-04-13 12:45 ` [RFC PATCH v8 13/19] virtio/vsock: rest of SOCK_SEQPACKET support Arseny Krasnov
2021-04-21 9:12 ` Stefano Garzarella
2021-04-21 14:50 ` Arseny Krasnov
2021-04-13 12:45 ` [RFC PATCH v8 14/19] virtio/vsock: enable SEQPACKET for transport Arseny Krasnov
2021-04-21 9:22 ` Stefano Garzarella
2021-04-13 12:46 ` [RFC PATCH v8 15/19] vhost/vsock: " Arseny Krasnov
2021-04-21 9:31 ` Stefano Garzarella
2021-04-13 12:46 ` [RFC PATCH v8 16/19] vsock/loopback: " Arseny Krasnov
2021-04-21 9:34 ` Stefano Garzarella
2021-04-13 12:46 ` [RFC PATCH v8 17/19] vsock_test: add SOCK_SEQPACKET tests Arseny Krasnov
2021-04-21 9:35 ` Stefano Garzarella
2021-04-21 15:00 ` Arseny Krasnov
2021-04-13 12:47 ` [RFC PATCH v8 18/19] virtio/vsock: update trace event for SEQPACKET Arseny Krasnov
2021-04-13 12:47 ` [RFC PATCH v8 19/19] af_vsock: serialize writes to shared socket Arseny Krasnov
2021-04-14 10:51 ` Arseny Krasnov
2021-04-21 9:38 ` Stefano Garzarella
2021-04-21 15:02 ` Arseny Krasnov
2021-04-21 9:52 ` [RFC PATCH v8 00/19] virtio/vsock: introduce SOCK_SEQPACKET support Stefano Garzarella
2021-04-21 15:06 ` Arseny Krasnov
2021-04-22 8:46 ` Stefano Garzarella
2021-04-22 9:40 ` Arseny Krasnov
2021-04-22 10:02 ` Stefano Garzarella
2021-04-22 10:29 ` Arseny Krasnov
2021-04-22 10:48 ` Stefano Garzarella
2021-04-22 11:41 ` Arseny Krasnov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210413124237.3399645-1-arseny.krasnov@kaspersky.com \
--to=arseny.krasnov@kaspersky.com \
--cc=alex.popov@linux.com \
--cc=andraprs@amazon.com \
--cc=colin.king@canonical.com \
--cc=davem@davemloft.net \
--cc=jasowang@redhat.com \
--cc=jhansen@vmware.com \
--cc=kuba@kernel.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=nslusarek@gmx.net \
--cc=oxffffaa@gmail.com \
--cc=sgarzare@redhat.com \
--cc=stefanha@redhat.com \
--cc=stsp2@yandex.ru \
--cc=virtualization@lists.linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).