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 4/9] virtio_net: build xdp_buff with multi buffers
Date: Tue, 20 Dec 2022 22:14:44 +0800	[thread overview]
Message-ID: <20221220141449.115918-5-hengqi@linux.alibaba.com> (raw)
In-Reply-To: <20221220141449.115918-1-hengqi@linux.alibaba.com>

Support xdp for multi buffer packets in mergeable mode.

Putting the first buffer as the linear part for xdp_buff,
and the rest of the buffers as non-linear fragments to struct
skb_shared_info in the tailroom belonging to xdp_buff.

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

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 08f209d7b0bf..8fc3b1841d92 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -931,6 +931,84 @@ static struct sk_buff *receive_big(struct net_device *dev,
 	return NULL;
 }
 
+/* TODO: build xdp in big mode */
+static int virtnet_build_xdp_buff_mrg(struct net_device *dev,
+				      struct virtnet_info *vi,
+				      struct receive_queue *rq,
+				      struct xdp_buff *xdp,
+				      void *buf,
+				      unsigned int len,
+				      unsigned int frame_sz,
+				      u16 *num_buf,
+				      unsigned int *xdp_frags_truesize,
+				      struct virtnet_rq_stats *stats)
+{
+	unsigned int tailroom = SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
+	struct virtio_net_hdr_mrg_rxbuf *hdr = buf;
+	unsigned int truesize, headroom;
+	struct skb_shared_info *shinfo;
+	unsigned int xdp_frags_truesz = 0;
+	unsigned int cur_frag_size;
+	struct page *page;
+	skb_frag_t *frag;
+	int offset;
+	void *ctx;
+
+	xdp_init_buff(xdp, frame_sz, &rq->xdp_rxq);
+	xdp_prepare_buff(xdp, buf - VIRTIO_XDP_HEADROOM,
+			 VIRTIO_XDP_HEADROOM + vi->hdr_len, len - vi->hdr_len, true);
+
+	if (*num_buf > 1) {
+		shinfo = xdp_get_shared_info_from_buff(xdp);
+		shinfo->nr_frags = 0;
+		shinfo->xdp_frags_size = 0;
+	}
+
+	if ((*num_buf - 1) > MAX_SKB_FRAGS)
+		return -EINVAL;
+
+	while ((--*num_buf) >= 1) {
+		buf = virtqueue_get_buf_ctx(rq->vq, &len, &ctx);
+		if (unlikely(!buf)) {
+			pr_debug("%s: rx error: %d buffers out of %d missing\n",
+				 dev->name, *num_buf,
+				 virtio16_to_cpu(vi->vdev, hdr->num_buffers));
+			dev->stats.rx_length_errors++;
+			return -EINVAL;
+		}
+
+		if (!xdp_buff_has_frags(xdp))
+			xdp_buff_set_frags_flag(xdp);
+
+		stats->bytes += len;
+		page = virt_to_head_page(buf);
+		offset = buf - page_address(page);
+		truesize = mergeable_ctx_to_truesize(ctx);
+		headroom = mergeable_ctx_to_headroom(ctx);
+
+		cur_frag_size = truesize + (headroom ? (headroom + tailroom) : 0);
+		xdp_frags_truesz += cur_frag_size;
+		if (unlikely(len > truesize || cur_frag_size > PAGE_SIZE)) {
+			pr_debug("%s: rx error: len %u exceeds truesize %lu\n",
+				 dev->name, len, (unsigned long)ctx);
+			dev->stats.rx_length_errors++;
+			return -EINVAL;
+		}
+
+		frag = &shinfo->frags[shinfo->nr_frags++];
+		__skb_frag_set_page(frag, page);
+		skb_frag_off_set(frag, offset);
+		skb_frag_size_set(frag, len);
+		if (page_is_pfmemalloc(page))
+			xdp_buff_set_frag_pfmemalloc(xdp);
+
+		shinfo->xdp_frags_size += len;
+	}
+
+	*xdp_frags_truesize = xdp_frags_truesz;
+	return 0;
+}
+
 static struct sk_buff *receive_mergeable(struct net_device *dev,
 					 struct virtnet_info *vi,
 					 struct receive_queue *rq,
-- 
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 ` Heng Qi [this message]
2022-12-27  6:46   ` [PATCH v2 4/9] virtio_net: build xdp_buff with multi buffers 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 ` [PATCH v2 6/9] virtio_net: transmit the multi-buffer xdp Heng Qi
2022-12-27  7:12   ` 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-5-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