veth: ignore peer tx_dropped when counting local rx_dropped

When local NET_RX backlog is full due to traffic overrun,
peer veth tx_dropped counter increases. At that time, list
local veth stats, rx_dropped has double value of peer
tx_dropped, even bigger than transmit packets by peer.

In NET_RX softirq process, if any packet drop case happens,
it increases dev's rx_dropped counter and returns NET_RX_DROP.

At veth tx side, it records any error returned from peer netif_rx
into local dev tx_dropped counter.

In veth get stats process, it puts local dev rx_dropped and
peer dev tx_dropped into together as local rx_drpped value.
So that it shows double value of real dropped packets number in
this case.

This patch ignores peer tx_dropped when counting local rx_dropped,
since peer tx_dropped is duplicated to local rx_dropped at most cases.

Signed-off-by: Jiang Lidong <jianglidong3@jd.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jiang Lidong 2020-03-04 09:49:29 +08:00 committed by David S. Miller
parent 2f63f2d598
commit e25d5dbcff

View File

@ -328,7 +328,7 @@ static void veth_get_stats64(struct net_device *dev,
rcu_read_lock(); rcu_read_lock();
peer = rcu_dereference(priv->peer); peer = rcu_dereference(priv->peer);
if (peer) { if (peer) {
tot->rx_dropped += veth_stats_tx(peer, &packets, &bytes); veth_stats_tx(peer, &packets, &bytes);
tot->rx_bytes += bytes; tot->rx_bytes += bytes;
tot->rx_packets += packets; tot->rx_packets += packets;