net/mlx5e: Make stats group fill_stats callbacks consistent with the API

The fill_strings() callbacks were changed to accept a **data pointer,
and not rely on propagating the index value.
Make a similar change to fill_stats() callbacks to keep the API
consistent.

Signed-off-by: Gal Pressman <gal@nvidia.com>
Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://lore.kernel.org/r/20240402133043.56322-5-tariqt@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_stats.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_stats.c
index ecf87383ecb8b7af4cfae90917fde89cc742f7dd..92bf3fa44a3b130e78a1c527c9b7a122e6d4f40a 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_stats.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_stats.c
@@ -89,14 +89,14 @@ static MLX5E_DECLARE_STATS_GRP_OP_FILL_STATS(ipsec_hw)
        int i;
 
        if (!priv->ipsec)
-               return idx;
+               return;
 
        mlx5e_accel_ipsec_fs_read_stats(priv, &priv->ipsec->hw_stats);
        for (i = 0; i < NUM_IPSEC_HW_COUNTERS; i++)
-               data[idx++] = MLX5E_READ_CTR_ATOMIC64(&priv->ipsec->hw_stats,
-                                                     mlx5e_ipsec_hw_stats_desc, i);
-
-       return idx;
+               mlx5e_ethtool_put_stat(
+                       data,
+                       MLX5E_READ_CTR_ATOMIC64(&priv->ipsec->hw_stats,
+                                               mlx5e_ipsec_hw_stats_desc, i));
 }
 
 static MLX5E_DECLARE_STATS_GRP_OP_NUM_STATS(ipsec_sw)
@@ -121,9 +121,10 @@ static MLX5E_DECLARE_STATS_GRP_OP_FILL_STATS(ipsec_sw)
 
        if (priv->ipsec)
                for (i = 0; i < NUM_IPSEC_SW_COUNTERS; i++)
-                       data[idx++] = MLX5E_READ_CTR_ATOMIC64(&priv->ipsec->sw_stats,
-                                                             mlx5e_ipsec_sw_stats_desc, i);
-       return idx;
+                       mlx5e_ethtool_put_stat(
+                               data, MLX5E_READ_CTR_ATOMIC64(
+                                             &priv->ipsec->sw_stats,
+                                             mlx5e_ipsec_sw_stats_desc, i));
 }
 
 MLX5E_DEFINE_STATS_GRP(ipsec_hw, 0);

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.h b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.h
index 9b96bee194ef1b20b8b3df326f043f79da6fb550..c1844128effab44dfc3dcfaeb286f900f843c61f 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.h
@@ -96,7 +96,7 @@ void mlx5e_ktls_cleanup(struct mlx5e_priv *priv);
 
 int mlx5e_ktls_get_count(struct mlx5e_priv *priv);
 void mlx5e_ktls_get_strings(struct mlx5e_priv *priv, uint8_t **data);
-int mlx5e_ktls_get_stats(struct mlx5e_priv *priv, u64 *data);
+void mlx5e_ktls_get_stats(struct mlx5e_priv *priv, u64 **data);
 
 #else
 static inline void mlx5e_ktls_build_netdev(struct mlx5e_priv *priv)
@@ -146,10 +146,7 @@ static inline void mlx5e_ktls_cleanup(struct mlx5e_priv *priv) { }
 static inline int mlx5e_ktls_get_count(struct mlx5e_priv *priv) { return 0; }
 static inline void mlx5e_ktls_get_strings(struct mlx5e_priv *priv, uint8_t **data) { }
 
-static inline int mlx5e_ktls_get_stats(struct mlx5e_priv *priv, u64 *data)
-{
-       return 0;
-}
+static inline void mlx5e_ktls_get_stats(struct mlx5e_priv *priv, u64 **data) { }
 #endif
 
 #endif /* __MLX5E_TLS_H__ */

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_stats.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_stats.c
index 06363f2653e066eb4c7e849d45c0866d2a69a84d..7bf79973128bdcc9c130a0da7f5d037615cdc6fb 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_stats.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_stats.c
@@ -71,19 +71,18 @@ void mlx5e_ktls_get_strings(struct mlx5e_priv *priv, uint8_t **data)
                ethtool_puts(data, mlx5e_ktls_sw_stats_desc[i].format);
 }
 
