Commit 2a303f13 authored by Saeed Mahameed's avatar Saeed Mahameed
Browse files

net/mlx5e: IPoIB, use separate stats groups 



Don't copy all of the stats groups used for mlx5e ethernet NIC profile,
have a separate stats groups for IPoIB with the set of the needed stats
only.

Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent f0ff8e8c

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

+13 −13
Original line number Diff line number Diff line
@@ -1700,19 +1700,19 @@ static MLX5E_DECLARE_STATS_GRP_OP_FILL_STATS(channels) 


static MLX5E_DECLARE_STATS_GRP_OP_UPDATE_STATS(channels) { return; }



static MLX5E_DEFINE_STATS_GRP(sw, 0);

static MLX5E_DEFINE_STATS_GRP(qcnt, MLX5E_NDO_UPDATE_STATS);

static MLX5E_DEFINE_STATS_GRP(vnic_env, 0);

static MLX5E_DEFINE_STATS_GRP(vport, MLX5E_NDO_UPDATE_STATS);

static MLX5E_DEFINE_STATS_GRP(802_3, MLX5E_NDO_UPDATE_STATS);

static MLX5E_DEFINE_STATS_GRP(2863, 0);

static MLX5E_DEFINE_STATS_GRP(2819, 0);

static MLX5E_DEFINE_STATS_GRP(phy, 0);

static MLX5E_DEFINE_STATS_GRP(pcie, 0);

static MLX5E_DEFINE_STATS_GRP(per_prio, 0);

static MLX5E_DEFINE_STATS_GRP(pme, 0);

static MLX5E_DEFINE_STATS_GRP(channels, 0);

static MLX5E_DEFINE_STATS_GRP(per_port_buff_congest, 0);

MLX5E_DEFINE_STATS_GRP(sw, 0);

MLX5E_DEFINE_STATS_GRP(qcnt, MLX5E_NDO_UPDATE_STATS);

MLX5E_DEFINE_STATS_GRP(vnic_env, 0);

MLX5E_DEFINE_STATS_GRP(vport, MLX5E_NDO_UPDATE_STATS);

MLX5E_DEFINE_STATS_GRP(802_3, MLX5E_NDO_UPDATE_STATS);

MLX5E_DEFINE_STATS_GRP(2863, 0);

MLX5E_DEFINE_STATS_GRP(2819, 0);

MLX5E_DEFINE_STATS_GRP(phy, 0);

MLX5E_DEFINE_STATS_GRP(pcie, 0);

MLX5E_DEFINE_STATS_GRP(per_prio, 0);

MLX5E_DEFINE_STATS_GRP(pme, 0);

MLX5E_DEFINE_STATS_GRP(channels, 0);

MLX5E_DEFINE_STATS_GRP(per_port_buff_congest, 0);

static MLX5E_DEFINE_STATS_GRP(eth_ext, 0);

static MLX5E_DEFINE_STATS_GRP(ipsec, 0);

static MLX5E_DEFINE_STATS_GRP(tls, 0);

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

+14 −0
Original line number Diff line number Diff line
@@ -378,4 +378,18 @@ unsigned int mlx5e_nic_stats_grps_num(struct mlx5e_priv *priv); 


MLX5E_DECLARE_STATS_GRP_OP_UPDATE_STATS(802_3);



extern MLX5E_DECLARE_STATS_GRP(sw);

extern MLX5E_DECLARE_STATS_GRP(qcnt);

extern MLX5E_DECLARE_STATS_GRP(vnic_env);

extern MLX5E_DECLARE_STATS_GRP(vport);

extern MLX5E_DECLARE_STATS_GRP(802_3);

extern MLX5E_DECLARE_STATS_GRP(2863);

extern MLX5E_DECLARE_STATS_GRP(2819);

extern MLX5E_DECLARE_STATS_GRP(phy);

extern MLX5E_DECLARE_STATS_GRP(pcie);

extern MLX5E_DECLARE_STATS_GRP(per_prio);

extern MLX5E_DECLARE_STATS_GRP(pme);

extern MLX5E_DECLARE_STATS_GRP(channels);

extern MLX5E_DECLARE_STATS_GRP(per_port_buff_congest);



#endif /* __MLX5_EN_STATS_H__ */

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

+24 −2
Original line number Diff line number Diff line
@@ -419,6 +419,28 @@ static void mlx5i_cleanup_rx(struct mlx5e_priv *priv) 
	mlx5e_destroy_q_counters(priv);

}



/* The stats groups order is opposite to the update_stats() order calls */

static mlx5e_stats_grp_t mlx5i_stats_grps[] = {

	&MLX5E_STATS_GRP(sw),

	&MLX5E_STATS_GRP(qcnt),

	&MLX5E_STATS_GRP(vnic_env),

	&MLX5E_STATS_GRP(vport),

	&MLX5E_STATS_GRP(802_3),

	&MLX5E_STATS_GRP(2863),

	&MLX5E_STATS_GRP(2819),

	&MLX5E_STATS_GRP(phy),

	&MLX5E_STATS_GRP(pcie),

	&MLX5E_STATS_GRP(per_prio),

	&MLX5E_STATS_GRP(pme),

	&MLX5E_STATS_GRP(channels),

	&MLX5E_STATS_GRP(per_port_buff_congest),

};



static unsigned int mlx5i_stats_grps_num(struct mlx5e_priv *priv)

{

	return ARRAY_SIZE(mlx5i_stats_grps);

}



static const struct mlx5e_profile mlx5i_nic_profile = {

	.init		   = mlx5i_init,

	.cleanup	   = mlx5i_cleanup,
@@ -435,8 +457,8 @@ static const struct mlx5e_profile mlx5i_nic_profile = { 
	.rx_handlers.handle_rx_cqe_mpwqe = NULL, /* Not supported */

	.max_tc		   = MLX5I_MAX_NUM_TC,

	.rq_groups	   = MLX5E_NUM_RQ_GROUPS(REGULAR),

	.stats_grps        = mlx5e_nic_stats_grps,

	.stats_grps_num    = mlx5e_nic_stats_grps_num,

	.stats_grps        = mlx5i_stats_grps,

	.stats_grps_num    = mlx5i_stats_grps_num,

};



/* mlx5i netdev NDos */

CRA Git | Maintained and supported by SUSTech CRA and CCSE