Fix packet count when using vlan/macvlan drivers with gso. Without this it is not possible to reconcile packet counts between underlying devices and these virtual devices. Additionally, the output looks wrong in a standalone way i.e. device MTU of 1500, 1 packet sent, 31856 bytes sent.
There are many other drivers that likely have a similar problem, although it is not clear how many of those could be used with gso. Perhaps all packet counting should be wrapped in a helper fn. Signed-off-by: Debabrata Banerjee <dbane...@akamai.com> --- drivers/net/macvlan.c | 2 +- net/8021q/vlan_core.c | 2 +- net/8021q/vlan_dev.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index fc8d5f1ee1ad..15e67a87f202 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c @@ -566,7 +566,7 @@ static netdev_tx_t macvlan_start_xmit(struct sk_buff *skb, pcpu_stats = this_cpu_ptr(vlan->pcpu_stats); u64_stats_update_begin(&pcpu_stats->syncp); - pcpu_stats->tx_packets++; + pcpu_stats->tx_packets += max_t(u16, 1, skb_shinfo(skb)->gso_segs); pcpu_stats->tx_bytes += len; u64_stats_update_end(&pcpu_stats->syncp); } else { diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c index a313165e7a67..e85f6665d0ed 100644 --- a/net/8021q/vlan_core.c +++ b/net/8021q/vlan_core.c @@ -62,7 +62,7 @@ bool vlan_do_receive(struct sk_buff **skbp) rx_stats = this_cpu_ptr(vlan_dev_priv(vlan_dev)->vlan_pcpu_stats); u64_stats_update_begin(&rx_stats->syncp); - rx_stats->rx_packets++; + rx_stats->rx_packets += max_t(u16, 1, skb_shinfo(skb)->gso_segs); rx_stats->rx_bytes += skb->len; if (skb->pkt_type == PACKET_MULTICAST) rx_stats->rx_multicast++; diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index b2d9c8f27cd7..b28e7535a0b9 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c @@ -135,7 +135,7 @@ static netdev_tx_t vlan_dev_hard_start_xmit(struct sk_buff *skb, stats = this_cpu_ptr(vlan->vlan_pcpu_stats); u64_stats_update_begin(&stats->syncp); - stats->tx_packets++; + stats->tx_packets += max_t(u16, 1, skb_shinfo(skb)->gso_segs); stats->tx_bytes += len; u64_stats_update_end(&stats->syncp); } else { -- 2.19.2