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>, Colin Ian King <colin.king@canonical.com>, Andra Paraschiv <andraprs@amazon.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 15/18] vhost/vsock: support SEQPACKET for transport Date: Thu, 3 Jun 2021 17:34:59 +0200 [thread overview] Message-ID: <20210603153459.4qncp25nssuby4vp@steredhat> (raw) In-Reply-To: <20210520191916.1272540-1-arseny.krasnov@kaspersky.com> On Thu, May 20, 2021 at 10:19:13PM +0300, Arseny Krasnov wrote: Please describe better the changes included in this patch in the first part of the commit message. >As vhost places data in buffers of guest's rx queue, keep SEQ_EOR >bit set only when last piece of data is copied. Otherwise we get >sequence packets for one socket in guest's rx queue with SEQ_EOR bit >set. Also remove ignore of non-stream type of packets, handle SEQPACKET >feature bit. > >Signed-off-by: Arseny Krasnov <arseny.krasnov@kaspersky.com> >--- > v9 -> v10: > 1) Move 'restore_flag' handling to 'payload_len' calculation > block. > > drivers/vhost/vsock.c | 44 +++++++++++++++++++++++++++++++++++++++---- > 1 file changed, 40 insertions(+), 4 deletions(-) > >diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c >index 5e78fb719602..63d15beaad05 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)) { >@@ -168,9 +171,15 @@ vhost_transport_do_send_pkt(struct vhost_vsock *vsock, > /* If the packet is greater than the space available in the > * buffer, we split it using multiple buffers. > */ >- if (payload_len > iov_len - sizeof(pkt->hdr)) >+ if (payload_len > iov_len - sizeof(pkt->hdr)) { > payload_len = iov_len - sizeof(pkt->hdr); > Please, add a comment here to explain why we need this. >+ if (le32_to_cpu(pkt->hdr.flags) & >VIRTIO_VSOCK_SEQ_EOR) { >+ pkt->hdr.flags &= ~cpu_to_le32(VIRTIO_VSOCK_SEQ_EOR); >+ restore_flag = true; >+ } >+ } >+ > /* Set the correct length in the header */ > pkt->hdr.len = cpu_to_le32(payload_len); > >@@ -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); >+ Maybe we can restore the flag only if we are queueing again the same packet, I mean in the `if (pkt->off < pkt->len) {` branch below. What do you think? > 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 >
WARNING: multiple messages have this Message-ID (diff)
From: Stefano Garzarella <sgarzare@redhat.com> To: Arseny Krasnov <arseny.krasnov@kaspersky.com> Cc: Andra Paraschiv <andraprs@amazon.com>, kvm@vger.kernel.org, "Michael S. Tsirkin" <mst@redhat.com>, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, oxffffaa@gmail.com, Norbert Slusarek <nslusarek@gmx.net>, Stefan Hajnoczi <stefanha@redhat.com>, Colin Ian King <colin.king@canonical.com>, Jakub Kicinski <kuba@kernel.org>, "David S. Miller" <davem@davemloft.net>, Jorgen Hansen <jhansen@vmware.com> Subject: Re: [PATCH v10 15/18] vhost/vsock: support SEQPACKET for transport Date: Thu, 3 Jun 2021 17:34:59 +0200 [thread overview] Message-ID: <20210603153459.4qncp25nssuby4vp@steredhat> (raw) In-Reply-To: <20210520191916.1272540-1-arseny.krasnov@kaspersky.com> On Thu, May 20, 2021 at 10:19:13PM +0300, Arseny Krasnov wrote: Please describe better the changes included in this patch in the first part of the commit message. >As vhost places data in buffers of guest's rx queue, keep SEQ_EOR >bit set only when last piece of data is copied. Otherwise we get >sequence packets for one socket in guest's rx queue with SEQ_EOR bit >set. Also remove ignore of non-stream type of packets, handle SEQPACKET >feature bit. > >Signed-off-by: Arseny Krasnov <arseny.krasnov@kaspersky.com> >--- > v9 -> v10: > 1) Move 'restore_flag' handling to 'payload_len' calculation > block. > > drivers/vhost/vsock.c | 44 +++++++++++++++++++++++++++++++++++++++---- > 1 file changed, 40 insertions(+), 4 deletions(-) > >diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c >index 5e78fb719602..63d15beaad05 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)) { >@@ -168,9 +171,15 @@ vhost_transport_do_send_pkt(struct vhost_vsock *vsock, > /* If the packet is greater than the space available in the > * buffer, we split it using multiple buffers. > */ >- if (payload_len > iov_len - sizeof(pkt->hdr)) >+ if (payload_len > iov_len - sizeof(pkt->hdr)) { > payload_len = iov_len - sizeof(pkt->hdr); > Please, add a comment here to explain why we need this. >+ if (le32_to_cpu(pkt->hdr.flags) & >VIRTIO_VSOCK_SEQ_EOR) { >+ pkt->hdr.flags &= ~cpu_to_le32(VIRTIO_VSOCK_SEQ_EOR); >+ restore_flag = true; >+ } >+ } >+ > /* Set the correct length in the header */ > pkt->hdr.len = cpu_to_le32(payload_len); > >@@ -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); >+ Maybe we can restore the flag only if we are queueing again the same packet, I mean in the `if (pkt->off < pkt->len) {` branch below. What do you think? > 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 > _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization
next prev parent reply other threads:[~2021-06-03 15:35 UTC|newest] Thread overview: 68+ 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-05-25 14:08 ` Stefano Garzarella 2021-06-04 15:06 ` 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 10:48 ` Stefano Garzarella 2021-06-07 11:29 ` Arseny Krasnov 2021-06-07 12:28 ` Stefano Garzarella 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-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-03 14:45 ` Stefano Garzarella 2021-06-04 13:12 ` Arseny Krasnov 2021-06-04 15:03 ` Stefano Garzarella 2021-06-04 15:03 ` Stefano Garzarella 2021-06-04 18:03 ` Arseny Krasnov 2021-06-07 11:04 ` Stefano Garzarella 2021-06-07 11:04 ` Stefano Garzarella 2021-06-07 13:18 ` Arseny Krasnov 2021-06-08 8:23 ` Stefano Garzarella 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:19 ` Stefano Garzarella 2021-06-08 10:24 ` Arseny Krasnov 2021-06-08 10:39 ` Stefano Garzarella 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 2021-06-03 14:56 ` Stefano Garzarella 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-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-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 [this message] 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-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-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-21 7:55 ` 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-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=20210603153459.4qncp25nssuby4vp@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.