net/mlx5e: Remove redundant active_channels indication
authorEran Ben Elisha <eranbe@mellanox.com>
Tue, 29 May 2018 08:06:31 +0000 (11:06 +0300)
committerSaeed Mahameed <saeedm@mellanox.com>
Fri, 1 Jun 2018 23:48:14 +0000 (16:48 -0700)
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: Eran Ben Elisha <eranbe@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
drivers/net/ethernet/mellanox/mlx5/core/en.h
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
drivers/net/ethernet/mellanox/mlx5/core/en_stats.c

index 1c04df043e07178edd7f454965e55d0a6ec67cf4..372cdf8a496c88ff771bdd9b661f158c2ba2dc0e 100644 (file)
@@ -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;
index adc55de6d4f445da9ca67e93e446fd7d76bc94c7..dd119bad102d8d8bdef7609b1d92056bcd8c0b6d 100644 (file)
@@ -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);
index de6364125f0f369d08e7f283f41d8589570048cf..1fb4835eac72424a24163a3395e25ef7bc8a02c3 100644 (file)
@@ -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,
index 3b2aed43f660f3626d36cf51ddcde0e51aa30f75..697dc7397ba22af794acefe7a098ec6f003ec056 100644 (file)
@@ -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[] = {