From: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
To: netdev@vger.kernel.org
Cc: "Michael S. Tsirkin" <mst@redhat.com>,
Jason Wang <jasowang@redhat.com>,
Xuan Zhuo <xuanzhuo@linux.alibaba.com>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Jesper Dangaard Brouer <hawk@kernel.org>,
John Fastabend <john.fastabend@gmail.com>,
virtualization@lists.linux.dev, bpf@vger.kernel.org
Subject: [PATCH net-next 11/17] virtio_net: separate receive_buf
Date: Tue, 16 Jan 2024 17:43:07 +0800 [thread overview]
Message-ID: <20240116094313.119939-12-xuanzhuo@linux.alibaba.com> (raw)
In-Reply-To: <20240116094313.119939-1-xuanzhuo@linux.alibaba.com>
This commit separates the function receive_buf(), then we wrap the logic
of handling the skb to an independent function virtnet_receive_done().
The subsequent commit will reuse it.
Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
---
drivers/net/virtio/main.c | 56 ++++++++++++++++++++++-----------------
1 file changed, 32 insertions(+), 24 deletions(-)
diff --git a/drivers/net/virtio/main.c b/drivers/net/virtio/main.c
index 3ea75c62b384..2f2141c837e6 100644
--- a/drivers/net/virtio/main.c
+++ b/drivers/net/virtio/main.c
@@ -1569,32 +1569,11 @@ static void virtio_skb_set_hash(const struct virtio_net_hdr_v1_hash *hdr_hash,
skb_set_hash(skb, __le32_to_cpu(hdr_hash->hash_value), rss_hash_type);
}
-static void receive_buf(struct virtnet_info *vi, struct virtnet_rq *rq,
- void *buf, unsigned int len, void **ctx,
- unsigned int *xdp_xmit,
- struct virtnet_rq_stats *stats)
+static void virtnet_receive_done(struct virtnet_info *vi, struct virtnet_rq *rq,
+ struct sk_buff *skb)
{
- struct net_device *dev = vi->dev;
- struct sk_buff *skb;
struct virtio_net_common_hdr *hdr;
-
- if (unlikely(len < vi->hdr_len + ETH_HLEN)) {
- pr_debug("%s: short packet %i\n", dev->name, len);
- DEV_STATS_INC(dev, rx_length_errors);
- virtnet_rq_free_buf(vi, rq, buf);
- return;
- }
-
- if (vi->mergeable_rx_bufs)
- skb = receive_mergeable(dev, vi, rq, buf, ctx, len, xdp_xmit,
- stats);
- else if (vi->big_packets)
- skb = receive_big(dev, vi, rq, buf, len, stats);
- else
- skb = receive_small(dev, vi, rq, buf, ctx, len, xdp_xmit, stats);
-
- if (unlikely(!skb))
- return;
+ struct net_device *dev = vi->dev;
hdr = skb_vnet_common_hdr(skb);
if (dev->features & NETIF_F_RXHASH && vi->has_rss_hash_report)
@@ -1624,6 +1603,35 @@ static void receive_buf(struct virtnet_info *vi, struct virtnet_rq *rq,
dev_kfree_skb(skb);
}
+static void receive_buf(struct virtnet_info *vi, struct virtnet_rq *rq,
+ void *buf, unsigned int len, void **ctx,
+ unsigned int *xdp_xmit,
+ struct virtnet_rq_stats *stats)
+{
+ struct net_device *dev = vi->dev;
+ struct sk_buff *skb;
+
+ if (unlikely(len < vi->hdr_len + ETH_HLEN)) {
+ pr_debug("%s: short packet %i\n", dev->name, len);
+ DEV_STATS_INC(dev, rx_length_errors);
+ virtnet_rq_free_buf(vi, rq, buf);
+ return;
+ }
+
+ if (vi->mergeable_rx_bufs)
+ skb = receive_mergeable(dev, vi, rq, buf, ctx, len, xdp_xmit,
+ stats);
+ else if (vi->big_packets)
+ skb = receive_big(dev, vi, rq, buf, len, stats);
+ else
+ skb = receive_small(dev, vi, rq, buf, ctx, len, xdp_xmit, stats);
+
+ if (unlikely(!skb))
+ return;
+
+ virtnet_receive_done(vi, rq, skb);
+}
+
/* Unlike mergeable buffers, all buffers are allocated to the
* same size, except for the headroom. For this reason we do
* not need to use mergeable_len_to_ctx here - it is enough
--
2.32.0.3.g01195cf9f
next prev parent reply other threads:[~2024-01-16 9:43 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-16 9:42 [PATCH net-next 00/17] virtio-net: support AF_XDP zero copy (3/3) Xuan Zhuo
2024-01-16 9:42 ` [PATCH net-next 01/17] virtio_net: separate virtnet_rx_resize() Xuan Zhuo
2024-01-16 9:42 ` [PATCH net-next 02/17] virtio_net: separate virtnet_tx_resize() Xuan Zhuo
2024-01-16 9:42 ` [PATCH net-next 03/17] virtio_net: xsk: bind/unbind xsk Xuan Zhuo
2024-01-16 9:43 ` [PATCH net-next 04/17] virtio_net: xsk: prevent disable tx napi Xuan Zhuo
2024-01-16 9:43 ` [PATCH net-next 05/17] virtio_net: move some api to header Xuan Zhuo
2024-01-16 9:43 ` [PATCH net-next 06/17] virtio_net: xsk: tx: support xmit xsk buffer Xuan Zhuo
2024-01-16 9:43 ` [PATCH net-next 07/17] virtio_net: xsk: tx: support wakeup Xuan Zhuo
2024-01-16 9:43 ` [PATCH net-next 08/17] virtio_net: xsk: tx: handle the transmitted xsk buffer Xuan Zhuo
2024-01-16 9:43 ` [PATCH net-next 09/17] virtio_net: xsk: tx: free the unused " Xuan Zhuo
2024-01-16 9:43 ` [PATCH net-next 10/17] virtio_net: separate receive_mergeable Xuan Zhuo
2024-01-16 9:43 ` Xuan Zhuo [this message]
2024-01-16 9:43 ` [PATCH net-next 12/17] virtio_net: xsk: rx: support fill with xsk buffer Xuan Zhuo
2024-01-16 9:43 ` [PATCH net-next 13/17] virtio_net: xsk: rx: support recv merge mode Xuan Zhuo
2024-01-16 9:43 ` [PATCH net-next 14/17] virtio_net: xsk: rx: support recv small mode Xuan Zhuo
2024-01-16 9:43 ` [PATCH net-next 15/17] virtio_net: xsk: rx: free the unused xsk buffer Xuan Zhuo
2024-01-16 9:43 ` [PATCH net-next 16/17] virtio_net: update tx timeout record Xuan Zhuo
2024-01-16 9:43 ` [PATCH net-next 17/17] virtio_net: xdp_features add NETDEV_XDP_ACT_XSK_ZEROCOPY Xuan Zhuo
2024-01-16 12:37 ` [PATCH net-next 00/17] virtio-net: support AF_XDP zero copy (3/3) Paolo Abeni
2024-01-16 15:07 ` Jakub Kicinski
2024-01-16 20:46 ` Michael S. Tsirkin
2024-01-17 5:53 ` Xuan Zhuo
2024-01-17 5:55 ` Xuan Zhuo
2024-01-22 4:24 ` 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=20240116094313.119939-12-xuanzhuo@linux.alibaba.com \
--to=xuanzhuo@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=hawk@kernel.org \
--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=virtualization@lists.linux.dev \
/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).