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

Commit 6c63efe4 authored by Eran Ben Elisha's avatar Eran Ben Elisha Committed by Saeed Mahameed
Browse files

net/mlx5e: Remove redundant active_channels indication 



Now, when all channels stats are saved regardless of the channel's state
{open, closed}, we can safely remove this indication and the stats spin
lock which protects it.

Fixes: 76c3810bade3 ("net/mlx5e: Avoid reset netdev stats on configuration changes")
Signed-off-by: default avatarEran Ben Elisha <eranbe@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 8bfaf07f

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

+0 −2
Original line number Diff line number Diff line
@@ -777,8 +777,6 @@ struct mlx5e_priv { 
	struct mutex               state_lock; /* Protects Interface state */

	struct mlx5e_rq            drop_rq;



	rwlock_t                   stats_lock; /* Protects channels SW stats updates */

	bool                       channels_active;

	struct mlx5e_channels      channels;

	u32                        tisn[MLX5E_MAX_NUM_TC];

	struct mlx5e_rqt           indir_rqt;

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

+0 −7
Original line number Diff line number Diff line
@@ -2669,9 +2669,6 @@ void mlx5e_activate_priv_channels(struct mlx5e_priv *priv) 


	mlx5e_build_tx2sq_maps(priv);

	mlx5e_activate_channels(&priv->channels);

	write_lock(&priv->stats_lock);

	priv->channels_active = true;

	write_unlock(&priv->stats_lock);

	netif_tx_start_all_queues(priv->netdev);



	if (MLX5_VPORT_MANAGER(priv->mdev))
@@ -2693,9 +2690,6 @@ void mlx5e_deactivate_priv_channels(struct mlx5e_priv *priv) 
	 */

	netif_tx_stop_all_queues(priv->netdev);

	netif_tx_disable(priv->netdev);

	write_lock(&priv->stats_lock);

	priv->channels_active = false;

	write_unlock(&priv->stats_lock);

	mlx5e_deactivate_channels(&priv->channels);

}
@@ -4269,7 +4263,6 @@ static void mlx5e_build_nic_netdev_priv(struct mlx5_core_dev *mdev, 
			       profile->max_nch(mdev), netdev->mtu);



	mutex_init(&priv->state_lock);

	rwlock_init(&priv->stats_lock);



	INIT_WORK(&priv->update_carrier_work, mlx5e_update_carrier_work);

	INIT_WORK(&priv->set_rx_mode_work, mlx5e_set_rx_mode_work);

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

+0 −6
Original line number Diff line number Diff line
@@ -130,10 +130,6 @@ static void mlx5e_rep_update_sw_counters(struct mlx5e_priv *priv) 
	struct mlx5e_sq_stats *sq_stats;

	int i, j;



	read_lock(&priv->stats_lock);

	if (!priv->channels_active)

	        goto out;



	memset(s, 0, sizeof(*s));

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

		struct mlx5e_channel *c = priv->channels.c[i];
@@ -150,8 +146,6 @@ static void mlx5e_rep_update_sw_counters(struct mlx5e_priv *priv) 
			s->tx_bytes		+= sq_stats->bytes;

		}

	}

out:

	read_unlock(&priv->stats_lock);

}



static void mlx5e_rep_get_ethtool_stats(struct net_device *dev,

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

+0 −5
Original line number Diff line number Diff line
@@ -114,9 +114,6 @@ void mlx5e_grp_sw_update_stats(struct mlx5e_priv *priv) 
	int i;



	memset(s, 0, sizeof(*s));

	read_lock(&priv->stats_lock);

	if (!priv->channels_active)

		goto out;



	for (i = 0; i < priv->profile->max_nch(priv->mdev); i++) {

		struct mlx5e_channel_stats *channel_stats =
@@ -177,8 +174,6 @@ void mlx5e_grp_sw_update_stats(struct mlx5e_priv *priv) 
	}



	memcpy(&priv->stats.sw, s, sizeof(*s));

out:

	read_unlock(&priv->stats_lock);

}



static const struct counter_desc q_stats_desc[] = {