net/mlx5: E-Switch, fix deadlock between devlink lock and esw->wq

mlx5_eswitch_cleanup() calls destroy_workqueue() while holding the
devlink lock through mlx5_uninit_one(). E-Switch workqueue workers also
need the devlink lock, but previously took it before checking whether
their work item was stale. This can deadlock when cleanup waits for a
worker that is blocked on the same devlink lock.

Mode changes have the same ordering hazard: the mode-change path holds
devlink lock while tearing down the current mode, and old work may still
be pending on the E-Switch workqueue.

Fix this by making esw_wq_handler() check the generation counter before
attempting to take devlink lock. The worker uses devl_trylock(); if the
lock is busy and the work is still current, it sleeps on an E-Switch wait
queue with a short timeout. Invalidation increments the generation
counter and wakes the wait queue, so stale workers exit without spinning
or blocking cleanup.

Invalidate work at the earliest safe operation boundary. Cleanup
invalidates before destroy_workqueue(), and QoS cleanup runs after the
workqueue is destroyed. Mode teardown unregisters the work-producing
notifiers first, then invalidates the queue before tearing down
FDB/QoS/rate-node state. This prevents new notifier work from capturing
the new generation while still making old work stale before expensive
teardown starts.

mlx5_devlink_eswitch_mode_set() now relies on
mlx5_eswitch_disable_locked() for the mode-change invalidation instead
of incrementing the generation after disable. mlx5_eswitch_disable()
gets the same coverage. SR-IOV enable/disable paths invalidate before VF
state changes so work against the old VF count or mode is discarded.

Remove the conditional generation increment in
mlx5_eswitch_event_handler_unregister(); mlx5_eswitch_disable_locked()
now handles it unconditionally after the relevant notifiers are
unregistered.

Signed-off-by: Mark Bloch <mbloch@nvidia.com>
Reviewed-by: Cosmin Ratiu <cratiu@nvidia.com>
Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
Link: https://patch.msgid.link/20260428051018.219093-4-tariqt@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
index 1986d4d0e886b84d8607e5b92dc3a0d66cebbd1c..8ec52498be3f1404109a0678040a45080aeb1f87 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
@@ -1070,13 +1070,17 @@ static void mlx5_eswitch_event_handler_register(struct mlx5_eswitch *esw)
        }
 }
 
+static void mlx5_eswitch_invalidate_wq(struct mlx5_eswitch *esw)
+{
+       atomic_inc(&esw->generation);
+       wake_up_all(&esw->work_queue_wait);
+}
+
 static void mlx5_eswitch_event_handler_unregister(struct mlx5_eswitch *esw)
 {
        if (esw->mode == MLX5_ESWITCH_OFFLOADS &&
-           mlx5_eswitch_is_funcs_handler(esw->dev)) {
+           mlx5_eswitch_is_funcs_handler(esw->dev))
                mlx5_eq_notifier_unregister(esw->dev, &esw->esw_funcs.nb);
-               atomic_inc(&esw->generation);
-       }
 }
 
 static void mlx5_eswitch_clear_vf_vports_info(struct mlx5_eswitch *esw)
@@ -1701,6 +1705,8 @@ int mlx5_eswitch_enable(struct mlx5_eswitch *esw, int num_vfs)
        if (toggle_lag)
                mlx5_lag_disable_change(esw->dev);
 
+       mlx5_eswitch_invalidate_wq(esw);
+
        if (!mlx5_esw_is_fdb_created(esw)) {
                ret = mlx5_eswitch_enable_locked(esw, num_vfs);
        } else {
@@ -1746,6 +1752,8 @@ void mlx5_eswitch_disable_sriov(struct mlx5_eswitch *esw, bool clear_vf)
                 esw->mode == MLX5_ESWITCH_LEGACY ? "LEGACY" : "OFFLOADS",
                 esw->esw_funcs.num_vfs, esw->esw_funcs.num_ec_vfs, esw->enabled_vports);
 
