Commit 16f448d4 authored by Dragos Tatulea's avatar Dragos Tatulea Committed by Jakub Kicinski
Browse files

net/mlx5e: SHAMPO, Drop rx_gro_match_packets counter 



After modifying rx_gro_packets to be more accurate, the
rx_gro_match_packets counter is redundant.

Signed-off-by: default avatarDragos Tatulea <dtatulea@nvidia.com>
Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
Link: https://lore.kernel.org/r/20240603212219.1037656-11-tariqt@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 8f9eb8bb

Documentation/networking/device_drivers/ethernet/mellanox/mlx5/counters.rst

+0 −5
Original line number Diff line number Diff line
@@ -204,11 +204,6 @@ the software port. 
       with a GRO count > 1 are counted.

     - Informative



   * - `rx[i]_gro_match_packets`

     - Number of received packets processed using hardware-accelerated GRO that

       met the flow table match criteria.

     - Informative



   * - `rx[i]_gro_large_hds`

     - Number of receive packets using hardware-accelerated GRO that have large

       headers that require additional memory to be allocated.

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

+0 −2
Original line number Diff line number Diff line
@@ -2296,8 +2296,6 @@ static void mlx5e_handle_rx_cqe_mpwrq_shampo(struct mlx5e_rq *rq, struct mlx5_cq 
		goto mpwrq_cqe_out;

	}



	stats->gro_match_packets += match;



	if (*skb && (!match || !(mlx5e_hw_gro_skb_has_enough_space(*skb, data_bcnt)))) {

		match = false;

		mlx5e_shampo_flush_skb(rq, cqe, match);

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

+0 −3
Original line number Diff line number Diff line
@@ -141,7 +141,6 @@ static const struct counter_desc sw_stats_desc[] = { 
	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_gro_packets) },

	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_gro_bytes) },

	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_gro_skbs) },

	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_gro_match_packets) },

	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_gro_large_hds) },

	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_ecn_mark) },

	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_removed_vlan_packets) },
@@ -343,7 +342,6 @@ static void mlx5e_stats_grp_sw_update_stats_rq_stats(struct mlx5e_sw_stats *s, 
	s->rx_gro_packets             += rq_stats->gro_packets;

	s->rx_gro_bytes               += rq_stats->gro_bytes;

	s->rx_gro_skbs                += rq_stats->gro_skbs;

	s->rx_gro_match_packets       += rq_stats->gro_match_packets;

	s->rx_gro_large_hds           += rq_stats->gro_large_hds;

	s->rx_ecn_mark                += rq_stats->ecn_mark;

	s->rx_removed_vlan_packets    += rq_stats->removed_vlan_packets;
@@ -2057,7 +2055,6 @@ static const struct counter_desc rq_stats_desc[] = { 
	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, gro_packets) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, gro_bytes) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, gro_skbs) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, gro_match_packets) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, gro_large_hds) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, ecn_mark) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, removed_vlan_packets) },

drivers/net/ethernet/mellanox/mlx5/core/en_stats.h

+0 −2
Original line number Diff line number Diff line
@@ -153,7 +153,6 @@ struct mlx5e_sw_stats { 
	u64 rx_gro_packets;

	u64 rx_gro_bytes;

	u64 rx_gro_skbs;

	u64 rx_gro_match_packets;

	u64 rx_gro_large_hds;

	u64 rx_mcast_packets;

	u64 rx_ecn_mark;
@@ -352,7 +351,6 @@ struct mlx5e_rq_stats { 
	u64 gro_packets;

	u64 gro_bytes;

	u64 gro_skbs;

	u64 gro_match_packets;

	u64 gro_large_hds;

	u64 mcast_packets;

	u64 ecn_mark;