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>,
Norbert Slusarek <nslusarek@gmx.net>,
Colin Ian King <colin.king@canonical.com>,
David Brazdil <dbrazdil@google.com>,
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 15/19] vhost/vsock: enable SEQPACKET for transport
Date: Tue, 13 Apr 2021 15:46:18 +0300 [thread overview]
Message-ID: <20210413124620.3405764-1-arseny.krasnov@kaspersky.com> (raw)
In-Reply-To: <20210413123954.3396314-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>
---
v7 -> v8:
- This patch merged with patch which adds SEQPACKET feature bit to
virtio transport.
- It now handles VIRTIO_VSOCK_SEQ_EOR bit(see commit msg).
drivers/vhost/vsock.c | 31 ++++++++++++++++++++++++++++---
1 file changed, 28 insertions(+), 3 deletions(-)
diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c
index 5e78fb719602..0969cdc87830 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 {
@@ -112,6 +113,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 +176,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 &&
+ pkt->hdr.flags & VIRTIO_VSOCK_SEQ_EOR) {
+ pkt->hdr.flags &= ~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 +189,9 @@ vhost_transport_do_send_pkt(struct vhost_vsock *vsock,
break;
}
+ if (restore_flag)
+ pkt->hdr.flags |= VIRTIO_VSOCK_SEQ_EOR;
+
nbytes = copy_to_iter(pkt->buf + pkt->off, payload_len,
&iov_iter);
if (nbytes != payload_len) {
@@ -354,8 +365,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 +408,8 @@ static bool vhost_vsock_more_replies(struct vhost_vsock *vsock)
return val < vq->num;
}
+static bool vhost_transport_seqpacket_allow(void);
+
static struct virtio_transport vhost_transport = {
.transport = {
.module = THIS_MODULE,
@@ -424,6 +436,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,
@@ -439,8 +455,14 @@ static struct virtio_transport vhost_transport = {
},
.send_pkt = vhost_transport_send_pkt,
+ .seqpacket_allow = false
};
+static bool vhost_transport_seqpacket_allow(void)
+{
+ return vhost_transport.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 +807,9 @@ static int vhost_vsock_set_features(struct vhost_vsock *vsock, u64 features)
goto err;
}
+ if (features & (1ULL << VIRTIO_VSOCK_F_SEQPACKET))
+ vhost_transport.seqpacket_allow = true;
+
for (i = 0; i < ARRAY_SIZE(vsock->vqs); i++) {
vq = &vsock->vqs[i];
mutex_lock(&vq->mutex);
--
2.25.1
next prev parent reply other threads:[~2021-04-13 12:47 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 ` [RFC PATCH v8 03/19] af_vsock: separate receive " Arseny Krasnov
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 ` Arseny Krasnov [this message]
2021-04-21 9:31 ` [RFC PATCH v8 15/19] vhost/vsock: " 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=20210413124620.3405764-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=dbrazdil@google.com \
--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).