TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

veth: Fixing transmit return status for dropped packets

Browse Source 
[ Upstream commit 151e887d8f ]

The veth_xmit function returns NETDEV_TX_OK even when packets are dropped.
This behavior leads to incorrect calculations of statistics counts, as
well as things like txq->trans_start updates.

Fixes: e314dbdc1c ("[NET]: Virtual ethernet device driver.")
Signed-off-by: Liang Chen <liangchen.linux@gmail.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Liang Chen
2023-09-01 12:09:21 +08:00
committed by Greg Kroah-Hartman
parent ab9796f43c
commit d47bc5023e
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/net/veth.c
+3 -1
View File
@@ -285,6 +285,7 @@ static netdev_tx_t veth_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
struct veth_priv *rcv_priv, *priv = netdev_priv(dev); struct veth_priv *rcv_priv, *priv = netdev_priv(dev);
struct veth_rq *rq = NULL; struct veth_rq *rq = NULL;
int ret = NETDEV_TX_OK;
struct net_device *rcv; struct net_device *rcv;
int length = skb->len; int length = skb->len;
bool rcv_xdp = false; bool rcv_xdp = false;
@@ -311,6 +312,7 @@ static netdev_tx_t veth_xmit(struct sk_buff *skb, struct net_device *dev)
} else { } else {
drop: drop:
atomic64_inc(&priv->dropped); atomic64_inc(&priv->dropped);
ret = NET_XMIT_DROP;
} }
if (rcv_xdp) if (rcv_xdp)
@@ -318,7 +320,7 @@ drop:
rcu_read_unlock(); rcu_read_unlock();
return NETDEV_TX_OK; return ret;
} }
static u64 veth_stats_tx(struct net_device *dev, u64 *packets, u64 *bytes) static u64 veth_stats_tx(struct net_device *dev, u64 *packets, u64 *bytes)