-int mlx5e_ktls_get_stats(struct mlx5e_priv *priv, u64 *data)
+void mlx5e_ktls_get_stats(struct mlx5e_priv *priv, u64 **data)
 {
-       unsigned int i, n, idx = 0;
+       unsigned int i, n;
 
        if (!priv->tls)
-               return 0;
+               return;
 
        n = mlx5e_ktls_get_count(priv);
 
        for (i = 0; i < n; i++)
-               data[idx++] = MLX5E_READ_CTR_ATOMIC64(&priv->tls->sw_stats,
-                                                     mlx5e_ktls_sw_stats_desc,
-                                                     i);
-
-       return n;
+               mlx5e_ethtool_put_stat(
+                       data,
+                       MLX5E_READ_CTR_ATOMIC64(&priv->tls->sw_stats,
+                                               mlx5e_ktls_sw_stats_desc, i));
 }

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec_stats.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec_stats.c
index a79e2786be56b777e4c126cfbb50e271f4b374f5..4bb47d48061d581cf82a00d62ccd0aa058898c9d 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec_stats.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec_stats.c
@@ -53,19 +53,18 @@ static MLX5E_DECLARE_STATS_GRP_OP_FILL_STATS(macsec_hw)
        int i;
 
        if (!priv->macsec)
-               return idx;
+               return;
 
        if (!mlx5e_is_macsec_device(priv->mdev))
-               return idx;
+               return;
 
        macsec_fs = priv->mdev->macsec_fs;
        mlx5_macsec_fs_get_stats_fill(macsec_fs, mlx5_macsec_fs_get_stats(macsec_fs));
        for (i = 0; i < NUM_MACSEC_HW_COUNTERS; i++)
-               data[idx++] = MLX5E_READ_CTR64_CPU(mlx5_macsec_fs_get_stats(macsec_fs),
-                                                  mlx5e_macsec_hw_stats_desc,
-                                                  i);
-
-       return idx;
+               mlx5e_ethtool_put_stat(
+                       data, MLX5E_READ_CTR64_CPU(
+                                     mlx5_macsec_fs_get_stats(macsec_fs),
+                                     mlx5e_macsec_hw_stats_desc, i));
 }
 
 MLX5E_DEFINE_STATS_GRP(macsec_hw, 0);

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
index e41fbf377ae87a1d8c0483a42360452a069e0e14..55b7efe21624862a9958149659d6397567363bea 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
@@ -143,9 +143,9 @@ static MLX5E_DECLARE_STATS_GRP_OP_FILL_STATS(sw_rep)
        int i;
 
        for (i = 0; i < NUM_VPORT_REP_SW_COUNTERS; i++)
-               data[idx++] = MLX5E_READ_CTR64_CPU(&priv->stats.sw,
-                                                  sw_rep_stats_desc, i);
-       return idx;
+               mlx5e_ethtool_put_stat(
+                       data, MLX5E_READ_CTR64_CPU(&priv->stats.sw,
+                                                  sw_rep_stats_desc, i));
 }
 
 static MLX5E_DECLARE_STATS_GRP_OP_UPDATE_STATS(sw_rep)
@@ -184,12 +184,14 @@ static MLX5E_DECLARE_STATS_GRP_OP_FILL_STATS(vport_rep)
        int i;
 
        for (i = 0; i < NUM_VPORT_REP_HW_COUNTERS; i++)
-               data[idx++] = MLX5E_READ_CTR64_CPU(&priv->stats.rep_stats,
-                                                  vport_rep_stats_desc, i);
+               mlx5e_ethtool_put_stat(
+                       data, MLX5E_READ_CTR64_CPU(&priv->stats.rep_stats,
+                                                  vport_rep_stats_desc, i));
        for (i = 0; i < NUM_VPORT_REP_LOOPBACK_COUNTERS(priv->mdev); i++)
-               data[idx++] = MLX5E_READ_CTR64_CPU(&priv->stats.rep_stats,
-                                                  vport_rep_loopback_stats_desc, i);
-       return idx;
+               mlx5e_ethtool_put_stat(
+                       data,
+                       MLX5E_READ_CTR64_CPU(&priv->stats.rep_stats,
+                                            vport_rep_loopback_stats_desc, i));
 }
 
 static MLX5E_DECLARE_STATS_GRP_OP_UPDATE_STATS(vport_rep)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c b/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c
index 6be0bcc9a3f4bffffca04d1c1eca12937b62f697..4f372cb2fc9aad6eab5328c22a227f0cf5dd1fdb 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_stats.c
@@ -41,6 +41,11 @@
 #include <net/page_pool/helpers.h>
 #endif
 
+void mlx5e_ethtool_put_stat(u64 **data, u64 val)
+{
+       *(*data)++ = val;
+}
+
 static unsigned int stats_grps_num(struct mlx5e_priv *priv)
 {
        return !priv->profile->stats_grps_num ? 0 :
@@ -90,7 +95,7 @@ void mlx5e_stats_fill(struct mlx5e_priv *priv, u64 *data, int idx)
        int i;
 
        for (i = 0; i < num_stats_grps; i++)
-               idx = stats_grps[i]->fill_stats(priv, data, idx);
+               stats_grps[i]->fill_stats(priv, &data);
 }
 
 void mlx5e_stats_fill_strings(struct mlx5e_priv *priv, u8 *data)
