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: Dragos Tatulea <dtatulea@nvidia.com>
Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
Link: https://lore.kernel.org/r/20240603212219.1037656-11-tariqt@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/Documentation/networking/device_drivers/ethernet/mellanox/mlx5/counters.rst b/Documentation/networking/device_drivers/ethernet/mellanox/mlx5/counters.rst
index 7ed010dbe4696834cb22ea8089406192b66af8c6..18638a8e7c73f933fcd3fbaca9dd7a3c56b9dcea 100644 (file)
--- a/Documentation/networking/device_drivers/ethernet/mellanox/mlx5/counters.rst
+++ b/Documentation/networking/device_drivers/ethernet/mellanox/mlx5/counters.rst
@@ -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.

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
index 79b486d5475d98d648d5caf3dfca0221330ee335..7ab7215843b681ea00d84d50da3295799a3b44f1 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
@@ -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);

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c b/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c
index e1ed214e86517a21af4cf6f9f2e75a9eaaf4b2b8..a3c79da1525bd465587bdfa0f3eec40032af2d12 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c
@@ -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) },

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_stats.h b/drivers/net/ethernet/mellanox/mlx5/core/en_stats.h
index 650732288616dbb986fb12354371b4738ebf4407..25daae526caa73b8208c09fb4d4b213d6d466a66 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_stats.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_stats.h
@@ -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;