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

net/mlx5e: Switch per prio pfc counters to use stats group API 



Switch the per prio pfc 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 e6000651

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

+2 −71
Original line number Diff line number Diff line
@@ -136,42 +136,9 @@ void mlx5e_build_ptys2ethtool_map(void) 
				       ETHTOOL_LINK_MODE_50000baseKR2_Full_BIT);

}



static unsigned long mlx5e_query_pfc_combined(struct mlx5e_priv *priv)

{

	struct mlx5_core_dev *mdev = priv->mdev;

	u8 pfc_en_tx;

	u8 pfc_en_rx;

	int err;



	if (MLX5_CAP_GEN(mdev, port_type) != MLX5_CAP_PORT_TYPE_ETH)

		return 0;



	err = mlx5_query_port_pfc(mdev, &pfc_en_tx, &pfc_en_rx);



	return err ? 0 : pfc_en_tx | pfc_en_rx;

}



static bool mlx5e_query_global_pause_combined(struct mlx5e_priv *priv)

{

	struct mlx5_core_dev *mdev = priv->mdev;

	u32 rx_pause;

	u32 tx_pause;

	int err;



	if (MLX5_CAP_GEN(mdev, port_type) != MLX5_CAP_PORT_TYPE_ETH)

		return false;



	err = mlx5_query_port_pause(mdev, &rx_pause, &tx_pause);



	return err ? false : rx_pause | tx_pause;

}



#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)

#define MLX5E_NUM_PFC_COUNTERS(priv) \

	((mlx5e_query_global_pause_combined(priv) + hweight8(mlx5e_query_pfc_combined(priv))) * \

	  NUM_PPORT_PER_PRIO_PFC_COUNTERS)



int mlx5e_ethtool_get_sset_count(struct mlx5e_priv *priv, int sset)

{
@@ -184,7 +151,6 @@ int mlx5e_ethtool_get_sset_count(struct mlx5e_priv *priv, int sset) 
		return num_stats +

		       MLX5E_NUM_RQ_STATS(priv) +

		       MLX5E_NUM_SQ_STATS(priv) +

		       MLX5E_NUM_PFC_COUNTERS(priv) +

		       ARRAY_SIZE(mlx5e_pme_status_desc) +

		       ARRAY_SIZE(mlx5e_pme_error_desc) +

		       mlx5e_ipsec_get_count(priv);
@@ -208,30 +174,11 @@ static int mlx5e_get_sset_count(struct net_device *dev, int sset) 


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

{

	int i, j, tc, prio, idx = 0;

	unsigned long pfc_combined;

	int i, j, tc, idx = 0;



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

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



	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++) {

			char pfc_string[ETH_GSTRING_LEN];



			snprintf(pfc_string, sizeof(pfc_string), "prio%d", prio);

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

				pport_per_prio_pfc_stats_desc[i].format, pfc_string);

		}

	}



	if (mlx5e_query_global_pause_combined(priv)) {

		for (i = 0; i < NUM_PPORT_PER_PRIO_PFC_COUNTERS; i++) {

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

				pport_per_prio_pfc_stats_desc[i].format, "global");

		}

	}



	/* port module event counters */

	for (i = 0; i < ARRAY_SIZE(mlx5e_pme_status_desc); i++)

		strcpy(data + (idx++) * ETH_GSTRING_LEN, mlx5e_pme_status_desc[i].format);
@@ -293,8 +240,7 @@ void mlx5e_ethtool_get_ethtool_stats(struct mlx5e_priv *priv, 
{

	struct mlx5e_channels *channels;

	struct mlx5_priv *mlx5_priv;

	int i, j, tc, prio, idx = 0;

	unsigned long pfc_combined;

	int i, j, tc, idx = 0;



	if (!data)

		return;
@@ -308,21 +254,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);



	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);

		}

	}



	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);

		}

	}



	/* port module event counters */

	mlx5_priv =  &priv->mdev->priv;

	for (i = 0; i < ARRAY_SIZE(mlx5e_pme_status_desc); i++)

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

+111 −0
Original line number Diff line number Diff line
@@ -502,6 +502,9 @@ static int mlx5e_grp_pcie_fill_stats(struct mlx5e_priv *priv, u64 *data, 
	return idx;

}