@@ -265,8 +270,9 @@ static MLX5E_DECLARE_STATS_GRP_OP_FILL_STATS(sw)
        int i;
 
        for (i = 0; i < NUM_SW_COUNTERS; i++)
-               data[idx++] = MLX5E_READ_CTR64_CPU(&priv->stats.sw, sw_stats_desc, i);
-       return idx;
+               mlx5e_ethtool_put_stat(data,
+                                      MLX5E_READ_CTR64_CPU(&priv->stats.sw,
+                                                           sw_stats_desc, i));
 }
 
 static void mlx5e_stats_grp_sw_update_stats_xdp_red(struct mlx5e_sw_stats *s,
@@ -601,12 +607,13 @@ static MLX5E_DECLARE_STATS_GRP_OP_FILL_STATS(qcnt)
        int i;
 
        for (i = 0; i < NUM_Q_COUNTERS && q_counter_any(priv); i++)
-               data[idx++] = MLX5E_READ_CTR32_CPU(&priv->stats.qcnt,
-                                                  q_stats_desc, i);
+               mlx5e_ethtool_put_stat(data,
+                                      MLX5E_READ_CTR32_CPU(&priv->stats.qcnt,
+                                                           q_stats_desc, i));
        for (i = 0; i < NUM_DROP_RQ_COUNTERS && priv->drop_rq_q_counter; i++)
-               data[idx++] = MLX5E_READ_CTR32_CPU(&priv->stats.qcnt,
-                                                  drop_rq_stats_desc, i);
-       return idx;
+               mlx5e_ethtool_put_stat(
+                       data, MLX5E_READ_CTR32_CPU(&priv->stats.qcnt,
+                                                  drop_rq_stats_desc, i));
 }
 
 static MLX5E_DECLARE_STATS_GRP_OP_UPDATE_STATS(qcnt)
@@ -694,18 +701,22 @@ static MLX5E_DECLARE_STATS_GRP_OP_FILL_STATS(vnic_env)
        int i;
 
        for (i = 0; i < NUM_VNIC_ENV_STEER_COUNTERS(priv->mdev); i++)
-               data[idx++] = MLX5E_READ_CTR64_BE(priv->stats.vnic.query_vnic_env_out,
-                                                 vnic_env_stats_steer_desc, i);
+               mlx5e_ethtool_put_stat(
+                       data,
+                       MLX5E_READ_CTR64_BE(priv->stats.vnic.query_vnic_env_out,
+                                           vnic_env_stats_steer_desc, i));
 
        for (i = 0; i < NUM_VNIC_ENV_DEV_OOB_COUNTERS(priv->mdev); i++)
-               data[idx++] = MLX5E_READ_CTR32_BE(priv->stats.vnic.query_vnic_env_out,
-                                                 vnic_env_stats_dev_oob_desc, i);
+               mlx5e_ethtool_put_stat(
+                       data,
+                       MLX5E_READ_CTR32_BE(priv->stats.vnic.query_vnic_env_out,
+                                           vnic_env_stats_dev_oob_desc, i));
 
        for (i = 0; i < NUM_VNIC_ENV_DROP_COUNTERS(priv->mdev); i++)
-               data[idx++] = MLX5E_READ_CTR32_BE(priv->stats.vnic.query_vnic_env_out,
-                                                 vnic_env_stats_drop_desc, i);
-
-       return idx;
+               mlx5e_ethtool_put_stat(
+                       data,
+                       MLX5E_READ_CTR32_BE(priv->stats.vnic.query_vnic_env_out,
+                                           vnic_env_stats_drop_desc, i));
 }
 
 static MLX5E_DECLARE_STATS_GRP_OP_UPDATE_STATS(vnic_env)
@@ -799,14 +810,16 @@ static MLX5E_DECLARE_STATS_GRP_OP_FILL_STATS(vport)
        int i;
 
        for (i = 0; i < NUM_VPORT_COUNTERS; i++)
-               data[idx++] = MLX5E_READ_CTR64_BE(priv->stats.vport.query_vport_out,
-                                                 vport_stats_desc, i);
+               mlx5e_ethtool_put_stat(
+                       data,
+                       MLX5E_READ_CTR64_BE(priv->stats.vport.query_vport_out,
+                                           vport_stats_desc, i));
 
        for (i = 0; i < NUM_VPORT_LOOPBACK_COUNTERS(priv->mdev); i++)
-               data[idx++] = MLX5E_READ_CTR64_BE(priv->stats.vport.query_vport_out,
-                                                 vport_loopback_stats_desc, i);
-
-       return idx;
+               mlx5e_ethtool_put_stat(
+                       data,
+                       MLX5E_READ_CTR64_BE(priv->stats.vport.query_vport_out,
+                                           vport_loopback_stats_desc, i));
 }
 
 static MLX5E_DECLARE_STATS_GRP_OP_UPDATE_STATS(vport)
