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

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

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



Switch the channels 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 e185d43f

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

+3 −44
Original line number Original line Diff line number Diff line
@@ -135,10 +135,6 @@ void mlx5e_build_ptys2ethtool_map(void) 
				       ETHTOOL_LINK_MODE_50000baseKR2_Full_BIT);

				       ETHTOOL_LINK_MODE_50000baseKR2_Full_BIT);

}

}





#define MLX5E_NUM_RQ_STATS(priv) (NUM_RQ_STATS * (priv)->channels.num)

#define MLX5E_NUM_SQ_STATS(priv) \

	(NUM_SQ_STATS * (priv)->channels.num * (priv)->channels.params.num_tc)



int mlx5e_ethtool_get_sset_count(struct mlx5e_priv *priv, int sset)

int mlx5e_ethtool_get_sset_count(struct mlx5e_priv *priv, int sset)

{

{

	int i, num_stats = 0;

	int i, num_stats = 0;
@@ -147,10 +143,7 @@ int mlx5e_ethtool_get_sset_count(struct mlx5e_priv *priv, int sset) 
	case ETH_SS_STATS:

	case ETH_SS_STATS:

		for (i = 0; i < mlx5e_num_stats_grps; i++)

		for (i = 0; i < mlx5e_num_stats_grps; i++)

			num_stats += mlx5e_stats_grps[i].get_num_stats(priv);

			num_stats += mlx5e_stats_grps[i].get_num_stats(priv);

		return num_stats +

		return num_stats;

		       MLX5E_NUM_RQ_STATS(priv) +

		       MLX5E_NUM_SQ_STATS(priv);



	case ETH_SS_PRIV_FLAGS:

	case ETH_SS_PRIV_FLAGS:

		return ARRAY_SIZE(mlx5e_priv_flags);

		return ARRAY_SIZE(mlx5e_priv_flags);

	case ETH_SS_TEST:

	case ETH_SS_TEST:
@@ -170,26 +163,10 @@ static int mlx5e_get_sset_count(struct net_device *dev, int sset) 




static void mlx5e_fill_stats_strings(struct mlx5e_priv *priv, u8 *data)

static void mlx5e_fill_stats_strings(struct mlx5e_priv *priv, u8 *data)

{

{

	int i, j, tc, idx = 0;

	int i, idx = 0;





	for (i = 0; i < mlx5e_num_stats_grps; i++)

	for (i = 0; i < mlx5e_num_stats_grps; i++)

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

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



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

		return;



	/* per channel counters */

	for (i = 0; i < priv->channels.num; i++)

		for (j = 0; j < NUM_RQ_STATS; j++)

			sprintf(data + (idx++) * ETH_GSTRING_LEN,

				rq_stats_desc[j].format, i);



	for (tc = 0; tc < priv->channels.params.num_tc; tc++)

		for (i = 0; i < priv->channels.num; i++)

			for (j = 0; j < NUM_SQ_STATS; j++)

				sprintf(data + (idx++) * ETH_GSTRING_LEN,

					sq_stats_desc[j].format,

					priv->channel_tc2txq[i][tc]);

}

}





void mlx5e_ethtool_get_strings(struct mlx5e_priv *priv, u32 stringset, u8 *data)

void mlx5e_ethtool_get_strings(struct mlx5e_priv *priv, u32 stringset, u8 *data)
@@ -224,8 +201,7 @@ static void mlx5e_get_strings(struct net_device *dev, u32 stringset, u8 *data) 
void mlx5e_ethtool_get_ethtool_stats(struct mlx5e_priv *priv,

void mlx5e_ethtool_get_ethtool_stats(struct mlx5e_priv *priv,

				     struct ethtool_stats *stats, u64 *data)

				     struct ethtool_stats *stats, u64 *data)

{

{

	struct mlx5e_channels *channels;

	int i, idx = 0;

	int i, j, tc, idx = 0;





	if (!data)

	if (!data)

		return;

		return;
@@ -233,27 +209,10 @@ void mlx5e_ethtool_get_ethtool_stats(struct mlx5e_priv *priv, 
	mutex_lock(&priv->state_lock);

	mutex_lock(&priv->state_lock);

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

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

		mlx5e_update_stats(priv, true);

		mlx5e_update_stats(priv, true);

	channels = &priv->channels;

	mutex_unlock(&priv->state_lock);

	mutex_unlock(&priv->state_lock);





	for (i = 0; i < mlx5e_num_stats_grps; i++)

	for (i = 0; i < mlx5e_num_stats_grps; i++)

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

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



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

		return;



	/* per channel counters */

	for (i = 0; i < channels->num; i++)

		for (j = 0; j < NUM_RQ_STATS; j++)

			data[idx++] =

			       MLX5E_READ_CTR64_CPU(&channels->c[i]->rq.stats,

						    rq_stats_desc, j);



	for (tc = 0; tc < priv->channels.params.num_tc; tc++)

		for (i = 0; i < channels->num; i++)

			for (j = 0; j < NUM_SQ_STATS; j++)

				data[idx++] = MLX5E_READ_CTR64_CPU(&channels->c[i]->sq[tc].stats,

								   sq_stats_desc, j);

}

}





static void mlx5e_get_ethtool_stats(struct net_device *dev,

static void mlx5e_get_ethtool_stats(struct net_device *dev,

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

+103 −0
Original line number Original line Diff line number Diff line
@@ -721,6 +721,104 @@ static int mlx5e_grp_ipsec_fill_stats(struct mlx5e_priv *priv, u64 *data, 
	return idx + mlx5e_ipsec_get_stats(priv, data + idx);

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

}

}





static const struct counter_desc rq_stats_desc[] = {

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, packets) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, bytes) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, csum_complete) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, csum_unnecessary) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, csum_unnecessary_inner) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, csum_none) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, xdp_drop) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, xdp_tx) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, xdp_tx_full) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, lro_packets) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, lro_bytes) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, wqe_err) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, mpwqe_filler) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, buff_alloc_err) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, cqe_compress_blks) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, cqe_compress_pkts) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, page_reuse) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, cache_reuse) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, cache_full) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, cache_empty) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, cache_busy) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, cache_waive) },

};