#define PPORT_PER_PRIO_OFF(c) \

	MLX5_BYTE_OFF(ppcnt_reg, \

		      counter_set.eth_per_prio_grp_data_layout.c##_high)

static const struct counter_desc pport_per_prio_traffic_stats_desc[] = {

	{ "rx_prio%d_bytes", PPORT_PER_PRIO_OFF(rx_octets) },

	{ "rx_prio%d_packets", PPORT_PER_PRIO_OFF(rx_frames) },
@@ -547,6 +550,109 @@ static int mlx5e_grp_per_prio_traffic_fill_stats(struct mlx5e_priv *priv, 
	return idx;

}



static const struct counter_desc pport_per_prio_pfc_stats_desc[] = {

	/* %s is "global" or "prio{i}" */

	{ "rx_%s_pause", PPORT_PER_PRIO_OFF(rx_pause) },

	{ "rx_%s_pause_duration", PPORT_PER_PRIO_OFF(rx_pause_duration) },

	{ "tx_%s_pause", PPORT_PER_PRIO_OFF(tx_pause) },

	{ "tx_%s_pause_duration", PPORT_PER_PRIO_OFF(tx_pause_duration) },

	{ "rx_%s_pause_transition", PPORT_PER_PRIO_OFF(rx_pause_transition) },

};



#define NUM_PPORT_PER_PRIO_PFC_COUNTERS		ARRAY_SIZE(pport_per_prio_pfc_stats_desc)



static unsigned long mlx5e_query_pfc_combined(struct mlx5e_priv *priv)

{

	struct mlx5_core_dev *mdev = priv->mdev;

	u8 pfc_en_tx;

	u8 pfc_en_rx;

	int err;



	if (MLX5_CAP_GEN(mdev, port_type) != MLX5_CAP_PORT_TYPE_ETH)

		return 0;



	err = mlx5_query_port_pfc(mdev, &pfc_en_tx, &pfc_en_rx);



	return err ? 0 : pfc_en_tx | pfc_en_rx;

}



static bool mlx5e_query_global_pause_combined(struct mlx5e_priv *priv)

{

	struct mlx5_core_dev *mdev = priv->mdev;

	u32 rx_pause;

	u32 tx_pause;

	int err;



	if (MLX5_CAP_GEN(mdev, port_type) != MLX5_CAP_PORT_TYPE_ETH)

		return false;



	err = mlx5_query_port_pause(mdev, &rx_pause, &tx_pause);



	return err ? false : rx_pause | tx_pause;

}



static int mlx5e_grp_per_prio_pfc_get_num_stats(struct mlx5e_priv *priv)

{

	return (mlx5e_query_global_pause_combined(priv) +

		hweight8(mlx5e_query_pfc_combined(priv))) *

		NUM_PPORT_PER_PRIO_PFC_COUNTERS;

}



static int mlx5e_grp_per_prio_pfc_fill_strings(struct mlx5e_priv *priv,

					       u8 *data,

					       int idx)

{

	unsigned long pfc_combined;

	int i, prio;



	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++) {

			char pfc_string[ETH_GSTRING_LEN];



			snprintf(pfc_string, sizeof(pfc_string), "prio%d", prio);

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

				pport_per_prio_pfc_stats_desc[i].format, pfc_string);

		}

	}



	if (mlx5e_query_global_pause_combined(priv)) {

		for (i = 0; i < NUM_PPORT_PER_PRIO_PFC_COUNTERS; i++) {

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

				pport_per_prio_pfc_stats_desc[i].format, "global");

		}

	}



	return idx;

}



static int mlx5e_grp_per_prio_pfc_fill_stats(struct mlx5e_priv *priv,

					     u64 *data,

					     int idx)

{

	unsigned long pfc_combined;

	int i, prio;



	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);

		}

	}



	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);

		}

	}



	return idx;

}



const struct mlx5e_stats_grp mlx5e_stats_grps[] = {

	{

		.get_num_stats = mlx5e_grp_sw_get_num_stats,
@@ -598,6 +704,11 @@ const struct mlx5e_stats_grp mlx5e_stats_grps[] = { 
		.fill_strings = mlx5e_grp_per_prio_traffic_fill_strings,

		.fill_stats = mlx5e_grp_per_prio_traffic_fill_stats,

	},

	{

		.get_num_stats = mlx5e_grp_per_prio_pfc_get_num_stats,

		.fill_strings = mlx5e_grp_per_prio_pfc_fill_strings,

		.fill_stats = mlx5e_grp_per_prio_pfc_fill_stats,

	},

};



const int mlx5e_num_stats_grps = ARRAY_SIZE(mlx5e_stats_grps);

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

+0 −14
Original line number Diff line number Diff line
@@ -114,9 +114,6 @@ struct mlx5e_vport_stats { 
#define PPORT_PHY_STATISTICAL_GET(pstats, c) \

	MLX5_GET64(ppcnt_reg, (pstats)->phy_statistical_counters, \

		   counter_set.phys_layer_statistical_cntrs.c##_high)

#define PPORT_PER_PRIO_OFF(c) \

	MLX5_BYTE_OFF(ppcnt_reg, \

		      counter_set.eth_per_prio_grp_data_layout.c##_high)

#define PPORT_PER_PRIO_GET(pstats, prio, c) \

	MLX5_GET64(ppcnt_reg, pstats->per_prio_counters[prio], \

		   counter_set.eth_per_prio_grp_data_layout.c##_high)
@@ -135,15 +132,6 @@ struct mlx5e_pport_stats { 
	__be64 eth_ext_counters[MLX5_ST_SZ_QW(ppcnt_reg)];

};



static const struct counter_desc pport_per_prio_pfc_stats_desc[] = {

	/* %s is "global" or "prio{i}" */

	{ "rx_%s_pause", PPORT_PER_PRIO_OFF(rx_pause) },

	{ "rx_%s_pause_duration", PPORT_PER_PRIO_OFF(rx_pause_duration) },

	{ "tx_%s_pause", PPORT_PER_PRIO_OFF(tx_pause) },

	{ "tx_%s_pause_duration", PPORT_PER_PRIO_OFF(tx_pause_duration) },

	{ "rx_%s_pause_transition", PPORT_PER_PRIO_OFF(rx_pause_transition) },

};



#define PCIE_PERF_GET(pcie_stats, c) \

	MLX5_GET(mpcnt_reg, (pcie_stats)->pcie_perf_counters, \

		 counter_set.pcie_perf_cntrs_grp_data_layout.c)
@@ -242,8 +230,6 @@ static const struct counter_desc sq_stats_desc[] = { 
	{ MLX5E_DECLARE_TX_STAT(struct mlx5e_sq_stats, xmit_more) },

};



#define NUM_PPORT_PER_PRIO_PFC_COUNTERS \

	ARRAY_SIZE(pport_per_prio_pfc_stats_desc)

#define NUM_RQ_STATS			ARRAY_SIZE(rq_stats_desc)

#define NUM_SQ_STATS			ARRAY_SIZE(sq_stats_desc)

CRA Git | Maintained and supported by SUSTech CRA and CCSE