From: Arseniy Krasnov <AVKrasnov@sberdevices.ru>
To: Stefan Hajnoczi <stefanha@redhat.com>,
Stefano Garzarella <sgarzare@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>
Cc: <kvm@vger.kernel.org>,
<virtualization@lists.linux-foundation.org>,
<netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<kernel@sberdevices.ru>, <oxffffaa@gmail.com>,
<avkrasnov@sberdevices.ru>,
Arseniy Krasnov <AVKrasnov@sberdevices.ru>
Subject: [RFC PATCH v5 03/17] vsock/virtio: support to send non-linear skb
Date: Sat, 1 Jul 2023 09:39:33 +0300 [thread overview]
Message-ID: <20230701063947.3422088-4-AVKrasnov@sberdevices.ru> (raw)
In-Reply-To: <20230701063947.3422088-1-AVKrasnov@sberdevices.ru>
For non-linear skb use its pages from fragment array as buffers in
virtio tx queue. These pages are already pinned by 'get_user_pages()'
during such skb creation.
Signed-off-by: Arseniy Krasnov <AVKrasnov@sberdevices.ru>
---
Changelog:
v4 -> v5:
* Use 'out_sgs' variable to index 'bufs', not only 'sgs'.
* Move smaller branch above, see 'if (!skb_is_nonlinear(skb)').
* Remove blank line.
* R-b from Bobby Eshleman removed due to patch update.
net/vmw_vsock/virtio_transport.c | 40 +++++++++++++++++++++++++++-----
1 file changed, 34 insertions(+), 6 deletions(-)
diff --git a/net/vmw_vsock/virtio_transport.c b/net/vmw_vsock/virtio_transport.c
index e95df847176b..6cbb45bb12d2 100644
--- a/net/vmw_vsock/virtio_transport.c
+++ b/net/vmw_vsock/virtio_transport.c
@@ -100,7 +100,9 @@ virtio_transport_send_pkt_work(struct work_struct *work)
vq = vsock->vqs[VSOCK_VQ_TX];
for (;;) {
- struct scatterlist hdr, buf, *sgs[2];
+ /* +1 is for packet header. */
+ struct scatterlist *sgs[MAX_SKB_FRAGS + 1];
+ struct scatterlist bufs[MAX_SKB_FRAGS + 1];
int ret, in_sg = 0, out_sg = 0;
struct sk_buff *skb;
bool reply;
@@ -111,12 +113,38 @@ virtio_transport_send_pkt_work(struct work_struct *work)
virtio_transport_deliver_tap_pkt(skb);
reply = virtio_vsock_skb_reply(skb);
+ sg_init_one(&bufs[out_sg], virtio_vsock_hdr(skb),
+ sizeof(*virtio_vsock_hdr(skb)));
+ sgs[out_sg] = &bufs[out_sg];
+ out_sg++;
+
+ if (!skb_is_nonlinear(skb)) {
+ if (skb->len > 0) {
+ sg_init_one(&bufs[out_sg], skb->data, skb->len);
+ sgs[out_sg] = &bufs[out_sg];
+ out_sg++;
+ }
+ } else {
+ struct skb_shared_info *si;
+ int i;
+
+ si = skb_shinfo(skb);
+
+ for (i = 0; i < si->nr_frags; i++) {
+ skb_frag_t *skb_frag = &si->frags[i];
+ void *va = page_to_virt(skb_frag->bv_page);
- sg_init_one(&hdr, virtio_vsock_hdr(skb), sizeof(*virtio_vsock_hdr(skb)));
- sgs[out_sg++] = &hdr;
- if (skb->len > 0) {
- sg_init_one(&buf, skb->data, skb->len);
- sgs[out_sg++] = &buf;
+ /* We will use 'page_to_virt()' for userspace page here,
+ * because virtio layer will call 'virt_to_phys()' later
+ * to fill buffer descriptor. We don't touch memory at
+ * "virtual" address of this page.
+ */
+ sg_init_one(&bufs[out_sg],
+ va + skb_frag->bv_offset,
+ skb_frag->bv_len);
+ sgs[out_sg] = &bufs[out_sg];
+ out_sg++;
+ }
}
ret = virtqueue_add_sgs(vq, sgs, out_sg, in_sg, skb, GFP_KERNEL);
--
2.25.1
next prev parent reply other threads:[~2023-07-01 6:45 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-01 6:39 [RFC PATCH v5 00/17] vsock: MSG_ZEROCOPY flag support Arseniy Krasnov
2023-07-01 6:39 ` [RFC PATCH v5 01/17] vsock/virtio: read data from non-linear skb Arseniy Krasnov
2023-07-06 16:47 ` Stefano Garzarella
2023-07-01 6:39 ` [RFC PATCH v5 02/17] vhost/vsock: " Arseniy Krasnov
2023-07-06 16:49 ` Stefano Garzarella
2023-07-01 6:39 ` Arseniy Krasnov [this message]
2023-07-06 16:51 ` [RFC PATCH v5 03/17] vsock/virtio: support to send " Stefano Garzarella
2023-07-01 6:39 ` [RFC PATCH v5 04/17] vsock/virtio: non-linear skb handling for tap Arseniy Krasnov
2023-07-06 16:51 ` Stefano Garzarella
2023-07-01 6:39 ` [RFC PATCH v5 05/17] vsock/virtio: MSG_ZEROCOPY flag support Arseniy Krasnov
2023-07-06 16:53 ` Stefano Garzarella
2023-07-01 6:39 ` [RFC PATCH v5 06/17] vsock: fix EPOLLERR set on non-empty error queue Arseniy Krasnov
2023-07-06 16:54 ` Stefano Garzarella
2023-07-01 6:39 ` [RFC PATCH v5 07/17] vsock: read from socket's " Arseniy Krasnov
2023-07-06 16:54 ` Stefano Garzarella
2023-07-01 6:39 ` [RFC PATCH v5 08/17] vsock: check for MSG_ZEROCOPY support on send Arseniy Krasnov
2023-07-06 16:55 ` Stefano Garzarella
2023-07-01 6:39 ` [RFC PATCH v5 09/17] vsock: enable SOCK_SUPPORT_ZC bit Arseniy Krasnov
2023-07-06 16:55 ` Stefano Garzarella
2023-07-01 6:39 ` [RFC PATCH v5 10/17] vhost/vsock: support MSG_ZEROCOPY for transport Arseniy Krasnov
2023-07-06 16:55 ` Stefano Garzarella
2023-07-01 6:39 ` [RFC PATCH v5 11/17] vsock/virtio: " Arseniy Krasnov
2023-07-06 16:55 ` Stefano Garzarella
2023-07-01 6:39 ` [RFC PATCH v5 12/17] vsock/loopback: " Arseniy Krasnov
2023-07-06 16:56 ` Stefano Garzarella
2023-07-01 6:39 ` [RFC PATCH v5 13/17] vsock: enable setting SO_ZEROCOPY Arseniy Krasnov
2023-07-06 16:56 ` Stefano Garzarella
2023-07-12 22:31 ` Bobby Eshleman
2023-07-13 4:37 ` Arseniy Krasnov
2023-07-01 6:39 ` [RFC PATCH v5 14/17] docs: net: description of MSG_ZEROCOPY for AF_VSOCK Arseniy Krasnov
2023-07-06 17:06 ` Stefano Garzarella
2023-07-07 4:45 ` Arseniy Krasnov
2023-07-01 6:39 ` [RFC PATCH v5 15/17] test/vsock: MSG_ZEROCOPY flag tests Arseniy Krasnov
2023-07-01 6:39 ` [RFC PATCH v5 16/17] test/vsock: MSG_ZEROCOPY support for vsock_perf Arseniy Krasnov
2023-07-01 6:39 ` [RFC PATCH v5 17/17] test/vsock: io_uring rx/tx tests Arseniy Krasnov
2023-07-06 17:06 ` Stefano Garzarella
2023-07-07 4:47 ` Arseniy Krasnov
2023-07-06 17:07 ` [RFC PATCH v5 00/17] vsock: MSG_ZEROCOPY flag support Stefano Garzarella
2023-07-07 4:41 ` Arseniy Krasnov
-- strict thread matches above, loose matches on Subject: below --
2023-07-01 6:22 Arseniy Krasnov
2023-07-01 6:22 ` [RFC PATCH v5 03/17] vsock/virtio: support to send non-linear skb Arseniy 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=20230701063947.3422088-4-AVKrasnov@sberdevices.ru \
--to=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=sgarzare@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