From: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
To: netdev@vger.kernel.org
Cc: "Michael S. Tsirkin" <mst@redhat.com>,
Jason Wang <jasowang@redhat.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-foundation.org, bpf@vger.kernel.org
Subject: [PATCH net-next v2 13/14] virtio_net: small: optimize code
Date: Tue, 18 Apr 2023 14:53:26 +0800 [thread overview]
Message-ID: <20230418065327.72281-14-xuanzhuo@linux.alibaba.com> (raw)
In-Reply-To: <20230418065327.72281-1-xuanzhuo@linux.alibaba.com>
Avoid the problem that some variables(headroom and so on) will repeat
the calculation when process xdp.
Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
---
drivers/net/virtio_net.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index f6f5903face2..5a5636178bd3 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -1040,11 +1040,10 @@ static struct sk_buff *receive_small(struct net_device *dev,
struct sk_buff *skb;
struct bpf_prog *xdp_prog;
unsigned int xdp_headroom = (unsigned long)ctx;
- unsigned int header_offset = VIRTNET_RX_PAD + xdp_headroom;
- unsigned int headroom = vi->hdr_len + header_offset;
- unsigned int buflen = SKB_DATA_ALIGN(GOOD_PACKET_LEN + headroom) +
- SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
struct page *page = virt_to_head_page(buf);
+ unsigned int header_offset;
+ unsigned int headroom;
+ unsigned int buflen;
len -= vi->hdr_len;
stats->bytes += len;
@@ -1072,6 +1071,11 @@ static struct sk_buff *receive_small(struct net_device *dev,
rcu_read_unlock();
skip_xdp:
+ header_offset = VIRTNET_RX_PAD + xdp_headroom;
+ headroom = vi->hdr_len + header_offset;
+ buflen = SKB_DATA_ALIGN(GOOD_PACKET_LEN + headroom) +
+ SKB_DATA_ALIGN(sizeof(struct skb_shared_info));
+
skb = build_skb(buf, buflen);
if (!skb)
goto err;
--
2.32.0.3.g01195cf9f
next prev parent reply other threads:[~2023-04-18 6:54 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-18 6:53 [PATCH net-next v2 00/14] virtio_net: refactor xdp codes Xuan Zhuo
2023-04-18 6:53 ` [PATCH net-next v2 01/14] virtio_net: mergeable xdp: put old page immediately Xuan Zhuo
2023-04-20 5:58 ` Jason Wang
2023-04-18 6:53 ` [PATCH net-next v2 02/14] virtio_net: introduce mergeable_xdp_prepare() Xuan Zhuo
2023-04-20 5:58 ` Jason Wang
2023-04-18 6:53 ` [PATCH net-next v2 03/14] virtio_net: optimize mergeable_xdp_prepare() Xuan Zhuo
2023-04-20 5:59 ` Jason Wang
2023-04-18 6:53 ` [PATCH net-next v2 04/14] virtio_net: introduce virtnet_xdp_handler() to seprate the logic of run xdp Xuan Zhuo
2023-04-20 5:59 ` Jason Wang
2023-04-18 6:53 ` [PATCH net-next v2 05/14] virtio_net: introduce xdp res enums Xuan Zhuo
2023-04-20 5:59 ` Jason Wang
2023-04-21 7:00 ` Michael S. Tsirkin
2023-04-21 7:24 ` Xuan Zhuo
2023-04-21 11:54 ` Michael S. Tsirkin
2023-04-23 1:57 ` Xuan Zhuo
2023-04-23 5:28 ` Jason Wang
2023-04-23 6:27 ` Xuan Zhuo
2023-04-18 6:53 ` [PATCH net-next v2 06/14] virtio_net: separate the logic of freeing xdp shinfo Xuan Zhuo
2023-04-18 6:53 ` [PATCH net-next v2 07/14] virtio_net: separate the logic of freeing the rest mergeable buf Xuan Zhuo
2023-04-18 6:53 ` [PATCH net-next v2 08/14] virtio_net: auto release xdp shinfo Xuan Zhuo
2023-04-20 5:59 ` Jason Wang
2023-04-20 9:10 ` Xuan Zhuo
2023-04-18 6:53 ` [PATCH net-next v2 09/14] virtio_net: introduce receive_mergeable_xdp() Xuan Zhuo
2023-04-20 6:01 ` Jason Wang
2023-04-18 6:53 ` [PATCH net-next v2 10/14] virtio_net: merge: remove skip_xdp Xuan Zhuo
2023-04-20 6:10 ` Jason Wang
2023-04-18 6:53 ` [PATCH net-next v2 11/14] virtio_net: introduce receive_small_xdp() Xuan Zhuo
2023-04-20 6:23 ` Jason Wang
2023-04-18 6:53 ` [PATCH net-next v2 12/14] virtio_net: small: optimize code Xuan Zhuo
2023-04-20 6:28 ` Jason Wang
2023-04-18 6:53 ` Xuan Zhuo [this message]
2023-04-20 6:32 ` [PATCH net-next v2 13/14] " Jason Wang
2023-04-20 8:56 ` Xuan Zhuo
2023-04-18 6:53 ` [PATCH net-next v2 14/14] virtio_net: small: remove skip_xdp Xuan Zhuo
2023-04-18 11:49 ` [PATCH net-next v2 00/14] virtio_net: refactor xdp codes Michael S. Tsirkin
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=20230418065327.72281-14-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-foundation.org \
/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