+       mlx5_eswitch_invalidate_wq(esw);
+
        if (!mlx5_core_is_ecpf(esw->dev)) {
                mlx5_eswitch_unload_vf_vports(esw, esw->esw_funcs.num_vfs);
                if (clear_vf)
@@ -1785,6 +1793,7 @@ void mlx5_eswitch_disable_locked(struct mlx5_eswitch *esw)
 
        mlx5_eq_notifier_unregister(esw->dev, &esw->nb);
        mlx5_eswitch_event_handler_unregister(esw);
+       mlx5_eswitch_invalidate_wq(esw);
 
        esw_info(esw->dev, "Disable: mode(%s), nvfs(%d), necvfs(%d), active vports(%d)\n",
                 esw->mode == MLX5_ESWITCH_LEGACY ? "LEGACY" : "OFFLOADS",
@@ -2072,6 +2081,7 @@ int mlx5_eswitch_init(struct mlx5_core_dev *dev)
        mutex_init(&esw->state_lock);
        init_rwsem(&esw->mode_lock);
        refcount_set(&esw->qos.refcnt, 0);
+       init_waitqueue_head(&esw->work_queue_wait);
        atomic_set(&esw->generation, 0);
 
        esw->enabled_vports = 0;
@@ -2110,8 +2120,9 @@ void mlx5_eswitch_cleanup(struct mlx5_eswitch *esw)
 
        esw_info(esw->dev, "cleanup\n");
 
-       mlx5_esw_qos_cleanup(esw);
+       mlx5_eswitch_invalidate_wq(esw);
        destroy_workqueue(esw->work_queue);
+       mlx5_esw_qos_cleanup(esw);
        WARN_ON(refcount_read(&esw->qos.refcnt));
        mutex_destroy(&esw->state_lock);
        WARN_ON(!xa_empty(&esw->offloads.vhca_map));

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
index e3ab8a30c174663b44f1b8b3d7971c02c025f97f..8f4c47975c58ff471e200cdc989a0541a2d1fbab 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
@@ -36,6 +36,7 @@
 #include <linux/if_ether.h>
 #include <linux/if_link.h>
 #include <linux/atomic.h>
+#include <linux/wait.h>
 #include <linux/xarray.h>
 #include <net/devlink.h>
 #include <linux/mlx5/device.h>
@@ -385,6 +386,7 @@ struct mlx5_eswitch {
         */
        struct rw_semaphore mode_lock;
        atomic64_t user_count;
+       wait_queue_head_t work_queue_wait;
 
        /* Protected with the E-Switch qos domain lock. */
        struct {

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
index 23af5a12dc0765c5b433c088b9f077477b5a3b02..9e2ae217c224779f521ebd939c2cac4d0d6a90b2 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
@@ -3694,21 +3694,38 @@ static void esw_wq_handler(struct work_struct *work)
        struct mlx5_host_work *host_work;
        struct mlx5_eswitch *esw;
        struct devlink *devlink;
+       int work_gen;
 
        host_work = container_of(work, struct mlx5_host_work, work);
        esw = host_work->esw;
+       work_gen = host_work->work_gen;
        devlink = priv_to_devlink(esw->dev);
 
-       devl_lock(devlink);
+       /* Do not block on devlink lock until stale work is filtered out.
+        * Teardown can invalidate the generation and then wait for this
+        * workqueue while holding devlink lock.
+        */
+       for (;;) {
+               if (work_gen != atomic_read(&esw->generation))
+                       goto free;
+
+               if (devl_trylock(devlink))
+                       break;
+
+               wait_event_timeout(esw->work_queue_wait,
+                                  work_gen != atomic_read(&esw->generation),
+                                  msecs_to_jiffies(60));
+       }
 
        /* Stale work from one or more mode changes ago. Bail out. */
-       if (host_work->work_gen != atomic_read(&esw->generation))
+       if (work_gen != atomic_read(&esw->generation))
                goto unlock;
 
        host_work->func(esw);
 
 unlock:
        devl_unlock(devlink);
+free:
        kfree(host_work);
 }