@@ -863,9 +876,10 @@ static MLX5E_DECLARE_STATS_GRP_OP_FILL_STATS(802_3)
        int i;
 
        for (i = 0; i < NUM_PPORT_802_3_COUNTERS; i++)
-               data[idx++] = MLX5E_READ_CTR64_BE(&priv->stats.pport.IEEE_802_3_counters,
-                                                 pport_802_3_stats_desc, i);
-       return idx;
+               mlx5e_ethtool_put_stat(
+                       data, MLX5E_READ_CTR64_BE(
+                                     &priv->stats.pport.IEEE_802_3_counters,
+                                     pport_802_3_stats_desc, i));
 }
 
 #define MLX5_BASIC_PPCNT_SUPPORTED(mdev) \
@@ -1023,9 +1037,10 @@ static MLX5E_DECLARE_STATS_GRP_OP_FILL_STATS(2863)
        int i;
 
        for (i = 0; i < NUM_PPORT_2863_COUNTERS; i++)
-               data[idx++] = MLX5E_READ_CTR64_BE(&priv->stats.pport.RFC_2863_counters,
-                                                 pport_2863_stats_desc, i);
-       return idx;
+               mlx5e_ethtool_put_stat(
+                       data, MLX5E_READ_CTR64_BE(
+                                     &priv->stats.pport.RFC_2863_counters,
+                                     pport_2863_stats_desc, i));
 }
 
 static MLX5E_DECLARE_STATS_GRP_OP_UPDATE_STATS(2863)
@@ -1081,9 +1096,10 @@ static MLX5E_DECLARE_STATS_GRP_OP_FILL_STATS(2819)
        int i;
 
        for (i = 0; i < NUM_PPORT_2819_COUNTERS; i++)
-               data[idx++] = MLX5E_READ_CTR64_BE(&priv->stats.pport.RFC_2819_counters,
-                                                 pport_2819_stats_desc, i);
-       return idx;
+               mlx5e_ethtool_put_stat(
+                       data, MLX5E_READ_CTR64_BE(
+                                     &priv->stats.pport.RFC_2819_counters,
+                                     pport_2819_stats_desc, i));
 }
 
 static MLX5E_DECLARE_STATS_GRP_OP_UPDATE_STATS(2819)
@@ -1219,24 +1235,29 @@ static MLX5E_DECLARE_STATS_GRP_OP_FILL_STATS(phy)
        int i;
 
        /* link_down_events_phy has special handling since it is not stored in __be64 format */
-       data[idx++] = MLX5_GET(ppcnt_reg, priv->stats.pport.phy_counters,
-                              counter_set.phys_layer_cntrs.link_down_events);
+       mlx5e_ethtool_put_stat(
+               data, MLX5_GET(ppcnt_reg, priv->stats.pport.phy_counters,
+                              counter_set.phys_layer_cntrs.link_down_events));
 
        if (!MLX5_CAP_PCAM_FEATURE(mdev, ppcnt_statistical_group))
-               return idx;
+               return;
 
        for (i = 0; i < NUM_PPORT_PHY_STATISTICAL_COUNTERS; i++)
-               data[idx++] =
-                       MLX5E_READ_CTR64_BE(&priv->stats.pport.phy_statistical_counters,
-                                           pport_phy_statistical_stats_desc, i);
+               mlx5e_ethtool_put_stat(
+                       data,
+                       MLX5E_READ_CTR64_BE(
+                               &priv->stats.pport.phy_statistical_counters,
+                               pport_phy_statistical_stats_desc, i));
 
        if (MLX5_CAP_PCAM_FEATURE(mdev, per_lane_error_counters))
                for (i = 0; i < NUM_PPORT_PHY_STATISTICAL_PER_LANE_COUNTERS; i++)
-                       data[idx++] =
-                               MLX5E_READ_CTR64_BE(&priv->stats.pport.phy_statistical_counters,
-                                                   pport_phy_statistical_err_lanes_stats_desc,
-                                                   i);
-       return idx;
+                       mlx5e_ethtool_put_stat(
+                               data,
+                               MLX5E_READ_CTR64_BE(
+                                       &priv->stats.pport
+                                                .phy_statistical_counters,
+                                       pport_phy_statistical_err_lanes_stats_desc,
+                                       i));
 }
 
 static MLX5E_DECLARE_STATS_GRP_OP_UPDATE_STATS(phy)
@@ -1426,10 +1447,11 @@ static MLX5E_DECLARE_STATS_GRP_OP_FILL_STATS(eth_ext)
 
        if (MLX5_CAP_PCAM_FEATURE((priv)->mdev, rx_buffer_fullness_counters))
                for (i = 0; i < NUM_PPORT_ETH_EXT_COUNTERS; i++)