static const struct counter_desc sq_stats_desc[] = {

	{ MLX5E_DECLARE_TX_STAT(struct mlx5e_sq_stats, packets) },

	{ MLX5E_DECLARE_TX_STAT(struct mlx5e_sq_stats, bytes) },

	{ MLX5E_DECLARE_TX_STAT(struct mlx5e_sq_stats, tso_packets) },

	{ MLX5E_DECLARE_TX_STAT(struct mlx5e_sq_stats, tso_bytes) },

	{ MLX5E_DECLARE_TX_STAT(struct mlx5e_sq_stats, tso_inner_packets) },

	{ MLX5E_DECLARE_TX_STAT(struct mlx5e_sq_stats, tso_inner_bytes) },

	{ MLX5E_DECLARE_TX_STAT(struct mlx5e_sq_stats, csum_partial) },

	{ MLX5E_DECLARE_TX_STAT(struct mlx5e_sq_stats, csum_partial_inner) },

	{ MLX5E_DECLARE_TX_STAT(struct mlx5e_sq_stats, nop) },

	{ MLX5E_DECLARE_TX_STAT(struct mlx5e_sq_stats, csum_none) },

	{ MLX5E_DECLARE_TX_STAT(struct mlx5e_sq_stats, stopped) },

	{ MLX5E_DECLARE_TX_STAT(struct mlx5e_sq_stats, wake) },

	{ MLX5E_DECLARE_TX_STAT(struct mlx5e_sq_stats, dropped) },

	{ MLX5E_DECLARE_TX_STAT(struct mlx5e_sq_stats, xmit_more) },

};



#define NUM_RQ_STATS			ARRAY_SIZE(rq_stats_desc)

#define NUM_SQ_STATS			ARRAY_SIZE(sq_stats_desc)



static int mlx5e_grp_channels_get_num_stats(struct mlx5e_priv *priv)

{

	return (NUM_RQ_STATS * priv->channels.num) +

		(NUM_SQ_STATS * priv->channels.num * priv->channels.params.num_tc);

}



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

					   int idx)

{

	int i, j, tc;



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

		return idx;



	for (i = 0; i < priv->channels.num; i++)

		for (j = 0; j < NUM_RQ_STATS; j++)

			sprintf(data + (idx++) * ETH_GSTRING_LEN, rq_stats_desc[j].format, i);



	for (tc = 0; tc < priv->channels.params.num_tc; tc++)

		for (i = 0; i < priv->channels.num; i++)

			for (j = 0; j < NUM_SQ_STATS; j++)

				sprintf(data + (idx++) * ETH_GSTRING_LEN,

					sq_stats_desc[j].format,

					priv->channel_tc2txq[i][tc]);



	return idx;

}



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

					 int idx)

{

	struct mlx5e_channels *channels = &priv->channels;

	int i, j, tc;



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

		return idx;



	for (i = 0; i < channels->num; i++)

		for (j = 0; j < NUM_RQ_STATS; j++)

			data[idx++] =

				MLX5E_READ_CTR64_CPU(&channels->c[i]->rq.stats,

						     rq_stats_desc, j);



	for (tc = 0; tc < priv->channels.params.num_tc; tc++)

		for (i = 0; i < channels->num; i++)

			for (j = 0; j < NUM_SQ_STATS; j++)

				data[idx++] =

					MLX5E_READ_CTR64_CPU(&channels->c[i]->sq[tc].stats,

							     sq_stats_desc, j);



	return idx;

}



