From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Wenliang Wang <wangwenliang.1995@bytedance.com>,
Jason Wang <jasowang@redhat.com>,
"Michael S . Tsirkin" <mst@redhat.com>,
"David S . Miller" <davem@davemloft.net>,
Sasha Levin <sashal@kernel.org>,
kuba@kernel.org, virtualization@lists.linux-foundation.org,
netdev@vger.kernel.org
Subject: [PATCH AUTOSEL 5.10 17/19] virtio_net: fix rx_drops stat for small pkts
Date: Mon, 20 Dec 2021 20:59:12 -0500 [thread overview]
Message-ID: <20211221015914.116767-17-sashal@kernel.org> (raw)
In-Reply-To: <20211221015914.116767-1-sashal@kernel.org>
From: Wenliang Wang <wangwenliang.1995@bytedance.com>
[ Upstream commit 053c9e18c6f9cf82242ef35ac21cae1842725714 ]
We found the stat of rx drops for small pkts does not increment when
build_skb fail, it's not coherent with other mode's rx drops stat.
Signed-off-by: Wenliang Wang <wangwenliang.1995@bytedance.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/net/virtio_net.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index cbe47eed7cc3c..3ba289b695f04 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -697,7 +697,7 @@ static struct sk_buff *receive_small(struct net_device *dev,
pr_debug("%s: rx error: len %u exceeds max size %d\n",
dev->name, len, GOOD_PACKET_LEN);
dev->stats.rx_length_errors++;
- goto err_len;
+ goto err;
}
rcu_read_lock();
xdp_prog = rcu_dereference(rq->xdp_prog);
@@ -782,10 +782,8 @@ static struct sk_buff *receive_small(struct net_device *dev,
rcu_read_unlock();
skb = build_skb(buf, buflen);
- if (!skb) {
- put_page(page);
+ if (!skb)
goto err;
- }
skb_reserve(skb, headroom - delta);
skb_put(skb, len);
if (!xdp_prog) {
@@ -796,13 +794,12 @@ static struct sk_buff *receive_small(struct net_device *dev,
if (metasize)
skb_metadata_set(skb, metasize);
-err:
return skb;
err_xdp:
rcu_read_unlock();
stats->xdp_drops++;
-err_len:
+err:
stats->drops++;
put_page(page);
xdp_xmit:
--
2.34.1
next prev parent reply other threads:[~2021-12-21 2:00 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-21 1:58 [PATCH AUTOSEL 5.10 01/19] ARM: dts: ls1021a-tsn: update RGMII delays for sja1105 switch Sasha Levin
2021-12-21 1:58 ` [PATCH AUTOSEL 5.10 02/19] ARM: rockchip: Use memcpy_toio instead of memcpy on smp bring-up Sasha Levin
2021-12-21 1:58 ` [PATCH AUTOSEL 5.10 03/19] mac80211: set up the fwd_skb->dev for mesh forwarding Sasha Levin
2021-12-21 1:58 ` [PATCH AUTOSEL 5.10 04/19] mac80211: fix a memory leak where sta_info is not freed Sasha Levin
2021-12-21 1:59 ` [PATCH AUTOSEL 5.10 05/19] nl80211: reset regdom when reloading regdb Sasha Levin
2021-12-21 1:59 ` [PATCH AUTOSEL 5.10 06/19] iwlwifi: fix LED dependencies Sasha Levin
2021-12-21 1:59 ` [PATCH AUTOSEL 5.10 07/19] phonet: refcount leak in pep_sock_accep Sasha Levin
2021-12-21 1:59 ` [PATCH AUTOSEL 5.10 08/19] net: bcmgenet: Fix NULL vs IS_ERR() checking Sasha Levin
2021-12-21 1:59 ` [PATCH AUTOSEL 5.10 09/19] scsi: pm8001: Fix phys_to_virt() usage on dma_addr_t Sasha Levin
2021-12-21 1:59 ` [PATCH AUTOSEL 5.10 10/19] mac80211: Fix the size used for building probe request Sasha Levin
2021-12-21 1:59 ` [PATCH AUTOSEL 5.10 11/19] mac80211: update channel context before station state Sasha Levin
2021-12-21 1:59 ` [PATCH AUTOSEL 5.10 12/19] mac80211: do drv_reconfig_complete() before restarting all Sasha Levin
2021-12-21 1:59 ` [PATCH AUTOSEL 5.10 13/19] drm/amd/display: Reset DMCUB before HW init Sasha Levin
2021-12-21 1:59 ` [PATCH AUTOSEL 5.10 14/19] drm/amdgpu: correct the wrong cached state for GMC on PICASSO Sasha Levin
2021-12-21 1:59 ` [PATCH AUTOSEL 5.10 15/19] block: reduce kblockd_mod_delayed_work_on() CPU consumption Sasha Levin
2021-12-21 1:59 ` [PATCH AUTOSEL 5.10 16/19] net: usb: lan78xx: add Allied Telesis AT29M2-AF Sasha Levin
2021-12-21 1:59 ` Sasha Levin [this message]
2021-12-21 1:59 ` [PATCH AUTOSEL 5.10 18/19] bpf: Make 32->64 bounds propagation slightly more robust Sasha Levin
2021-12-21 1:59 ` [PATCH AUTOSEL 5.10 19/19] Revert "block: reduce kblockd_mod_delayed_work_on() CPU consumption" Sasha Levin
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=20211221015914.116767-17-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=davem@davemloft.net \
--cc=jasowang@redhat.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=virtualization@lists.linux-foundation.org \
--cc=wangwenliang.1995@bytedance.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
all inboxes | Powered by JetHome®