net/mlx5e: Switch physical statistical counters to use stats group API (2e4df0b2) · Commits · 戴 / test

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

+0 −8

Original line number	Diff line number	Diff line
		@@ -216,10 +216,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);

		for (i = 0; i < NUM_PPORT_PHY_STATISTICAL_COUNTERS(priv); i++)
		strcpy(data + (idx++) * ETH_GSTRING_LEN,
		pport_phy_statistical_stats_desc[i].format);

		for (i = 0; i < NUM_PPORT_ETH_EXT_COUNTERS(priv); i++)
		strcpy(data + (idx++) * ETH_GSTRING_LEN,
		pport_eth_ext_stats_desc[i].format);
		@@ -336,10 +332,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);

		for (i = 0; i < NUM_PPORT_PHY_STATISTICAL_COUNTERS(priv); i++)
		data[idx++] = MLX5E_READ_CTR64_BE(&priv->stats.pport.phy_statistical_counters,
		pport_phy_statistical_stats_desc, i);

		for (i = 0; i < NUM_PPORT_ETH_EXT_COUNTERS(priv); i++)
		data[idx++] = MLX5E_READ_CTR64_BE(&priv->stats.pport.eth_ext_counters,
		pport_eth_ext_stats_desc, i);

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

+45 −0

Original line number	Diff line number	Diff line
		@@ -333,6 +333,46 @@ static int mlx5e_grp_2819_fill_stats(struct mlx5e_priv priv, u64 data,
		return idx;
		}

		#define PPORT_PHY_STATISTICAL_OFF(c) \
		MLX5_BYTE_OFF(ppcnt_reg, \
		counter_set.phys_layer_statistical_cntrs.c##_high)
		static const struct counter_desc pport_phy_statistical_stats_desc[] = {
		{ "rx_pcs_symbol_err_phy", PPORT_PHY_STATISTICAL_OFF(phy_symbol_errors) },
		{ "rx_corrected_bits_phy", PPORT_PHY_STATISTICAL_OFF(phy_corrected_bits) },
		};

		#define NUM_PPORT_PHY_COUNTERS ARRAY_SIZE(pport_phy_statistical_stats_desc)

		static int mlx5e_grp_phy_get_num_stats(struct mlx5e_priv *priv)
		{
		return MLX5_CAP_PCAM_FEATURE((priv)->mdev, ppcnt_statistical_group) ?
		NUM_PPORT_PHY_COUNTERS : 0;
		}

		static int mlx5e_grp_phy_fill_strings(struct mlx5e_priv priv, u8 data,
		int idx)
		{
		int i;

		if (MLX5_CAP_PCAM_FEATURE((priv)->mdev, ppcnt_statistical_group))
		for (i = 0; i < NUM_PPORT_PHY_COUNTERS; i++)
		strcpy(data + (idx++) * ETH_GSTRING_LEN,
		pport_phy_statistical_stats_desc[i].format);
		return idx;
		}

		static int mlx5e_grp_phy_fill_stats(struct mlx5e_priv priv, u64 data, int idx)
		{
		int i;

		if (MLX5_CAP_PCAM_FEATURE((priv)->mdev, ppcnt_statistical_group))
		for (i = 0; i < NUM_PPORT_PHY_COUNTERS; i++)
		data[idx++] =
		MLX5E_READ_CTR64_BE(&priv->stats.pport.phy_statistical_counters,
		pport_phy_statistical_stats_desc, i);
		return idx;
		}

		const struct mlx5e_stats_grp mlx5e_stats_grps[] = {
		{
		.get_num_stats = mlx5e_grp_sw_get_num_stats,
		@@ -364,6 +404,11 @@ const struct mlx5e_stats_grp mlx5e_stats_grps[] = {
		.fill_strings = mlx5e_grp_2819_fill_strings,
		.fill_stats = mlx5e_grp_2819_fill_stats,
		},
		{
		.get_num_stats = mlx5e_grp_phy_get_num_stats,
		.fill_strings = mlx5e_grp_phy_fill_strings,
		.fill_stats = mlx5e_grp_phy_fill_stats,
		},
		};

		const int mlx5e_num_stats_grps = ARRAY_SIZE(mlx5e_stats_grps);

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

+1 −13

Original line number	Diff line number	Diff line
		@@ -111,9 +111,6 @@ struct mlx5e_vport_stats {
		#define PPORT_2819_GET(pstats, c) \
		MLX5_GET64(ppcnt_reg, pstats->RFC_2819_counters, \
		counter_set.eth_2819_cntrs_grp_data_layout.c##_high)
		#define PPORT_PHY_STATISTICAL_OFF(c) \
		MLX5_BYTE_OFF(ppcnt_reg, \
		counter_set.phys_layer_statistical_cntrs.c##_high)
		#define PPORT_PHY_STATISTICAL_GET(pstats, c) \
		MLX5_GET64(ppcnt_reg, (pstats)->phy_statistical_counters, \
		counter_set.phys_layer_statistical_cntrs.c##_high)
		@@ -141,11 +138,6 @@ struct mlx5e_pport_stats {
		__be64 eth_ext_counters[MLX5_ST_SZ_QW(ppcnt_reg)];
		};

		static const struct counter_desc pport_phy_statistical_stats_desc[] = {
		{ "rx_pcs_symbol_err_phy", PPORT_PHY_STATISTICAL_OFF(phy_symbol_errors) },
		{ "rx_corrected_bits_phy", PPORT_PHY_STATISTICAL_OFF(phy_corrected_bits) },
		};

		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) },
		@@ -284,9 +276,6 @@ static const struct counter_desc sq_stats_desc[] = {
		{ MLX5E_DECLARE_TX_STAT(struct mlx5e_sq_stats, xmit_more) },
		};

		#define NUM_PPORT_PHY_STATISTICAL_COUNTERS(priv) \
		(ARRAY_SIZE(pport_phy_statistical_stats_desc) * \
		MLX5_CAP_PCAM_FEATURE((priv)->mdev, ppcnt_statistical_group))
		#define NUM_PCIE_PERF_COUNTERS(priv) \
		(ARRAY_SIZE(pcie_perf_stats_desc) * \
		MLX5_CAP_MCAM_FEATURE((priv)->mdev, pcie_performance_group))
		@@ -303,8 +292,7 @@ static const struct counter_desc sq_stats_desc[] = {
		#define NUM_PPORT_ETH_EXT_COUNTERS(priv) \
		(ARRAY_SIZE(pport_eth_ext_stats_desc) * \
		MLX5_CAP_PCAM_FEATURE((priv)->mdev, rx_buffer_fullness_counters))
		#define NUM_PPORT_COUNTERS(priv) (NUM_PPORT_PHY_STATISTICAL_COUNTERS(priv) + \
		NUM_PPORT_PER_PRIO_TRAFFIC_COUNTERS * \
		#define NUM_PPORT_COUNTERS(priv) (NUM_PPORT_PER_PRIO_TRAFFIC_COUNTERS * \
		NUM_PPORT_PRIO + \
		NUM_PPORT_ETH_EXT_COUNTERS(priv))
		#define NUM_PCIE_COUNTERS(priv) (NUM_PCIE_PERF_COUNTERS(priv) + \

Admin message