-                       data[idx++] =
-                               MLX5E_READ_CTR64_BE(&priv->stats.pport.eth_ext_counters,
-                                                   pport_eth_ext_stats_desc, i);
-       return idx;
+                       mlx5e_ethtool_put_stat(
+                               data,
+                               MLX5E_READ_CTR64_BE(
+                                       &priv->stats.pport.eth_ext_counters,
+                                       pport_eth_ext_stats_desc, i));
 }
 
 static MLX5E_DECLARE_STATS_GRP_OP_UPDATE_STATS(eth_ext)
@@ -1513,22 +1535,27 @@ static MLX5E_DECLARE_STATS_GRP_OP_FILL_STATS(pcie)
 
        if (MLX5_CAP_MCAM_FEATURE((priv)->mdev, pcie_performance_group))
                for (i = 0; i < NUM_PCIE_PERF_COUNTERS; i++)
-                       data[idx++] =
-                               MLX5E_READ_CTR32_BE(&priv->stats.pcie.pcie_perf_counters,
-                                                   pcie_perf_stats_desc, i);
+                       mlx5e_ethtool_put_stat(
+                               data,
+                               MLX5E_READ_CTR32_BE(
+                                       &priv->stats.pcie.pcie_perf_counters,
+                                       pcie_perf_stats_desc, i));
 
        if (MLX5_CAP_MCAM_FEATURE((priv)->mdev, tx_overflow_buffer_pkt))
                for (i = 0; i < NUM_PCIE_PERF_COUNTERS64; i++)
-                       data[idx++] =
-                               MLX5E_READ_CTR64_BE(&priv->stats.pcie.pcie_perf_counters,
-                                                   pcie_perf_stats_desc64, i);
+                       mlx5e_ethtool_put_stat(
+                               data,
+                               MLX5E_READ_CTR64_BE(
+                                       &priv->stats.pcie.pcie_perf_counters,
+                                       pcie_perf_stats_desc64, i));
 
        if (MLX5_CAP_MCAM_FEATURE((priv)->mdev, pcie_outbound_stalled))
                for (i = 0; i < NUM_PCIE_PERF_STALL_COUNTERS; i++)
-                       data[idx++] =
-                               MLX5E_READ_CTR32_BE(&priv->stats.pcie.pcie_perf_counters,
-                                                   pcie_perf_stall_stats_desc, i);
-       return idx;
+                       mlx5e_ethtool_put_stat(
+                               data,
+                               MLX5E_READ_CTR32_BE(
+                                       &priv->stats.pcie.pcie_perf_counters,
+                                       pcie_perf_stall_stats_desc, i));
 }
 
 static MLX5E_DECLARE_STATS_GRP_OP_UPDATE_STATS(pcie)
@@ -1606,20 +1633,24 @@ static MLX5E_DECLARE_STATS_GRP_OP_FILL_STATS(per_port_buff_congest)
        int i, prio;
 
        if (!MLX5_CAP_GEN(mdev, sbcam_reg))
-               return idx;
+               return;
 
        for (prio = 0; prio < NUM_PPORT_PRIO; prio++) {
                for (i = 0; i < NUM_PPORT_PER_TC_PRIO_COUNTERS; i++)
-                       data[idx++] =
-                               MLX5E_READ_CTR64_BE(&pport->per_tc_prio_counters[prio],
-                                                   pport_per_tc_prio_stats_desc, i);
+                       mlx5e_ethtool_put_stat(
+                               data,
+                               MLX5E_READ_CTR64_BE(
+                                       &pport->per_tc_prio_counters[prio],
+                                       pport_per_tc_prio_stats_desc, i));
                for (i = 0; i < NUM_PPORT_PER_TC_CONGEST_PRIO_COUNTERS ; i++)
-                       data[idx++] =
-                               MLX5E_READ_CTR64_BE(&pport->per_tc_congest_prio_counters[prio],
-                                                   pport_per_tc_congest_prio_stats_desc, i);
+                       mlx5e_ethtool_put_stat(
+                               data,
+                               MLX5E_READ_CTR64_BE(
+                                       &pport->per_tc_congest_prio_counters
+                                                [prio],
+                                       pport_per_tc_congest_prio_stats_desc,
+                                       i));
        }
-
-       return idx;
 }
 
 static void mlx5e_grp_per_tc_prio_update_stats(struct mlx5e_priv *priv)
@@ -1717,20 +1748,20 @@ static void mlx5e_grp_per_prio_traffic_fill_strings(struct mlx5e_priv *priv,
        }
 }
 
