From: Stefano Garzarella <sgarzare@redhat.com>
To: Arseny Krasnov <arseny.krasnov@kaspersky.com>
Cc: Stefan Hajnoczi <stefanha@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>,
kvm@vger.kernel.org, virtualization@lists.linux-foundation.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
oxffffaa@gmail.com
Subject: Re: [PATCH v10 12/18] virtio/vsock: add SEQPACKET receive logic
Date: Thu, 3 Jun 2021 16:56:23 +0200 [thread overview]
Message-ID: <20210603145623.cv7cmf2zfjsx4w2t@steredhat> (raw)
In-Reply-To: <20210520191824.1272172-1-arseny.krasnov@kaspersky.com>
On Thu, May 20, 2021 at 10:18:21PM +0300, Arseny Krasnov wrote:
>Update current receive logic for SEQPACKET support: performs
>check for packet and socket types on receive(if mismatch, then
>reset connection).
We also copy the flags. Please check better your commit messages.
>
>Signed-off-by: Arseny Krasnov <arseny.krasnov@kaspersky.com>
>---
> v9 -> v10:
> 1) Commit message updated.
> 2) Comment updated.
> 3) Updated way to to set 'last_pkt' flags.
>
> net/vmw_vsock/virtio_transport_common.c | 30 ++++++++++++++++++++++---
> 1 file changed, 27 insertions(+), 3 deletions(-)
>
>diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c
>index 61349b2ea7fe..a6f8b0f39775 100644
>--- a/net/vmw_vsock/virtio_transport_common.c
>+++ b/net/vmw_vsock/virtio_transport_common.c
>@@ -165,6 +165,14 @@ void virtio_transport_deliver_tap_pkt(struct virtio_vsock_pkt *pkt)
> }
> EXPORT_SYMBOL_GPL(virtio_transport_deliver_tap_pkt);
>
>+static u16 virtio_transport_get_type(struct sock *sk)
>+{
>+ if (sk->sk_type == SOCK_STREAM)
>+ return VIRTIO_VSOCK_TYPE_STREAM;
>+ else
>+ return VIRTIO_VSOCK_TYPE_SEQPACKET;
>+}
>+
> /* This function can only be used on connecting/connected sockets,
> * since a socket assigned to a transport is required.
> *
>@@ -979,13 +987,17 @@ virtio_transport_recv_enqueue(struct vsock_sock *vsk,
> struct virtio_vsock_pkt, list);
>
> /* If there is space in the last packet queued, we copy the
>- * new packet in its buffer.
>+ * new packet in its buffer(except SEQPACKET case, when we
>+ * also check that last packet is not last packet of previous
>+ * record).
Is better to explain why we don't do this for SEQPACKET, something like this:
/* If there is space in the last packet queued, we copy the
* new packet in its buffer.
* We avoid this if the last packet queued has
* VIRTIO_VSOCK_SEQ_EOR set, because it is the delimiter
* of SEQPACKET record, so `pkt` is the first packet
* of a new record.
*/
> */
>- if (pkt->len <= last_pkt->buf_len - last_pkt->len) {
>+ if ((pkt->len <= last_pkt->buf_len - last_pkt->len) &&
>+ !(le32_to_cpu(last_pkt->hdr.flags) & VIRTIO_VSOCK_SEQ_EOR)) {
> memcpy(last_pkt->buf + last_pkt->len, pkt->buf,
> pkt->len);
> last_pkt->len += pkt->len;
> free_pkt = true;
>+ last_pkt->hdr.flags |= pkt->hdr.flags;
> goto out;
> }
> }
>@@ -1151,6 +1163,12 @@ virtio_transport_recv_listen(struct sock *sk, struct virtio_vsock_pkt *pkt,
> return 0;
> }
>
>+static bool virtio_transport_valid_type(u16 type)
>+{
>+ return (type == VIRTIO_VSOCK_TYPE_STREAM) ||
>+ (type == VIRTIO_VSOCK_TYPE_SEQPACKET);
>+}
>+
> /* We are under the virtio-vsock's vsock->rx_lock or vhost-vsock's vq->mutex
> * lock.
> */
>@@ -1176,7 +1194,7 @@ void virtio_transport_recv_pkt(struct virtio_transport *t,
> le32_to_cpu(pkt->hdr.buf_alloc),
> le32_to_cpu(pkt->hdr.fwd_cnt));
>
>- if (le16_to_cpu(pkt->hdr.type) != VIRTIO_VSOCK_TYPE_STREAM) {
>+ if (!virtio_transport_valid_type(le16_to_cpu(pkt->hdr.type))) {
> (void)virtio_transport_reset_no_sock(t, pkt);
> goto free_pkt;
> }
>@@ -1193,6 +1211,12 @@ void virtio_transport_recv_pkt(struct virtio_transport *t,
> }
> }
>
>+ if (virtio_transport_get_type(sk) != le16_to_cpu(pkt->hdr.type)) {
>+ (void)virtio_transport_reset_no_sock(t, pkt);
>+ sock_put(sk);
>+ goto free_pkt;
>+ }
>+
> vsk = vsock_sk(sk);
>
> lock_sock(sk);
>--
>2.25.1
>
The rest LGTM.
Stefano
next prev parent reply other threads:[~2021-06-03 14:56 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-20 19:13 [PATCH v10 00/18] virtio/vsock: introduce SOCK_SEQPACKET support Arseny Krasnov
2021-05-20 19:14 ` [PATCH v10 01/18] af_vsock: update functions for connectible socket Arseny Krasnov
2021-05-20 19:15 ` [PATCH v10 02/18] af_vsock: separate wait data loop Arseny Krasnov
2021-05-20 19:15 ` [PATCH v10 03/18] af_vsock: separate receive " Arseny Krasnov
2021-05-20 19:16 ` [PATCH v10 04/18] af_vsock: implement SEQPACKET receive loop Arseny Krasnov
2021-05-25 14:08 ` Stefano Garzarella
2021-06-04 15:06 ` Stefano Garzarella
2021-06-04 18:00 ` [MASSMAIL KLMS] " Arseny Krasnov
2021-06-07 10:48 ` Stefano Garzarella
2021-06-07 11:29 ` Arseny Krasnov
2021-06-07 12:28 ` Stefano Garzarella
2021-05-20 19:16 ` [PATCH v10 05/18] af_vsock: implement send logic for SEQPACKET Arseny Krasnov
2021-05-20 19:16 ` [PATCH v10 06/18] af_vsock: rest of SEQPACKET support Arseny Krasnov
2021-05-25 14:17 ` Stefano Garzarella
2021-05-20 19:16 ` [PATCH v10 07/18] af_vsock: update comments for stream sockets Arseny Krasnov
2021-05-20 19:17 ` [PATCH v10 08/18] virtio/vsock: set packet's type in virtio_transport_send_pkt_info() Arseny Krasnov
2021-05-20 19:17 ` [PATCH v10 09/18] virtio/vsock: simplify credit update function API Arseny Krasnov
2021-05-20 19:17 ` [PATCH v10 10/18] virtio/vsock: defines and constants for SEQPACKET Arseny Krasnov
2021-05-20 19:17 ` [PATCH v10 11/18] virtio/vsock: dequeue callback for SOCK_SEQPACKET Arseny Krasnov
2021-06-03 14:45 ` Stefano Garzarella
2021-06-04 13:12 ` Arseny Krasnov
2021-06-04 15:03 ` Stefano Garzarella
2021-06-04 18:03 ` Arseny Krasnov
2021-06-07 11:04 ` Stefano Garzarella
2021-06-07 13:18 ` Arseny Krasnov
2021-06-08 8:23 ` Stefano Garzarella
2021-06-08 9:40 ` Arseny Krasnov
2021-06-08 10:19 ` Stefano Garzarella
2021-06-08 10:24 ` Arseny Krasnov
2021-06-08 10:39 ` Stefano Garzarella
2021-05-20 19:18 ` [PATCH v10 12/18] virtio/vsock: add SEQPACKET receive logic Arseny Krasnov
2021-06-03 14:56 ` Stefano Garzarella [this message]
2021-05-20 19:18 ` [PATCH v10 13/18] virtio/vsock: rest of SOCK_SEQPACKET support Arseny Krasnov
2021-06-03 15:14 ` Stefano Garzarella
2021-05-20 19:18 ` [PATCH v10 14/18] virtio/vsock: enable SEQPACKET for transport Arseny Krasnov
2021-06-03 15:22 ` Stefano Garzarella
2021-05-20 19:19 ` [PATCH v10 15/18] vhost/vsock: support " Arseny Krasnov
2021-06-03 15:34 ` Stefano Garzarella
2021-06-04 13:13 ` Arseny Krasnov
2021-05-20 19:19 ` [PATCH v10 16/18] vsock/loopback: enable " Arseny Krasnov
2021-05-20 19:19 ` [PATCH v10 17/18] vsock_test: add SOCK_SEQPACKET tests Arseny Krasnov
2021-06-03 15:38 ` Stefano Garzarella
2021-05-20 19:20 ` [PATCH v10 18/18] virtio/vsock: update trace event for SEQPACKET Arseny Krasnov
2021-06-03 15:40 ` Stefano Garzarella
2021-05-21 7:55 ` [PATCH v10 00/18] virtio/vsock: introduce SOCK_SEQPACKET support Stefano Garzarella
2021-05-23 12:14 ` Arseny Krasnov
2021-05-25 8:22 ` Arseny Krasnov
2021-05-25 14:52 ` Stefano Garzarella
2021-05-26 12:16 ` 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=20210603145623.cv7cmf2zfjsx4w2t@steredhat \
--to=sgarzare@redhat.com \
--cc=andraprs@amazon.com \
--cc=arseny.krasnov@kaspersky.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=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).