Commit b521105b authored by Alaa Hleihel's avatar Alaa Hleihel Committed by Saeed Mahameed
Browse files

net/mlx5e: Fix using wrong stats_grps in mlx5e_update_ndo_stats() 



The cited commit started to reuse function mlx5e_update_ndo_stats() for
the representors as well.
However, the function is hard-coded to work on mlx5e_nic_stats_grps only.
Due to this issue, the representors statistics were not updated in the
output of "ip -s".

Fix it to work with the correct group by extracting it from the caller's
profile.

Also, while at it and since this function became generic, move it to
en_stats.c and rename it accordingly.

Fixes: 8a236b15 ("net/mlx5e: Convert rep stats to mlx5e_stats_grp-based infra")
Signed-off-by: default avatarAlaa Hleihel <alaa@nvidia.com>
Reviewed-by: default avatarVlad Buslov <vladbu@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 47c97e6b

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

+0 −1
Original line number Diff line number Diff line
@@ -1005,7 +1005,6 @@ int mlx5e_update_nic_rx(struct mlx5e_priv *priv); 
void mlx5e_update_carrier(struct mlx5e_priv *priv);

int mlx5e_close(struct net_device *netdev);

int mlx5e_open(struct net_device *netdev);

void mlx5e_update_ndo_stats(struct mlx5e_priv *priv);



void mlx5e_queue_update_stats(struct mlx5e_priv *priv);

int mlx5e_bits_invert(unsigned long a, int size);

drivers/net/ethernet/mellanox/mlx5/core/en/monitor_stats.c

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static void mlx5e_monitor_counters_work(struct work_struct *work) 
					       monitor_counters_work);



	mutex_lock(&priv->state_lock);

	mlx5e_update_ndo_stats(priv);

	mlx5e_stats_update_ndo_stats(priv);

	mutex_unlock(&priv->state_lock);

	mlx5e_monitor_counter_arm(priv);

}

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

+1 −11
Original line number Diff line number Diff line
@@ -158,16 +158,6 @@ static void mlx5e_update_carrier_work(struct work_struct *work) 
	mutex_unlock(&priv->state_lock);

}



void mlx5e_update_ndo_stats(struct mlx5e_priv *priv)

{

	int i;



	for (i = mlx5e_nic_stats_grps_num(priv) - 1; i >= 0; i--)

		if (mlx5e_nic_stats_grps[i]->update_stats_mask &

		    MLX5E_NDO_UPDATE_STATS)

			mlx5e_nic_stats_grps[i]->update_stats(priv);

}



static void mlx5e_update_stats_work(struct work_struct *work)

{

	struct mlx5e_priv *priv = container_of(work, struct mlx5e_priv,
@@ -5187,7 +5177,7 @@ static const struct mlx5e_profile mlx5e_nic_profile = { 
	.enable		   = mlx5e_nic_enable,

	.disable	   = mlx5e_nic_disable,

	.update_rx	   = mlx5e_update_nic_rx,

	.update_stats	   = mlx5e_update_ndo_stats,

	.update_stats	   = mlx5e_stats_update_ndo_stats,

	.update_carrier	   = mlx5e_update_carrier,

	.rx_handlers       = &mlx5e_rx_handlers_nic,

	.max_tc		   = MLX5E_MAX_NUM_TC,

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

+2 −2
Original line number Diff line number Diff line
@@ -1171,7 +1171,7 @@ static const struct mlx5e_profile mlx5e_rep_profile = { 
	.cleanup_tx		= mlx5e_cleanup_rep_tx,

	.enable		        = mlx5e_rep_enable,

	.update_rx		= mlx5e_update_rep_rx,

	.update_stats           = mlx5e_update_ndo_stats,

	.update_stats           = mlx5e_stats_update_ndo_stats,

	.rx_handlers            = &mlx5e_rx_handlers_rep,

	.max_tc			= 1,

	.rq_groups		= MLX5E_NUM_RQ_GROUPS(REGULAR),
@@ -1189,7 +1189,7 @@ static const struct mlx5e_profile mlx5e_uplink_rep_profile = { 
	.enable		        = mlx5e_uplink_rep_enable,

	.disable	        = mlx5e_uplink_rep_disable,

	.update_rx		= mlx5e_update_rep_rx,

	.update_stats           = mlx5e_update_ndo_stats,

	.update_stats           = mlx5e_stats_update_ndo_stats,

	.update_carrier	        = mlx5e_update_carrier,

	.rx_handlers            = &mlx5e_rx_handlers_rep,

	.max_tc			= MLX5E_MAX_NUM_TC,

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

+12 −0
Original line number Diff line number Diff line
@@ -54,6 +54,18 @@ unsigned int mlx5e_stats_total_num(struct mlx5e_priv *priv) 
	return total;

}



void mlx5e_stats_update_ndo_stats(struct mlx5e_priv *priv)

{

	mlx5e_stats_grp_t *stats_grps = priv->profile->stats_grps;

	const unsigned int num_stats_grps = stats_grps_num(priv);

	int i;



	for (i = num_stats_grps - 1; i >= 0; i--)

		if (stats_grps[i]->update_stats &&

		    stats_grps[i]->update_stats_mask & MLX5E_NDO_UPDATE_STATS)

			stats_grps[i]->update_stats(priv);

}



void mlx5e_stats_update(struct mlx5e_priv *priv)

{

	mlx5e_stats_grp_t *stats_grps = priv->profile->stats_grps;

CRA Git | Maintained and supported by SUSTech CRA and CCSE