-static int mlx5e_grp_per_prio_traffic_fill_stats(struct mlx5e_priv *priv,
-                                                u64 *data,
-                                                int idx)
+static void mlx5e_grp_per_prio_traffic_fill_stats(struct mlx5e_priv *priv,
+                                                 u64 **data)
 {
        int i, prio;
 
        for (prio = 0; prio < NUM_PPORT_PRIO; prio++) {
                for (i = 0; i < NUM_PPORT_PER_PRIO_TRAFFIC_COUNTERS; i++)
-                       data[idx++] =
-                               MLX5E_READ_CTR64_BE(&priv->stats.pport.per_prio_counters[prio],
-                                                   pport_per_prio_traffic_stats_desc, i);
+                       mlx5e_ethtool_put_stat(
+                               data,
+                               MLX5E_READ_CTR64_BE(
+                                       &priv->stats.pport
+                                                .per_prio_counters[prio],
+                                       pport_per_prio_traffic_stats_desc, i));
        }
-
-       return idx;
 }
 
 static const struct counter_desc pport_per_prio_pfc_stats_desc[] = {
@@ -1820,9 +1851,8 @@ static void mlx5e_grp_per_prio_pfc_fill_strings(struct mlx5e_priv *priv,
                ethtool_puts(data, pport_pfc_stall_stats_desc[i].format);
 }
 
-static int mlx5e_grp_per_prio_pfc_fill_stats(struct mlx5e_priv *priv,
-                                            u64 *data,
-                                            int idx)
+static void mlx5e_grp_per_prio_pfc_fill_stats(struct mlx5e_priv *priv,
+                                             u64 **data)
 {
        unsigned long pfc_combined;
        int i, prio;
@@ -1830,25 +1860,30 @@ static int mlx5e_grp_per_prio_pfc_fill_stats(struct mlx5e_priv *priv,
        pfc_combined = mlx5e_query_pfc_combined(priv);
        for_each_set_bit(prio, &pfc_combined, NUM_PPORT_PRIO) {
                for (i = 0; i < NUM_PPORT_PER_PRIO_PFC_COUNTERS; i++) {
-                       data[idx++] =
-                               MLX5E_READ_CTR64_BE(&priv->stats.pport.per_prio_counters[prio],
-                                                   pport_per_prio_pfc_stats_desc, i);
+                       mlx5e_ethtool_put_stat(
+                               data,
+                               MLX5E_READ_CTR64_BE(
+                                       &priv->stats.pport
+                                                .per_prio_counters[prio],
+                                       pport_per_prio_pfc_stats_desc, i));
                }
        }
 
        if (mlx5e_query_global_pause_combined(priv)) {
                for (i = 0; i < NUM_PPORT_PER_PRIO_PFC_COUNTERS; i++) {
-                       data[idx++] =
-                               MLX5E_READ_CTR64_BE(&priv->stats.pport.per_prio_counters[0],
-                                                   pport_per_prio_pfc_stats_desc, i);
+                       mlx5e_ethtool_put_stat(
+                               data,
+                               MLX5E_READ_CTR64_BE(
+                                       &priv->stats.pport.per_prio_counters[0],
+                                       pport_per_prio_pfc_stats_desc, i));
                }
        }
 
        for (i = 0; i < NUM_PPORT_PFC_STALL_COUNTERS(priv); i++)
-               data[idx++] = MLX5E_READ_CTR64_BE(&priv->stats.pport.per_prio_counters[0],
-                                                 pport_pfc_stall_stats_desc, i);
-
-       return idx;
+               mlx5e_ethtool_put_stat(
+                       data, MLX5E_READ_CTR64_BE(
+                                     &priv->stats.pport.per_prio_counters[0],
+                                     pport_pfc_stall_stats_desc, i));
 }
 
 static MLX5E_DECLARE_STATS_GRP_OP_NUM_STATS(per_prio)
@@ -1865,9 +1900,8 @@ static MLX5E_DECLARE_STATS_GRP_OP_FILL_STRS(per_prio)
 
 static MLX5E_DECLARE_STATS_GRP_OP_FILL_STATS(per_prio)
 {
-       idx = mlx5e_grp_per_prio_traffic_fill_stats(priv, data, idx);
-       idx = mlx5e_grp_per_prio_pfc_fill_stats(priv, data, idx);
-       return idx;
+       mlx5e_grp_per_prio_traffic_fill_stats(priv, data);
+       mlx5e_grp_per_prio_pfc_fill_stats(priv, data);
 }
 
 static MLX5E_DECLARE_STATS_GRP_OP_UPDATE_STATS(per_prio)
@@ -1929,14 +1963,14 @@ static MLX5E_DECLARE_STATS_GRP_OP_FILL_STATS(pme)
        mlx5_get_pme_stats(priv->mdev, &pme_stats);
 
        for (i = 0; i < NUM_PME_STATUS_STATS; i++)
-               data[idx++] = MLX5E_READ_CTR64_CPU(pme_stats.status_counters,
-                                                  mlx5e_pme_status_desc, i);
+               mlx5e_ethtool_put_stat(
+                       data, MLX5E_READ_CTR64_CPU(pme_stats.status_counters,
+                                                  mlx5e_pme_status_desc, i));
 
        for (i = 0; i < NUM_PME_ERR_STATS; i++)
-               data[idx++] = MLX5E_READ_CTR64_CPU(pme_stats.error_counters,
-                                                  mlx5e_pme_error_desc, i);
-
-       return idx;
+               mlx5e_ethtool_put_stat(
+                       data, MLX5E_READ_CTR64_CPU(pme_stats.error_counters,
+                                                  mlx5e_pme_error_desc, i));
 }
 
 static MLX5E_DECLARE_STATS_GRP_OP_UPDATE_STATS(pme) { return; }
@@ -1953,7 +1987,7 @@ static MLX5E_DECLARE_STATS_GRP_OP_FILL_STRS(tls)
 
 static MLX5E_DECLARE_STATS_GRP_OP_FILL_STATS(tls)
 {
-       return idx + mlx5e_ktls_get_stats(priv, data + idx);
+       mlx5e_ktls_get_stats(priv, data);
 }
 
 static MLX5E_DECLARE_STATS_GRP_OP_UPDATE_STATS(tls) { return; }
@@ -2250,10 +2284,10 @@ static MLX5E_DECLARE_STATS_GRP_OP_FILL_STATS(qos)
                struct mlx5e_sq_stats *s = READ_ONCE(stats[qid]);
 
                for (i = 0; i < NUM_QOS_SQ_STATS; i++)
-                       data[idx++] = MLX5E_READ_CTR64_CPU(s, qos_sq_stats_desc, i);
+                       mlx5e_ethtool_put_stat(
+                               data,
+                               MLX5E_READ_CTR64_CPU(s, qos_sq_stats_desc, i));
        }