const struct mlx5e_stats_grp mlx5e_stats_grps[] = {

const struct mlx5e_stats_grp mlx5e_stats_grps[] = {

	{

	{

		.get_num_stats = mlx5e_grp_sw_get_num_stats,

		.get_num_stats = mlx5e_grp_sw_get_num_stats,
@@ -787,6 +885,11 @@ const struct mlx5e_stats_grp mlx5e_stats_grps[] = { 
		.fill_strings = mlx5e_grp_ipsec_fill_strings,

		.fill_strings = mlx5e_grp_ipsec_fill_strings,

		.fill_stats = mlx5e_grp_ipsec_fill_stats,

		.fill_stats = mlx5e_grp_ipsec_fill_stats,

	},

	},

	{

		.get_num_stats = mlx5e_grp_channels_get_num_stats,

		.fill_strings = mlx5e_grp_channels_fill_strings,

		.fill_stats = mlx5e_grp_channels_fill_stats,

	}

};

};





const int mlx5e_num_stats_grps = ARRAY_SIZE(mlx5e_stats_grps);
 
const int mlx5e_num_stats_grps = ARRAY_SIZE(mlx5e_stats_grps);

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

+0 −45
Original line number Original line Diff line number Diff line
@@ -169,31 +169,6 @@ struct mlx5e_rq_stats { 
	u64 cache_waive;

	u64 cache_waive;

};

};





static const struct counter_desc rq_stats_desc[] = {

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, packets) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, bytes) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, csum_complete) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, csum_unnecessary) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, csum_unnecessary_inner) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, csum_none) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, xdp_drop) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, xdp_tx) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, xdp_tx_full) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, lro_packets) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, lro_bytes) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, wqe_err) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, mpwqe_filler) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, buff_alloc_err) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, cqe_compress_blks) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, cqe_compress_pkts) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, page_reuse) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, cache_reuse) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, cache_full) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, cache_empty) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, cache_busy) },

	{ MLX5E_DECLARE_RX_STAT(struct mlx5e_rq_stats, cache_waive) },

};



struct mlx5e_sq_stats {

struct mlx5e_sq_stats {

	/* commonly accessed in data path */

	/* commonly accessed in data path */

	u64 packets;

	u64 packets;
@@ -213,26 +188,6 @@ struct mlx5e_sq_stats { 
	u64 dropped;

	u64 dropped;

};

};





static const struct counter_desc sq_stats_desc[] = {

	{ MLX5E_DECLARE_TX_STAT(struct mlx5e_sq_stats, packets) },

	{ MLX5E_DECLARE_TX_STAT(struct mlx5e_sq_stats, bytes) },

	{ MLX5E_DECLARE_TX_STAT(struct mlx5e_sq_stats, tso_packets) },

	{ MLX5E_DECLARE_TX_STAT(struct mlx5e_sq_stats, tso_bytes) },

	{ MLX5E_DECLARE_TX_STAT(struct mlx5e_sq_stats, tso_inner_packets) },

	{ MLX5E_DECLARE_TX_STAT(struct mlx5e_sq_stats, tso_inner_bytes) },

	{ MLX5E_DECLARE_TX_STAT(struct mlx5e_sq_stats, csum_partial) },

	{ MLX5E_DECLARE_TX_STAT(struct mlx5e_sq_stats, csum_partial_inner) },

	{ MLX5E_DECLARE_TX_STAT(struct mlx5e_sq_stats, nop) },

	{ MLX5E_DECLARE_TX_STAT(struct mlx5e_sq_stats, csum_none) },

	{ MLX5E_DECLARE_TX_STAT(struct mlx5e_sq_stats, stopped) },

	{ MLX5E_DECLARE_TX_STAT(struct mlx5e_sq_stats, wake) },

	{ MLX5E_DECLARE_TX_STAT(struct mlx5e_sq_stats, dropped) },

	{ MLX5E_DECLARE_TX_STAT(struct mlx5e_sq_stats, xmit_more) },

};



#define NUM_RQ_STATS			ARRAY_SIZE(rq_stats_desc)

#define NUM_SQ_STATS			ARRAY_SIZE(sq_stats_desc)



struct mlx5e_stats {

struct mlx5e_stats {

	struct mlx5e_sw_stats sw;

	struct mlx5e_sw_stats sw;

	struct mlx5e_qcounter_stats qcnt;

	struct mlx5e_qcounter_stats qcnt;