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 10/17] virtio_net: separate receive_mergeable
Date: Tue, 16 Jan 2024 17:43:06 +0800 [thread overview]
Message-ID: <20240116094313.119939-11-xuanzhuo@linux.alibaba.com> (raw)
In-Reply-To: <20240116094313.119939-1-xuanzhuo@linux.alibaba.com>
This commit separates the function receive_mergeable(),
put the logic of appending frag to the skb as an independent function.
The subsequent commit will reuse it.
Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
---
drivers/net/virtio/main.c | 77 ++++++++++++++++++++-------------
drivers/net/virtio/virtio_net.h | 4 ++
2 files changed, 51 insertions(+), 30 deletions(-)
diff --git a/drivers/net/virtio/main.c b/drivers/net/virtio/main.c
index e64d52e7d95b..3ea75c62b384 100644
--- a/drivers/net/virtio/main.c
+++ b/drivers/net/virtio/main.c
@@ -1405,6 +1405,49 @@ static struct sk_buff *receive_mergeable_xdp(struct net_device *dev,
return NULL;
}
+struct sk_buff *virtnet_skb_append_frag(struct sk_buff *head_skb,
+ struct sk_buff *curr_skb,
+ struct page *page, void *buf,
+ int len, int truesize)
+{
+ int num_skb_frags;
+ int offset;
+
+ num_skb_frags = skb_shinfo(curr_skb)->nr_frags;
+ if (unlikely(num_skb_frags == MAX_SKB_FRAGS)) {
+ struct sk_buff *nskb = alloc_skb(0, GFP_ATOMIC);
+
+ if (unlikely(!nskb))
+ return NULL;
+
+ if (curr_skb == head_skb)
+ skb_shinfo(curr_skb)->frag_list = nskb;
+ else
+ curr_skb->next = nskb;
+ curr_skb = nskb;
+ head_skb->truesize += nskb->truesize;
+ num_skb_frags = 0;
+ }
+
+ if (curr_skb != head_skb) {
+ head_skb->data_len += len;
+ head_skb->len += len;
+ head_skb->truesize += truesize;
+ }
+
+ offset = buf - page_address(page);
+ if (skb_can_coalesce(curr_skb, num_skb_frags, page, offset)) {
+ put_page(page);
+ skb_coalesce_rx_frag(curr_skb, num_skb_frags - 1,
+ len, truesize);
+ } else {
+ skb_add_rx_frag(curr_skb, num_skb_frags, page,
+ offset, len, truesize);
+ }
+
+ return curr_skb;
+}
+
static struct sk_buff *receive_mergeable(struct net_device *dev,
struct virtnet_info *vi,
struct virtnet_rq *rq,
@@ -1454,8 +1497,6 @@ static struct sk_buff *receive_mergeable(struct net_device *dev,
if (unlikely(!curr_skb))
goto err_skb;
while (--num_buf) {
- int num_skb_frags;
-
buf = virtnet_rq_get_buf(rq, &len, &ctx);
if (unlikely(!buf)) {
pr_debug("%s: rx error: %d buffers out of %d missing\n",
@@ -1480,34 +1521,10 @@ static struct sk_buff *receive_mergeable(struct net_device *dev,
goto err_skb;
}
- num_skb_frags = skb_shinfo(curr_skb)->nr_frags;
- if (unlikely(num_skb_frags == MAX_SKB_FRAGS)) {
- struct sk_buff *nskb = alloc_skb(0, GFP_ATOMIC);
-
- if (unlikely(!nskb))
- goto err_skb;
- if (curr_skb == head_skb)
- skb_shinfo(curr_skb)->frag_list = nskb;
- else
- curr_skb->next = nskb;
- curr_skb = nskb;
- head_skb->truesize += nskb->truesize;
- num_skb_frags = 0;
- }
- if (curr_skb != head_skb) {
- head_skb->data_len += len;
- head_skb->len += len;
- head_skb->truesize += truesize;
- }
- offset = buf - page_address(page);
- if (skb_can_coalesce(curr_skb, num_skb_frags, page, offset)) {
- put_page(page);
- skb_coalesce_rx_frag(curr_skb, num_skb_frags - 1,
- len, truesize);
- } else {
- skb_add_rx_frag(curr_skb, num_skb_frags, page,
- offset, len, truesize);
- }
+ curr_skb = virtnet_skb_append_frag(head_skb, curr_skb, page,
+ buf, len, truesize);
+ if (!curr_skb)
+ goto err_skb;
}
ewma_pkt_len_add(&rq->mrg_avg_pkt_len, head_skb->len);
diff --git a/drivers/net/virtio/virtio_net.h b/drivers/net/virtio/virtio_net.h
index 480b533bd61e..1ca92eea8203 100644
--- a/drivers/net/virtio/virtio_net.h
+++ b/drivers/net/virtio/virtio_net.h
@@ -339,4 +339,8 @@ void virtnet_rq_free_unused_bufs(struct virtqueue *vq);
void virtnet_check_sq_full_and_disable(struct virtnet_info *vi,
struct net_device *dev,
struct virtnet_sq *sq);
+struct sk_buff *virtnet_skb_append_frag(struct sk_buff *head_skb,
+ struct sk_buff *curr_skb,
+ struct page *page, void *buf,
+ int len, int truesize);
#endif
--
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 ` Xuan Zhuo [this message]
2024-01-16 9:43 ` [PATCH net-next 11/17] virtio_net: separate receive_buf Xuan Zhuo
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-11-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).