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>
Subject: [RFC PATCH 7/9] virtio_net: build skb from multi-buffer xdp
Date: Tue, 22 Nov 2022 15:43:46 +0800	[thread overview]
Message-ID: <20221122074348.88601-8-hengqi@linux.alibaba.com> (raw)
In-Reply-To: <20221122074348.88601-1-hengqi@linux.alibaba.com>

This converts a multi-buffer xdp_buff directly to a skb.

Now, we have isolated the construction of skb based on
multi-buffer xdp from page_to_skb().

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

diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 83e6933ae62b..260ce722c687 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -911,6 +911,56 @@ static struct sk_buff *receive_big(struct net_device *dev,
 	return NULL;
 }
 
+/* Why not use xdp_build_skb_from_frame() ?
+ * XDP core assumes that xdp frags are PAGE_SIZE in length, while in
+ * virtio-net there are 2 points that do not match its requirements:
+ *  1. The size of the prefilled buffer is not fixed before xdp is set.
+ *  2. When xdp is loaded, virtio-net has a hole mechanism (refer to
+ *     add_recvbuf_mergeable()), which will make the size of a buffer
+ *     exceed PAGE_SIZE.
+ */
+static struct sk_buff *build_skb_from_xdp_buff(struct net_device *dev,
+					       struct virtnet_info *vi,
+					       struct xdp_buff *xdp,
+					       unsigned int xdp_frags_truesz)
+{
+	struct skb_shared_info *sinfo = xdp_get_shared_info_from_buff(xdp);
+	unsigned int headroom, data_len;
+	struct sk_buff *skb;
+	int metasize;
+	u8 nr_frags;
+
+	if (unlikely(xdp->data_end > xdp_data_hard_end(xdp))) {
+		pr_debug("Error building skb as missing reserved tailroom for xdp");
+		return NULL;
+	}
+
+	if (unlikely(xdp_buff_has_frags(xdp)))
+		nr_frags = sinfo->nr_frags;
+
+	skb = build_skb(xdp->data_hard_start, xdp->frame_sz);
+	if (unlikely(!skb))
+		return NULL;
+
+	headroom = xdp->data - xdp->data_hard_start;
+	data_len = xdp->data_end - xdp->data;
+	skb_reserve(skb, headroom);
+	__skb_put(skb, data_len);
+
+	metasize = xdp->data - xdp->data_meta;
+	metasize = metasize > 0 ? metasize : 0;
+	if (metasize)
+		skb_metadata_set(skb, metasize);
+
+	if (unlikely(xdp_buff_has_frags(xdp)))
+		xdp_update_skb_shared_info(skb, nr_frags,
+					   sinfo->xdp_frags_size,
+					   xdp_frags_truesz,
+					   xdp_buff_is_frag_pfmemalloc(xdp));
+
+	return skb;
+}
+
 static int virtnet_build_xdp_buff(struct net_device *dev,
 				  struct virtnet_info *vi,
 				  struct receive_queue *rq,
-- 
2.19.1.6.gb485710b


  parent reply	other threads:[~2022-11-22  7:44 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-11-22  7:43 [RFC PATCH 0/9] virtio_net: support multi buffer xdp Heng Qi
2022-11-22  7:43 ` [RFC PATCH 1/9] virtio_net: disable the hole mechanism for xdp Heng Qi
2022-12-06  5:20   ` Jason Wang
2022-12-08  8:20     ` Heng Qi
2022-11-22  7:43 ` [RFC PATCH 2/9] virtio_net: set up xdp for multi buffer packets Heng Qi
2022-12-06  5:29   ` Jason Wang
2022-12-08  8:21     ` Heng Qi
2022-11-22  7:43 ` [RFC PATCH 3/9] virtio_net: update bytes calculation for xdp_frame Heng Qi
2022-12-06  5:31   ` Jason Wang
2022-12-08  8:35     ` Heng Qi
2022-11-22  7:43 ` [RFC PATCH 4/9] virtio_net: remove xdp related info from page_to_skb() Heng Qi
2022-12-06  5:36   ` Jason Wang
2022-12-08  8:23     ` Heng Qi
2022-11-22  7:43 ` [RFC PATCH 5/9] virtio_net: build xdp_buff with multi buffers Heng Qi
2022-12-06  6:14   ` Jason Wang
2022-12-08  8:25     ` Heng Qi
2022-11-22  7:43 ` [RFC PATCH 6/9] virtio_net: construct multi-buffer xdp in mergeable Heng Qi
2022-12-06  6:33   ` Jason Wang
2022-12-08  8:30     ` Heng Qi
2022-12-13  7:08       ` Jason Wang
2022-12-14  8:37         ` Heng Qi
2022-12-16  3:46           ` Jason Wang
2022-12-16  9:42             ` Heng Qi
2022-11-22  7:43 ` Heng Qi [this message]
2022-11-22  7:43 ` [RFC PATCH 8/9] virtio_net: transmit the multi-buffer xdp Heng Qi
2022-11-22  7:43 ` [RFC PATCH 9/9] virtio_net: support " Heng Qi
2022-12-06  6:42   ` Jason Wang
2022-12-08  8:31     ` Heng Qi
2022-12-02  4:50 ` [RFC PATCH 0/9] virtio_net: support multi buffer xdp Heng Qi
2022-12-02  5:41   ` 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=20221122074348.88601-8-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 \
    /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