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>,
Arseny Krasnov <arseny.krasnov@kaspersky.com>,
Jorgen Hansen <jhansen@vmware.com>,
Norbert Slusarek <nslusarek@gmx.net>,
Colin Ian King <colin.king@canonical.com>,
Andra Paraschiv <andraprs@amazon.com>
Cc: <kvm@vger.kernel.org>,
<virtualization@lists.linux-foundation.org>,
<netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<oxffffaa@gmail.com>
Subject: [PATCH v11 04/18] af_vsock: implement SEQPACKET receive loop
Date: Fri, 11 Jun 2021 14:10:34 +0300 [thread overview]
Message-ID: <20210611111037.3651404-1-arseny.krasnov@kaspersky.com> (raw)
In-Reply-To: <20210611110744.3650456-1-arseny.krasnov@kaspersky.com>
Add receive loop for SEQPACKET. It looks like receive loop for
STREAM, but there are differences:
1) It doesn't call notify callbacks.
2) It doesn't care about 'SO_SNDLOWAT' and 'SO_RCVLOWAT' values, because
there is no sense for these values in SEQPACKET case.
3) It waits until whole record is received.
4) It processes and sets 'MSG_TRUNC' flag.
So to avoid extra conditions for two types of socket inside one loop, two
independent functions were created.
Signed-off-by: Arseny Krasnov <arseny.krasnov@kaspersky.com>
---
v10 -> v11:
1) 'msg_ready' input argument removed.
2) On 'vsock_wait_data()' error, error is returned(not 0).
3) Receive loop removed as user is woken up when it is possible
to dequeue whole message.
include/net/af_vsock.h | 4 +++
net/vmw_vsock/af_vsock.c | 55 +++++++++++++++++++++++++++++++++++++++-
2 files changed, 58 insertions(+), 1 deletion(-)
diff --git a/include/net/af_vsock.h b/include/net/af_vsock.h
index b1c717286993..4d7cf6b2aca2 100644
--- a/include/net/af_vsock.h
+++ b/include/net/af_vsock.h
@@ -135,6 +135,10 @@ struct vsock_transport {
bool (*stream_is_active)(struct vsock_sock *);
bool (*stream_allow)(u32 cid, u32 port);
+ /* SEQ_PACKET. */
+ ssize_t (*seqpacket_dequeue)(struct vsock_sock *vsk, struct msghdr *msg,
+ int flags);
+
/* Notification. */
int (*notify_poll_in)(struct vsock_sock *, size_t, bool *);
int (*notify_poll_out)(struct vsock_sock *, size_t, bool *);
diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
index c4f6bfa1e381..87ae26b2e3e1 100644
--- a/net/vmw_vsock/af_vsock.c
+++ b/net/vmw_vsock/af_vsock.c
@@ -1974,6 +1974,56 @@ static int __vsock_stream_recvmsg(struct sock *sk, struct msghdr *msg,
return err;
}
+static int __vsock_seqpacket_recvmsg(struct sock *sk, struct msghdr *msg,
+ size_t len, int flags)
+{
+ const struct vsock_transport *transport;
+ struct vsock_sock *vsk;
+ ssize_t record_len;
+ long timeout;
+ int err = 0;
+ DEFINE_WAIT(wait);
+
+ vsk = vsock_sk(sk);
+ transport = vsk->transport;
+
+ timeout = sock_rcvtimeo(sk, flags & MSG_DONTWAIT);
+
+ err = vsock_wait_data(sk, &wait, timeout, NULL, 0);
+ if (err <= 0)
+ goto out;
+
+ record_len = transport->seqpacket_dequeue(vsk, msg, flags);
+
+ if (record_len < 0) {
+ err = -ENOMEM;
+ goto out;
+ }
+
+ if (sk->sk_err) {
+ err = -sk->sk_err;
+ } else if (sk->sk_shutdown & RCV_SHUTDOWN) {
+ err = 0;
+ } else {
+ /* User sets MSG_TRUNC, so return real length of
+ * packet.
+ */
+ if (flags & MSG_TRUNC)
+ err = record_len;
+ else
+ err = len - msg_data_left(msg);
+
+ /* Always set MSG_TRUNC if real length of packet is
+ * bigger than user's buffer.
+ */
+ if (record_len > len)
+ msg->msg_flags |= MSG_TRUNC;
+ }
+
+out:
+ return err;
+}
+
static int
vsock_connectible_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
int flags)
@@ -2029,7 +2079,10 @@ vsock_connectible_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
goto out;
}
- err = __vsock_stream_recvmsg(sk, msg, len, flags);
+ if (sk->sk_type == SOCK_STREAM)
+ err = __vsock_stream_recvmsg(sk, msg, len, flags);
+ else
+ err = __vsock_seqpacket_recvmsg(sk, msg, len, flags);
out:
release_sock(sk);
--
2.25.1
next prev parent reply other threads:[~2021-06-11 11:10 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-11 11:07 [PATCH v11 00/18] virtio/vsock: introduce SOCK_SEQPACKET support Arseny Krasnov
2021-06-11 11:09 ` [PATCH v11 01/18] af_vsock: update functions for connectible socket Arseny Krasnov
2021-06-11 11:10 ` [PATCH v11 02/18] af_vsock: separate wait data loop Arseny Krasnov
2021-06-11 11:10 ` [PATCH v11 03/18] af_vsock: separate receive " Arseny Krasnov
2021-06-11 11:10 ` Arseny Krasnov [this message]
2021-06-11 11:10 ` [PATCH v11 05/18] af_vsock: implement send logic for SEQPACKET Arseny Krasnov
2021-06-11 11:11 ` [PATCH v11 06/18] af_vsock: rest of SEQPACKET support Arseny Krasnov
2021-06-11 11:11 ` [PATCH v11 07/18] af_vsock: update comments for stream sockets Arseny Krasnov
2021-06-11 11:11 ` [PATCH v11 08/18] virtio/vsock: set packet's type in virtio_transport_send_pkt_info() Arseny Krasnov
2021-06-11 11:12 ` [PATCH v11 09/18] virtio/vsock: simplify credit update function API Arseny Krasnov
2021-06-11 11:12 ` [PATCH v11 10/18] virtio/vsock: defines and constants for SEQPACKET Arseny Krasnov
2021-06-11 11:12 ` [PATCH v11 11/18] virtio/vsock: dequeue callback for SOCK_SEQPACKET Arseny Krasnov
2021-06-18 13:44 ` Stefano Garzarella
2021-06-18 13:51 ` Michael S. Tsirkin
2021-06-18 14:44 ` Stefano Garzarella
2021-06-18 15:04 ` Arseny Krasnov
2021-06-18 15:55 ` Stefano Garzarella
2021-06-18 16:08 ` [MASSMAIL KLMS] " Arseny Krasnov
2021-06-18 16:25 ` Stefano Garzarella
2021-06-18 16:26 ` Arseny Krasnov
2021-06-21 6:55 ` Arseny Krasnov
2021-06-21 10:23 ` Stefano Garzarella
2021-06-21 12:27 ` Arseny Krasnov
2021-06-11 11:12 ` [PATCH v11 12/18] virtio/vsock: add SEQPACKET receive logic Arseny Krasnov
2021-06-11 11:13 ` [PATCH v11 13/18] virtio/vsock: rest of SOCK_SEQPACKET support Arseny Krasnov
2021-06-11 11:13 ` [PATCH v11 14/18] virtio/vsock: enable SEQPACKET for transport Arseny Krasnov
2021-06-11 11:13 ` [PATCH v11 15/18] vhost/vsock: support " Arseny Krasnov
2021-06-11 11:13 ` [PATCH v11 16/18] vsock/loopback: enable " Arseny Krasnov
2021-06-11 11:14 ` [PATCH v11 17/18] vsock_test: add SOCK_SEQPACKET tests Arseny Krasnov
2021-06-11 11:14 ` [PATCH v11 18/18] virtio/vsock: update trace event for SEQPACKET Arseny Krasnov
2021-06-11 11:17 ` [PATCH v11 00/18] virtio/vsock: introduce SOCK_SEQPACKET support Arseny Krasnov
2021-06-11 12:25 ` Stefano Garzarella
2021-06-11 14:39 ` Arseny Krasnov
2021-06-11 14:57 ` Stefano Garzarella
2021-06-11 15:00 ` Arseny Krasnov
2021-06-11 21:00 ` patchwork-bot+netdevbpf
2021-06-18 13:49 ` Michael S. Tsirkin
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=20210611111037.3651404-1-arseny.krasnov@kaspersky.com \
--to=arseny.krasnov@kaspersky.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=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).