Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3a4e4da authored by Gal Pressman's avatar Gal Pressman Committed by David S. Miller
Browse files

net/mlx5e: Count GSO packets correctly 



TX packets statistics ('tx_packets' counter) used to count GSO packets
as one, even though it contains multiple segments.
This patch will increment the counter by the number of segments, and
align the driver with the behavior of other drivers in the stack.

Note that no information is lost in this patch due to 'tx_tso_packets'
counter existence.

Before, ethtool showed:
$ ethtool -S ens6 | egrep "tx_packets|tx_tso_packets"
     tx_packets: 61340
     tx_tso_packets: 60954
     tx_packets_phy: 2451115

Now, we will see the more logical statistics:
$ ethtool -S ens6 | egrep "tx_packets|tx_tso_packets"
     tx_packets: 2451115
     tx_tso_packets: 60954
     tx_packets_phy: 2451115

Fixes: e586b3b0 ("net/mlx5: Ethernet Datapath files")
Signed-off-by: default avatarGal Pressman <galp@mellanox.com>
Cc: kernel-team@fb.com
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5f40b4ed

drivers/net/ethernet/mellanox/mlx5/core/en_tx.c

+3 −2
Original line number Diff line number Diff line
@@ -274,15 +274,18 @@ static netdev_tx_t mlx5e_sq_xmit(struct mlx5e_sq *sq, struct sk_buff *skb) 
			sq->stats.tso_bytes += skb->len - ihs;

		}



		sq->stats.packets += skb_shinfo(skb)->gso_segs;

		num_bytes = skb->len + (skb_shinfo(skb)->gso_segs - 1) * ihs;

	} else {

		bf = sq->bf_budget &&

		     !skb->xmit_more &&

		     !skb_shinfo(skb)->nr_frags;

		ihs = mlx5e_get_inline_hdr_size(sq, skb, bf);

		sq->stats.packets++;

		num_bytes = max_t(unsigned int, skb->len, ETH_ZLEN);

	}



	sq->stats.bytes += num_bytes;

	wi->num_bytes = num_bytes;



	ds_cnt = sizeof(*wqe) / MLX5_SEND_WQE_DS;
@@ -381,8 +384,6 @@ static netdev_tx_t mlx5e_sq_xmit(struct mlx5e_sq *sq, struct sk_buff *skb) 
	if (bf)

		sq->bf_budget--;



	sq->stats.packets++;

	sq->stats.bytes += num_bytes;

	return NETDEV_TX_OK;



dma_unmap_wqe_err: