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

Commit e185d43f authored by Kamal Heib's avatar Kamal Heib Committed by Saeed Mahameed
Browse files

net/mlx5e: Switch ipsec counters to use stats group API 



Switch the ipsec counters to use the new stats group API.

Signed-off-by: default avatarKamal Heib <kamalh@mellanox.com>
Reviewed-by: default avatarGal Pressman <galp@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 0e6f01a4

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

+1 −9
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
 */



#include "en.h"

#include "en_accel/ipsec.h"



void mlx5e_ethtool_get_drvinfo(struct mlx5e_priv *priv,

			       struct ethtool_drvinfo *drvinfo)
@@ -150,8 +149,7 @@ int mlx5e_ethtool_get_sset_count(struct mlx5e_priv *priv, int sset) 
			num_stats += mlx5e_stats_grps[i].get_num_stats(priv);

		return num_stats +

		       MLX5E_NUM_RQ_STATS(priv) +

		       MLX5E_NUM_SQ_STATS(priv) +

		       mlx5e_ipsec_get_count(priv);

		       MLX5E_NUM_SQ_STATS(priv);



	case ETH_SS_PRIV_FLAGS:

		return ARRAY_SIZE(mlx5e_priv_flags);
@@ -177,9 +175,6 @@ static void mlx5e_fill_stats_strings(struct mlx5e_priv *priv, u8 *data) 
	for (i = 0; i < mlx5e_num_stats_grps; i++)

		idx = mlx5e_stats_grps[i].fill_strings(priv, data, idx);



	/* IPSec counters */

	idx += mlx5e_ipsec_get_strings(priv, data + idx * ETH_GSTRING_LEN);



	if (!test_bit(MLX5E_STATE_OPENED, &priv->state))

		return;
@@ -244,9 +239,6 @@ void mlx5e_ethtool_get_ethtool_stats(struct mlx5e_priv *priv, 
	for (i = 0; i < mlx5e_num_stats_grps; i++)

		idx = mlx5e_stats_grps[i].fill_stats(priv, data, idx);



	/* IPSec counters */

	idx += mlx5e_ipsec_get_stats(priv, data + idx);



	if (!test_bit(MLX5E_STATE_OPENED, &priv->state))

		return;

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

+24 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
 */



#include "en.h"

#include "en_accel/ipsec.h"



static const struct counter_desc sw_stats_desc[] = {

	{ MLX5E_DECLARE_STAT(struct mlx5e_sw_stats, rx_packets) },
@@ -702,6 +703,24 @@ static int mlx5e_grp_pme_fill_stats(struct mlx5e_priv *priv, u64 *data, 
	return idx;

}



static int mlx5e_grp_ipsec_get_num_stats(struct mlx5e_priv *priv)

{

	return mlx5e_ipsec_get_count(priv);

}



static int mlx5e_grp_ipsec_fill_strings(struct mlx5e_priv *priv, u8 *data,

					int idx)

{

	return idx + mlx5e_ipsec_get_strings(priv,

					     data + idx * ETH_GSTRING_LEN);

}



static int mlx5e_grp_ipsec_fill_stats(struct mlx5e_priv *priv, u64 *data,

				      int idx)

{

	return idx + mlx5e_ipsec_get_stats(priv, data + idx);

}



const struct mlx5e_stats_grp mlx5e_stats_grps[] = {

	{

		.get_num_stats = mlx5e_grp_sw_get_num_stats,
@@ -763,6 +782,11 @@ const struct mlx5e_stats_grp mlx5e_stats_grps[] = { 
		.fill_strings = mlx5e_grp_pme_fill_strings,

		.fill_stats = mlx5e_grp_pme_fill_stats,

	},

	{

		.get_num_stats = mlx5e_grp_ipsec_get_num_stats,

		.fill_strings = mlx5e_grp_ipsec_fill_strings,

		.fill_stats = mlx5e_grp_ipsec_fill_stats,

	},

};



const int mlx5e_num_stats_grps = ARRAY_SIZE(mlx5e_stats_grps);