Commit 27ea84ab authored by Gal Pressman's avatar Gal Pressman Committed by Jakub Kicinski
Browse files

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: default avatarGal Pressman <gal@nvidia.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://lore.kernel.org/r/20240402133043.56322-5-tariqt@nvidia.com


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

drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_stats.c

+9 −8
Original line number Diff line number Diff line
@@ -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);

drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls.h

+2 −5
Original line number Diff line number Diff line
@@ -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__ */

drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_stats.c

+7 −8
Original line number Diff line number Diff line
@@ -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));

}

drivers/net/ethernet/mellanox/mlx5/core/en_accel/macsec_stats.c

+6 −7
Original line number Diff line number Diff line
@@ -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);

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

+10 −8
Original line number Diff line number Diff line
@@ -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)