public inbox for bpf@vger.kernel.org
 help / color / mirror / Atom feed
From: Heng Qi <hengqi@linux.alibaba.com>
To: netdev@vger.kernel.org, bpf@vger.kernel.org
Cc: Jason Wang <jasowang@redhat.com>,
	"Michael S . Tsirkin" <mst@redhat.com>,
	Paolo Abeni <pabeni@redhat.com>, Jakub Kicinski <kuba@kernel.org>,
	John Fastabend <john.fastabend@gmail.com>,
	"David S . Miller" <davem@davemloft.net>,
	Daniel Borkmann <daniel@iogearbox.net>,
	Alexei Starovoitov <ast@kernel.org>,
	Eric Dumazet <edumazet@google.com>,
	Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Subject: [PATCH v2 6/9] virtio_net: transmit the multi-buffer xdp
Date: Tue, 20 Dec 2022 22:14:46 +0800	[thread overview]
Message-ID: <20221220141449.115918-7-hengqi@linux.alibaba.com> (raw)
In-Reply-To: <20221220141449.115918-1-hengqi@linux.alibaba.com>

This serves as the basis for XDP_TX and XDP_REDIRECT
to send a multi-buffer xdp_frame.

Signed-off-by: Heng Qi <hengqi@linux.alibaba.com>
Reviewed-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
---
 drivers/net/virtio_net.c | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 40bc58fa57f5..9f31bfa7f9a6 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -563,22 +563,39 @@ static int __virtnet_xdp_xmit_one(struct virtnet_info *vi,
 				   struct xdp_frame *xdpf)
 {
 	struct virtio_net_hdr_mrg_rxbuf *hdr;
-	int err;
+	struct skb_shared_info *shinfo;
+	u8 nr_frags = 0;
+	int err, i;
 
 	if (unlikely(xdpf->headroom < vi->hdr_len))
 		return -EOVERFLOW;
 
-	/* Make room for virtqueue hdr (also change xdpf->headroom?) */
+	if (unlikely(xdp_frame_has_frags(xdpf))) {
+		shinfo = xdp_get_shared_info_from_frame(xdpf);
+		nr_frags = shinfo->nr_frags;
+	}
+
+	/* Need to adjust this to calculate the correct postion
+	 * for shinfo of the xdpf.
+	 */
+	xdpf->headroom -= vi->hdr_len;
 	xdpf->data -= vi->hdr_len;
 	/* Zero header and leave csum up to XDP layers */
 	hdr = xdpf->data;
 	memset(hdr, 0, vi->hdr_len);
 	xdpf->len   += vi->hdr_len;
 
-	sg_init_one(sq->sg, xdpf->data, xdpf->len);
+	sg_init_table(sq->sg, nr_frags + 1);
+	sg_set_buf(sq->sg, xdpf->data, xdpf->len);
+	for (i = 0; i < nr_frags; i++) {
+		skb_frag_t *frag = &shinfo->frags[i];
+
+		sg_set_page(&sq->sg[i + 1], skb_frag_page(frag),
+			    skb_frag_size(frag), skb_frag_off(frag));
+	}
 
-	err = virtqueue_add_outbuf(sq->vq, sq->sg, 1, xdp_to_ptr(xdpf),
-				   GFP_ATOMIC);
+	err = virtqueue_add_outbuf(sq->vq, sq->sg, nr_frags + 1,
+				   xdp_to_ptr(xdpf), GFP_ATOMIC);
 	if (unlikely(err))
 		return -ENOSPC; /* Caller handle free/refcnt */
 
-- 
2.19.1.6.gb485710b


  parent reply	other threads:[~2022-12-20 14:15 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-20 14:14 [PATCH v2 0/9] virtio_net: support multi buffer xdp Heng Qi
2022-12-20 14:14 ` [PATCH v2 1/9] virtio_net: disable the hole mechanism for xdp Heng Qi
2022-12-27  6:30   ` Jason Wang
2022-12-27  7:32     ` Heng Qi
2022-12-28  6:28       ` Jason Wang
2022-12-28  8:24         ` Heng Qi
2022-12-20 14:14 ` [PATCH v2 2/9] virtio_net: set up xdp for multi buffer packets Heng Qi
2022-12-27  6:32   ` Jason Wang
2022-12-27 12:20     ` Heng Qi
2022-12-28  3:50       ` Heng Qi
2022-12-28  6:27         ` Jason Wang
2022-12-20 14:14 ` [PATCH v2 3/9] virtio_net: update bytes calculation for xdp_frame Heng Qi
2022-12-20 14:14 ` [PATCH v2 4/9] virtio_net: build xdp_buff with multi buffers Heng Qi
2022-12-27  6:46   ` Jason Wang
2022-12-27  9:10     ` Heng Qi
2022-12-28  6:27       ` Jason Wang
2022-12-28  8:17         ` Heng Qi
2022-12-20 14:14 ` [PATCH v2 5/9] virtio_net: construct multi-buffer xdp in mergeable Heng Qi
2022-12-27  7:01   ` Jason Wang
2022-12-27  9:31     ` Heng Qi
2022-12-28  6:24       ` Jason Wang
2022-12-28  8:23         ` Heng Qi
2022-12-28 11:54           ` Jason Wang
2022-12-20 14:14 ` Heng Qi [this message]
2022-12-27  7:12   ` [PATCH v2 6/9] virtio_net: transmit the multi-buffer xdp Jason Wang
2022-12-27  8:26     ` Heng Qi
2022-12-28  6:30       ` Jason Wang
2022-12-28  8:25         ` Heng Qi
2022-12-20 14:14 ` [PATCH v2 7/9] virtio_net: build skb from " Heng Qi
2022-12-27  7:31   ` Jason Wang
2022-12-27  7:51     ` Heng Qi
2022-12-20 14:14 ` [PATCH v2 8/9] virtio_net: remove xdp related info from page_to_skb() Heng Qi
2022-12-27  7:55   ` Jason Wang
2022-12-27  8:27     ` Heng Qi
2022-12-20 14:14 ` [PATCH v2 9/9] virtio_net: support multi-buffer xdp Heng Qi
2022-12-27  9:03   ` Jason Wang
2022-12-27  9:11     ` Heng Qi
2022-12-22  1:30 ` [PATCH v2 0/9] virtio_net: support multi buffer xdp Jakub Kicinski
2022-12-22  2:04   ` Heng Qi
2022-12-26  2:32 ` Heng Qi
2022-12-26  4:14   ` Jason Wang

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=20221220141449.115918-7-hengqi@linux.alibaba.com \
    --to=hengqi@linux.alibaba.com \
    --cc=ast@kernel.org \
    --cc=bpf@vger.kernel.org \
    --cc=daniel@iogearbox.net \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=jasowang@redhat.com \
    --cc=john.fastabend@gmail.com \
    --cc=kuba@kernel.org \
    --cc=mst@redhat.com \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=xuanzhuo@linux.alibaba.com \
    /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