-
-       return idx;
 }
 
 static MLX5E_DECLARE_STATS_GRP_OP_UPDATE_STATS(qos) { return; }
@@ -2308,33 +2342,35 @@ static MLX5E_DECLARE_STATS_GRP_OP_FILL_STATS(ptp)
        int i, tc;
 
        if (!priv->tx_ptp_opened && !priv->rx_ptp_opened)
-               return idx;
+               return;
 
        for (i = 0; i < NUM_PTP_CH_STATS; i++)
-               data[idx++] =
-                       MLX5E_READ_CTR64_CPU(&priv->ptp_stats.ch,
-                                            ptp_ch_stats_desc, i);
+               mlx5e_ethtool_put_stat(
+                       data, MLX5E_READ_CTR64_CPU(&priv->ptp_stats.ch,
+                                                  ptp_ch_stats_desc, i));
 
        if (priv->tx_ptp_opened) {
                for (tc = 0; tc < priv->max_opened_tc; tc++)
                        for (i = 0; i < NUM_PTP_SQ_STATS; i++)
-                               data[idx++] =
-                                       MLX5E_READ_CTR64_CPU(&priv->ptp_stats.sq[tc],
-                                                            ptp_sq_stats_desc, i);
+                               mlx5e_ethtool_put_stat(
+                                       data, MLX5E_READ_CTR64_CPU(
+                                                     &priv->ptp_stats.sq[tc],
+                                                     ptp_sq_stats_desc, i));
 
                for (tc = 0; tc < priv->max_opened_tc; tc++)
                        for (i = 0; i < NUM_PTP_CQ_STATS; i++)
-                               data[idx++] =
-                                       MLX5E_READ_CTR64_CPU(&priv->ptp_stats.cq[tc],
-                                                            ptp_cq_stats_desc, i);
+                               mlx5e_ethtool_put_stat(
+                                       data, MLX5E_READ_CTR64_CPU(
+                                                     &priv->ptp_stats.cq[tc],
+                                                     ptp_cq_stats_desc, i));
        }
        if (priv->rx_ptp_opened) {
                for (i = 0; i < NUM_PTP_RQ_STATS; i++)
-                       data[idx++] =
+                       mlx5e_ethtool_put_stat(
+                               data,
                                MLX5E_READ_CTR64_CPU(&priv->ptp_stats.rq,
-                                                    ptp_rq_stats_desc, i);
+                                                    ptp_rq_stats_desc, i));
        }
-       return idx;
 }
 
 static MLX5E_DECLARE_STATS_GRP_OP_UPDATE_STATS(ptp) { return; }
@@ -2393,44 +2429,50 @@ static MLX5E_DECLARE_STATS_GRP_OP_FILL_STATS(channels)
 
        for (i = 0; i < max_nch; i++)
                for (j = 0; j < NUM_CH_STATS; j++)
