net/mlx4_en: Avoid scheduling restart task if it is already running

[ Upstream commit fed91613c9dd455dd154b22fa8e11b8526466082 ]

Add restarting state flag to avoid scheduling another restart task while
such task is already running. Change task name from watchdog_task to
restart_task to better fit the task role.

Fixes: 1e338db56e5a ("mlx4_en: Fix a race at restart task")
Signed-off-by: Moshe Shemesh <moshe@mellanox.com>
Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
index 0fb85d71c11b57a62224041012f2cf91e10dffcf..0fcb3fa95f0a8c3dc105713f28ac3d79b6fe5ff3 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
+++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c
@@ -1389,8 +1389,10 @@ static void mlx4_en_tx_timeout(struct net_device *dev)
        }
 
        priv->port_stats.tx_timeout++;
-       en_dbg(DRV, priv, "Scheduling watchdog\n");
-       queue_work(mdev->workqueue, &priv->watchdog_task);
+       if (!test_and_set_bit(MLX4_EN_STATE_FLAG_RESTARTING, &priv->state)) {
+               en_dbg(DRV, priv, "Scheduling port restart\n");
+               queue_work(mdev->workqueue, &priv->restart_task);
+       }
 }
 
 
@@ -1839,6 +1841,7 @@ int mlx4_en_start_port(struct net_device *dev)
                local_bh_enable();
        }
 
+       clear_bit(MLX4_EN_STATE_FLAG_RESTARTING, &priv->state);
        netif_tx_start_all_queues(dev);
        netif_device_attach(dev);
 
@@ -2009,7 +2012,7 @@ void mlx4_en_stop_port(struct net_device *dev, int detach)
 static void mlx4_en_restart(struct work_struct *work)
 {
        struct mlx4_en_priv *priv = container_of(work, struct mlx4_en_priv,
-                                                watchdog_task);
+                                                restart_task);
        struct mlx4_en_dev *mdev = priv->mdev;
        struct net_device *dev = priv->dev;
 
@@ -2388,7 +2391,7 @@ static int mlx4_en_change_mtu(struct net_device *dev, int new_mtu)
        if (netif_running(dev)) {
                mutex_lock(&mdev->state_lock);
                if (!mdev->device_up) {
-                       /* NIC is probably restarting - let watchdog task reset
+                       /* NIC is probably restarting - let restart task reset
                         * the port */
                        en_dbg(DRV, priv, "Change MTU called with card down!?\n");
                } else {
@@ -2397,7 +2400,9 @@ static int mlx4_en_change_mtu(struct net_device *dev, int new_mtu)
                        if (err) {
                                en_err(priv, "Failed restarting port:%d\n",
                                         priv->port);
-                               queue_work(mdev->workqueue, &priv->watchdog_task);
+                               if (!test_and_set_bit(MLX4_EN_STATE_FLAG_RESTARTING,
+                                                     &priv->state))
+                                       queue_work(mdev->workqueue, &priv->restart_task);
                        }
                }
                mutex_unlock(&mdev->state_lock);
@@ -2883,7 +2888,8 @@ static int mlx4_xdp_set(struct net_device *dev, struct bpf_prog *prog)
                if (err) {
                        en_err(priv, "Failed starting port %d for XDP change\n",
                               priv->port);
-                       queue_work(mdev->workqueue, &priv->watchdog_task);
+                       if (!test_and_set_bit(MLX4_EN_STATE_FLAG_RESTARTING, &priv->state))
+                               queue_work(mdev->workqueue, &priv->restart_task);
                }
        }
 
@@ -3284,7 +3290,7 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
        priv->counter_index = MLX4_SINK_COUNTER_INDEX(mdev->dev);
        spin_lock_init(&priv->stats_lock);
        INIT_WORK(&priv->rx_mode_task, mlx4_en_do_set_rx_mode);
-       INIT_WORK(&priv->watchdog_task, mlx4_en_restart);
+       INIT_WORK(&priv->restart_task, mlx4_en_restart);
        INIT_WORK(&priv->linkstate_task, mlx4_en_linkstate);
        INIT_DELAYED_WORK(&priv->stats_task, mlx4_en_do_get_stats);
        INIT_DELAYED_WORK(&priv->service_task, mlx4_en_service_task);

diff --git a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
index bdd87438a354ff0a2c0a10724e8602d69ce9330c..baec2313bf35272195e296a1c51098c0a3f62697 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
+++ b/drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
@@ -525,6 +525,10 @@ struct mlx4_en_stats_bitmap {
        struct mutex mutex; /* for mutual access to stats bitmap */
 };
 
+enum {
+       MLX4_EN_STATE_FLAG_RESTARTING,
+};
+
 struct mlx4_en_priv {
        struct mlx4_en_dev *mdev;
        struct mlx4_en_port_profile *prof;
@@ -590,7 +594,7 @@ struct mlx4_en_priv {
        struct mlx4_en_cq *rx_cq[MAX_RX_RINGS];
        struct mlx4_qp drop_qp;
        struct work_struct rx_mode_task;
-       struct work_struct watchdog_task;
+       struct work_struct restart_task;
        struct work_struct linkstate_task;
        struct delayed_work stats_task;
        struct delayed_work service_task;
@@ -637,6 +641,7 @@ struct mlx4_en_priv {
        u32 pflags;
        u8 rss_key[MLX4_EN_RSS_KEY_SIZE];
        u8 rss_hash_fn;
+       unsigned long state;
 };
 
 enum mlx4_en_wol {