From: Stefano Garzarella <sgarzare@redhat.com>
To: Arseniy Krasnov <AVKrasnov@sberdevices.ru>
Cc: Stefan Hajnoczi <stefanha@redhat.com>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>,
Paolo Abeni <pabeni@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Jason Wang <jasowang@redhat.com>,
Bobby Eshleman <bobby.eshleman@bytedance.com>,
kvm@vger.kernel.org, virtualization@lists.linux-foundation.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
kernel@sberdevices.ru, oxffffaa@gmail.com
Subject: Re: [RFC PATCH v4 02/17] vhost/vsock: read data from non-linear skb
Date: Mon, 26 Jun 2023 17:24:07 +0200 [thread overview]
Message-ID: <vpcrdclcic7oiuat4oapnkj54dolld6hh2wixe3fozlthyt2ni@omyjyem3uj3t> (raw)
In-Reply-To: <20230603204939.1598818-3-AVKrasnov@sberdevices.ru>
On Sat, Jun 03, 2023 at 11:49:24PM +0300, Arseniy Krasnov wrote:
>This adds copying to guest's virtio buffers from non-linear skbs. Such
>skbs are created by protocol layer when MSG_ZEROCOPY flags is used. It
>changes call of 'copy_to_iter()' to 'skb_copy_datagram_iter()'. Second
>function can read data from non-linear skb.
>
>See commit to 'net/vmw_vsock/virtio_transport_common.c' with the same
>name for more details.
I think it's okay if we report the same details here.
>
>Signed-off-by: Arseniy Krasnov <AVKrasnov@sberdevices.ru>
>---
> drivers/vhost/vsock.c | 12 +++++++-----
> 1 file changed, 7 insertions(+), 5 deletions(-)
>
>diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c
>index 6578db78f0ae..b254aa4b756a 100644
>--- a/drivers/vhost/vsock.c
>+++ b/drivers/vhost/vsock.c
>@@ -156,7 +156,7 @@ vhost_transport_do_send_pkt(struct vhost_vsock *vsock,
> }
>
> iov_iter_init(&iov_iter, ITER_DEST, &vq->iov[out], in, iov_len);
>- payload_len = skb->len;
>+ payload_len = skb->len - VIRTIO_VSOCK_SKB_CB(skb)->frag_off;
Also here a variable should make the code more readable.
Stefano
> hdr = virtio_vsock_hdr(skb);
>
> /* If the packet is greater than the space available in the
>@@ -197,8 +197,10 @@ vhost_transport_do_send_pkt(struct vhost_vsock *vsock,
> break;
> }
>
>- nbytes = copy_to_iter(skb->data, payload_len, &iov_iter);
>- if (nbytes != payload_len) {
>+ if (skb_copy_datagram_iter(skb,
>+ VIRTIO_VSOCK_SKB_CB(skb)->frag_off,
>+ &iov_iter,
>+ payload_len)) {
> kfree_skb(skb);
> vq_err(vq, "Faulted on copying pkt buf\n");
> break;
>@@ -212,13 +214,13 @@ vhost_transport_do_send_pkt(struct vhost_vsock *vsock,
> vhost_add_used(vq, head, sizeof(*hdr) + payload_len);
> added = true;
>
>- skb_pull(skb, payload_len);
>+ VIRTIO_VSOCK_SKB_CB(skb)->frag_off += payload_len;
> total_len += payload_len;
>
> /* If we didn't send all the payload we can requeue the packet
> * to send it with the next available buffer.
> */
>- if (skb->len > 0) {
>+ if (VIRTIO_VSOCK_SKB_CB(skb)->frag_off < skb->len) {
> hdr->flags |= cpu_to_le32(flags_to_restore);
>
> /* We are queueing the same skb to handle
>--
>2.25.1
>
next prev parent reply other threads:[~2023-06-26 15:24 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-03 20:49 [RFC PATCH v4 00/17] vsock: MSG_ZEROCOPY flag support Arseniy Krasnov
2023-06-03 20:49 ` [RFC PATCH v4 01/17] vsock/virtio: read data from non-linear skb Arseniy Krasnov
2023-06-12 17:43 ` Bobby Eshleman
2023-06-26 15:20 ` Stefano Garzarella
2023-06-03 20:49 ` [RFC PATCH v4 02/17] vhost/vsock: " Arseniy Krasnov
2023-06-12 17:53 ` Bobby Eshleman
2023-06-26 15:24 ` Stefano Garzarella [this message]
2023-06-03 20:49 ` [RFC PATCH v4 03/17] vsock/virtio: support to send " Arseniy Krasnov
2023-06-12 18:30 ` Bobby Eshleman
2023-06-26 15:36 ` Stefano Garzarella
2023-06-27 4:39 ` Arseniy Krasnov
2023-06-27 7:49 ` Stefano Garzarella
2023-06-03 20:49 ` [RFC PATCH v4 04/17] vsock/virtio: non-linear skb handling for tap Arseniy Krasnov
2023-06-26 15:43 ` Stefano Garzarella
2023-06-03 20:49 ` [RFC PATCH v4 05/17] vsock/virtio: MSG_ZEROCOPY flag support Arseniy Krasnov
2023-06-26 16:03 ` Stefano Garzarella
2023-06-27 4:41 ` Arseniy Krasnov
2023-06-27 7:50 ` Stefano Garzarella
2023-06-27 8:22 ` Arseniy Krasnov
2023-06-29 12:32 ` Stefano Garzarella
2023-06-03 20:49 ` [RFC PATCH v4 06/17] vsock: check error queue to set EPOLLERR Arseniy Krasnov
2023-06-26 16:04 ` Stefano Garzarella
2023-06-27 4:44 ` Arseniy Krasnov
2023-06-27 7:53 ` Stefano Garzarella
2023-06-03 20:49 ` [RFC PATCH v4 07/17] vsock: read from socket's error queue Arseniy Krasnov
2023-06-26 16:08 ` Stefano Garzarella
2023-06-27 4:49 ` Arseniy Krasnov
2023-06-27 7:58 ` Stefano Garzarella
2023-06-03 20:49 ` [RFC PATCH v4 08/17] vsock: check for MSG_ZEROCOPY support on send Arseniy Krasnov
2023-06-03 20:49 ` [RFC PATCH v4 09/17] vsock: enable SOCK_SUPPORT_ZC bit Arseniy Krasnov
2023-06-03 20:49 ` [RFC PATCH v4 10/17] vhost/vsock: support MSG_ZEROCOPY for transport Arseniy Krasnov
2023-06-26 16:10 ` Stefano Garzarella
2023-06-03 20:49 ` [RFC PATCH v4 11/17] vsock/virtio: " Arseniy Krasnov
2023-06-26 16:11 ` Stefano Garzarella
2023-06-03 20:49 ` [RFC PATCH v4 12/17] vsock/loopback: " Arseniy Krasnov
2023-06-26 16:14 ` Stefano Garzarella
2023-06-03 20:49 ` [RFC PATCH v4 13/17] net/sock: enable setting SO_ZEROCOPY for PF_VSOCK Arseniy Krasnov
2023-06-03 20:49 ` [RFC PATCH v4 14/17] docs: net: description of MSG_ZEROCOPY for AF_VSOCK Arseniy Krasnov
2023-06-03 20:49 ` [RFC PATCH v4 15/17] test/vsock: MSG_ZEROCOPY flag tests Arseniy Krasnov
2023-06-03 20:49 ` [RFC PATCH v4 16/17] test/vsock: MSG_ZEROCOPY support for vsock_perf Arseniy Krasnov
2023-06-03 20:49 ` [RFC PATCH v4 17/17] test/vsock: io_uring rx/tx tests Arseniy Krasnov
2023-06-12 17:20 ` [RFC PATCH v4 00/17] vsock: MSG_ZEROCOPY flag support Bobby Eshleman
2023-06-14 5:39 ` Arseniy Krasnov
2023-06-26 16:15 ` Stefano Garzarella
2023-06-27 4:55 ` Arseniy Krasnov
2023-06-27 8:01 ` Stefano Garzarella
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=vpcrdclcic7oiuat4oapnkj54dolld6hh2wixe3fozlthyt2ni@omyjyem3uj3t \
--to=sgarzare@redhat.com \
--cc=AVKrasnov@sberdevices.ru \
--cc=bobby.eshleman@bytedance.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=jasowang@redhat.com \
--cc=kernel@sberdevices.ru \
--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=oxffffaa@gmail.com \
--cc=pabeni@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).