-                       data[idx++] =
-                               MLX5E_READ_CTR64_CPU(&priv->channel_stats[i]->ch,
-                                                    ch_stats_desc, j);
+                       mlx5e_ethtool_put_stat(
+                               data, MLX5E_READ_CTR64_CPU(
+                                             &priv->channel_stats[i]->ch,
+                                             ch_stats_desc, j));
 
        for (i = 0; i < max_nch; i++) {
                for (j = 0; j < NUM_RQ_STATS; j++)
-                       data[idx++] =
-                               MLX5E_READ_CTR64_CPU(&priv->channel_stats[i]->rq,
-                                                    rq_stats_desc, j);
+                       mlx5e_ethtool_put_stat(
+                               data, MLX5E_READ_CTR64_CPU(
+                                             &priv->channel_stats[i]->rq,
+                                             rq_stats_desc, j));
                for (j = 0; j < NUM_XSKRQ_STATS * is_xsk; j++)
-                       data[idx++] =
-                               MLX5E_READ_CTR64_CPU(&priv->channel_stats[i]->xskrq,
-                                                    xskrq_stats_desc, j);
+                       mlx5e_ethtool_put_stat(
+                               data, MLX5E_READ_CTR64_CPU(
+                                             &priv->channel_stats[i]->xskrq,
+                                             xskrq_stats_desc, j));
                for (j = 0; j < NUM_RQ_XDPSQ_STATS; j++)
-                       data[idx++] =
-                               MLX5E_READ_CTR64_CPU(&priv->channel_stats[i]->rq_xdpsq,
-                                                    rq_xdpsq_stats_desc, j);
+                       mlx5e_ethtool_put_stat(
+                               data, MLX5E_READ_CTR64_CPU(
+                                             &priv->channel_stats[i]->rq_xdpsq,
+                                             rq_xdpsq_stats_desc, j));
        }
 
        for (tc = 0; tc < priv->max_opened_tc; tc++)
                for (i = 0; i < max_nch; i++)
                        for (j = 0; j < NUM_SQ_STATS; j++)
-                               data[idx++] =
-                                       MLX5E_READ_CTR64_CPU(&priv->channel_stats[i]->sq[tc],
-                                                            sq_stats_desc, j);
+                               mlx5e_ethtool_put_stat(
+                                       data,
+                                       MLX5E_READ_CTR64_CPU(
+                                               &priv->channel_stats[i]->sq[tc],
+                                               sq_stats_desc, j));
 
        for (i = 0; i < max_nch; i++) {
                for (j = 0; j < NUM_XSKSQ_STATS * is_xsk; j++)
-                       data[idx++] =
-                               MLX5E_READ_CTR64_CPU(&priv->channel_stats[i]->xsksq,
-                                                    xsksq_stats_desc, j);
+                       mlx5e_ethtool_put_stat(
+                               data, MLX5E_READ_CTR64_CPU(
+                                             &priv->channel_stats[i]->xsksq,
+                                             xsksq_stats_desc, j));
                for (j = 0; j < NUM_XDPSQ_STATS; j++)
-                       data[idx++] =
-                               MLX5E_READ_CTR64_CPU(&priv->channel_stats[i]->xdpsq,
-                                                    xdpsq_stats_desc, j);
+                       mlx5e_ethtool_put_stat(
+                               data, MLX5E_READ_CTR64_CPU(
+                                             &priv->channel_stats[i]->xdpsq,
+                                             xdpsq_stats_desc, j));
        }
-
-       return idx;
 }
 
 static MLX5E_DECLARE_STATS_GRP_OP_UPDATE_STATS(channels) { return; }

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_stats.h b/drivers/net/ethernet/mellanox/mlx5/core/en_stats.h
index 0552b56ae4f44603ac55d18aeb0b9631db526c4a..b71e3fdf92c5fa206a86dcb85eeec1cdcba0f57a 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_stats.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_stats.h
@@ -72,10 +72,12 @@ struct mlx5e_stats_grp {
        u16 update_stats_mask;
        int (*get_num_stats)(struct mlx5e_priv *priv);
        void (*fill_strings)(struct mlx5e_priv *priv, u8 **data);
-       int (*fill_stats)(struct mlx5e_priv *priv, u64 *data, int idx);
+       void (*fill_stats)(struct mlx5e_priv *priv, u64 **data);
        void (*update_stats)(struct mlx5e_priv *priv);
 };
 
+void mlx5e_ethtool_put_stat(u64 **data, u64 val);
+
 typedef const struct mlx5e_stats_grp *const mlx5e_stats_grp_t;
 
 #define MLX5E_STATS_GRP_OP(grp, name) mlx5e_stats_grp_ ## grp ## _ ## name
@@ -90,7 +92,7 @@ typedef const struct mlx5e_stats_grp *const mlx5e_stats_grp_t;
        void MLX5E_STATS_GRP_OP(grp, fill_strings)(struct mlx5e_priv *priv, u8 **data)
 
 #define MLX5E_DECLARE_STATS_GRP_OP_FILL_STATS(grp) \
-       int MLX5E_STATS_GRP_OP(grp, fill_stats)(struct mlx5e_priv *priv, u64 *data, int idx)
+       void MLX5E_STATS_GRP_OP(grp, fill_stats)(struct mlx5e_priv *priv, u64 **data)
 
 #define MLX5E_STATS_GRP(grp) mlx5e_stats_grp_ ## grp