Skip to content

Commit

Permalink
veth: Fixing transmit return status for dropped packets
Browse files Browse the repository at this point in the history
[ Upstream commit 151e887 ]

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: e314dbd ("[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>
  • Loading branch information
LiangChen77 authored and gregkh committed Sep 19, 2023
1 parent a47ad6d commit e752860
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/net/veth.c
Expand Up @@ -313,6 +313,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_rq *rq = NULL;
int ret = NETDEV_TX_OK;
struct net_device *rcv;
int length = skb->len;
bool use_napi = false;
Expand Down Expand Up @@ -345,14 +346,15 @@ static netdev_tx_t veth_xmit(struct sk_buff *skb, struct net_device *dev)
} else {
drop:
atomic64_inc(&priv->dropped);
ret = NET_XMIT_DROP;
}

if (use_napi)
__veth_xdp_flush(rq);

rcu_read_unlock();

return NETDEV_TX_OK;
return ret;
}

static u64 veth_stats_tx(struct net_device *dev, u64 *packets, u64 *bytes)
Expand Down

0 comments on commit e752860

Please sign in to comment.