kvm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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>,
	Colin Ian King <colin.king@canonical.com>,
	Norbert Slusarek <nslusarek@gmx.net>,
	Andra Paraschiv <andraprs@amazon.com>
Cc: <kvm@vger.kernel.org>,
	<virtualization@lists.linux-foundation.org>,
	<netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	<stsp2@yandex.ru>, <oxffffaa@gmail.com>
Subject: [RFC PATCH v9 15/19] vhost/vsock: enable SEQPACKET for transport
Date: Sat, 8 May 2021 19:36:31 +0300	[thread overview]
Message-ID: <20210508163634.3432505-1-arseny.krasnov@kaspersky.com> (raw)
In-Reply-To: <20210508163027.3430238-1-arseny.krasnov@kaspersky.com>

This removes:
1) Ignore of non-stream type of packets.
This adds:
1) Handling of SEQPACKET bit: if guest sets features with this bit cleared,
   then SOCK_SEQPACKET support will be disabled.
2) 'seqpacket_allow()' callback.
3) Handling of SEQ_EOR bit: when vhost places data in buffers of guest's
   rx queue, keep this bit set only when last piece of data is copied.

Signed-off-by: Arseny Krasnov <arseny.krasnov@kaspersky.com>
---
 v8 -> v9:
 1) Move 'seqpacket_allow' to 'struct vhost_vsock'.
 2) Use cpu_to_le32()/le32_to_cpu() to work with 'flags' of packet.

 drivers/vhost/vsock.c | 42 +++++++++++++++++++++++++++++++++++++++---
 1 file changed, 39 insertions(+), 3 deletions(-)

diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c
index 5e78fb719602..3395b25d4a35 100644
--- a/drivers/vhost/vsock.c
+++ b/drivers/vhost/vsock.c
@@ -31,7 +31,8 @@
 
 enum {
 	VHOST_VSOCK_FEATURES = VHOST_FEATURES |
-			       (1ULL << VIRTIO_F_ACCESS_PLATFORM)
+			       (1ULL << VIRTIO_F_ACCESS_PLATFORM) |
+			       (1ULL << VIRTIO_VSOCK_F_SEQPACKET)
 };
 
 enum {
@@ -56,6 +57,7 @@ struct vhost_vsock {
 	atomic_t queued_replies;
 
 	u32 guest_cid;
+	bool seqpacket_allow;
 };
 
 static u32 vhost_transport_get_local_cid(void)
@@ -112,6 +114,7 @@ vhost_transport_do_send_pkt(struct vhost_vsock *vsock,
 		size_t nbytes;
 		size_t iov_len, payload_len;
 		int head;
+		bool restore_flag = false;
 
 		spin_lock_bh(&vsock->send_pkt_list_lock);
 		if (list_empty(&vsock->send_pkt_list)) {
@@ -174,6 +177,12 @@ vhost_transport_do_send_pkt(struct vhost_vsock *vsock,
 		/* Set the correct length in the header */
 		pkt->hdr.len = cpu_to_le32(payload_len);
 
+		if (pkt->off + payload_len < pkt->len &&
+		    le32_to_cpu(pkt->hdr.flags) & VIRTIO_VSOCK_SEQ_EOR) {
+			pkt->hdr.flags &= ~cpu_to_le32(VIRTIO_VSOCK_SEQ_EOR);
+			restore_flag = true;
+		}
+
 		nbytes = copy_to_iter(&pkt->hdr, sizeof(pkt->hdr), &iov_iter);
 		if (nbytes != sizeof(pkt->hdr)) {
 			virtio_transport_free_pkt(pkt);
@@ -181,6 +190,9 @@ vhost_transport_do_send_pkt(struct vhost_vsock *vsock,
 			break;
 		}
 
+		if (restore_flag)
+			pkt->hdr.flags |= cpu_to_le32(VIRTIO_VSOCK_SEQ_EOR);
+
 		nbytes = copy_to_iter(pkt->buf + pkt->off, payload_len,
 				      &iov_iter);
 		if (nbytes != payload_len) {
@@ -354,8 +366,7 @@ vhost_vsock_alloc_pkt(struct vhost_virtqueue *vq,
 		return NULL;
 	}
 
-	if (le16_to_cpu(pkt->hdr.type) == VIRTIO_VSOCK_TYPE_STREAM)
-		pkt->len = le32_to_cpu(pkt->hdr.len);
+	pkt->len = le32_to_cpu(pkt->hdr.len);
 
 	/* No payload */
 	if (!pkt->len)
@@ -398,6 +409,8 @@ static bool vhost_vsock_more_replies(struct vhost_vsock *vsock)
 	return val < vq->num;
 }
 
+static bool vhost_transport_seqpacket_allow(u32 remote_cid);
+
 static struct virtio_transport vhost_transport = {
 	.transport = {
 		.module                   = THIS_MODULE,
@@ -424,6 +437,10 @@ static struct virtio_transport vhost_transport = {
 		.stream_is_active         = virtio_transport_stream_is_active,
 		.stream_allow             = virtio_transport_stream_allow,
 
+		.seqpacket_dequeue        = virtio_transport_seqpacket_dequeue,
+		.seqpacket_enqueue        = virtio_transport_seqpacket_enqueue,
+		.seqpacket_allow          = vhost_transport_seqpacket_allow,
+
 		.notify_poll_in           = virtio_transport_notify_poll_in,
 		.notify_poll_out          = virtio_transport_notify_poll_out,
 		.notify_recv_init         = virtio_transport_notify_recv_init,
@@ -441,6 +458,22 @@ static struct virtio_transport vhost_transport = {
 	.send_pkt = vhost_transport_send_pkt,
 };
 
+static bool vhost_transport_seqpacket_allow(u32 remote_cid)
+{
+	struct vhost_vsock *vsock;
+	bool seqpacket_allow = false;
+
+	rcu_read_lock();
+	vsock = vhost_vsock_get(remote_cid);
+
+	if (vsock)
+		seqpacket_allow = vsock->seqpacket_allow;
+
+	rcu_read_unlock();
+
+	return seqpacket_allow;
+}
+
 static void vhost_vsock_handle_tx_kick(struct vhost_work *work)
 {
 	struct vhost_virtqueue *vq = container_of(work, struct vhost_virtqueue,
@@ -785,6 +818,9 @@ static int vhost_vsock_set_features(struct vhost_vsock *vsock, u64 features)
 			goto err;
 	}
 
+	if (features & (1ULL << VIRTIO_VSOCK_F_SEQPACKET))
+		vsock->seqpacket_allow = true;
+
 	for (i = 0; i < ARRAY_SIZE(vsock->vqs); i++) {
 		vq = &vsock->vqs[i];
 		mutex_lock(&vq->mutex);
-- 
2.25.1


  parent reply	other threads:[~2021-05-08 16:37 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-08 16:30 [RFC PATCH v9 00/19] virtio/vsock: introduce SOCK_SEQPACKET support Arseny Krasnov
2021-05-08 16:32 ` [RFC PATCH v9 01/19] af_vsock: update functions for connectible socket Arseny Krasnov
2021-05-08 16:32 ` [RFC PATCH v9 02/19] af_vsock: separate wait data loop Arseny Krasnov
2021-05-08 16:33 ` [RFC PATCH v9 03/19] af_vsock: separate receive " Arseny Krasnov
2021-05-08 16:33 ` [RFC PATCH v9 04/19] af_vsock: implement SEQPACKET receive loop Arseny Krasnov
2021-05-13 11:37   ` Stefano Garzarella
2021-05-13 14:41     ` Arseny Krasnov
2021-05-08 16:33 ` [RFC PATCH v9 05/19] af_vsock: implement send logic for SEQPACKET Arseny Krasnov
2021-05-08 16:33 ` [RFC PATCH v9 06/19] af_vsock: rest of SEQPACKET support Arseny Krasnov
2021-05-13 11:42   ` Stefano Garzarella
2021-05-08 16:34 ` [RFC PATCH v9 07/19] af_vsock: update comments for stream sockets Arseny Krasnov
2021-05-08 16:34 ` [RFC PATCH v9 08/19] virtio/vsock: set packet's type in virtio_transport_send_pkt_info() Arseny Krasnov
2021-05-08 16:34 ` [RFC PATCH v9 09/19] virtio/vsock: simplify credit update function API Arseny Krasnov
2021-05-08 16:35 ` [RFC PATCH v9 10/19] virtio/vsock: defines and constants for SEQPACKET Arseny Krasnov
2021-05-13 11:45   ` Stefano Garzarella
2021-05-13 14:42     ` Arseny Krasnov
2021-05-08 16:35 ` [RFC PATCH v9 11/19] virtio/vsock: dequeue callback for SOCK_SEQPACKET Arseny Krasnov
2021-05-13 11:58   ` Stefano Garzarella
2021-05-13 14:42     ` Arseny Krasnov
2021-05-13 12:18   ` Stefano Garzarella
2021-05-08 16:35 ` [RFC PATCH v9 12/19] virtio/vsock: add SEQPACKET receive logic Arseny Krasnov
2021-05-13 12:14   ` Stefano Garzarella
2021-05-13 14:43     ` Arseny Krasnov
2021-05-08 16:35 ` [RFC PATCH v9 13/19] virtio/vsock: rest of SOCK_SEQPACKET support Arseny Krasnov
2021-05-13 12:27   ` Stefano Garzarella
2021-05-13 13:03     ` Stefano Garzarella
2021-05-08 16:36 ` [RFC PATCH v9 14/19] virtio/vsock: enable SEQPACKET for transport Arseny Krasnov
2021-05-13 12:49   ` Stefano Garzarella
2021-05-13 14:44     ` Arseny Krasnov
2021-05-08 16:36 ` Arseny Krasnov [this message]
2021-05-13 13:44   ` [RFC PATCH v9 15/19] vhost/vsock: " Stefano Garzarella
2021-05-08 16:36 ` [RFC PATCH v9 16/19] vsock/loopback: " Arseny Krasnov
2021-05-08 16:37 ` [RFC PATCH v9 17/19] vsock_test: add SOCK_SEQPACKET tests Arseny Krasnov
2021-05-13 13:47   ` Stefano Garzarella
2021-05-08 16:37 ` [RFC PATCH v9 18/19] virtio/vsock: update trace event for SEQPACKET Arseny Krasnov
2021-05-08 16:37 ` [RFC PATCH v9 19/19] af_vsock: serialize writes to shared socket Arseny Krasnov
2021-05-13 14:01   ` Stefano Garzarella
2021-05-13 14:45     ` Arseny Krasnov
2021-05-13 14:46     ` Stefano Garzarella
2021-05-13 14:48       ` Arseny Krasnov
2021-05-13 15:41         ` Stefano Garzarella
2021-05-13 14:51     ` Arseny Krasnov
2021-05-13 14:10 ` [RFC PATCH v9 00/19] virtio/vsock: introduce SOCK_SEQPACKET support Stefano Garzarella
2021-05-13 14:46   ` 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=20210508163634.3432505-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=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).