OSDN Git Service

net/mlx5: E-switch, Annotate termtbl_mutex mutex destroy
authorParav Pandit <parav@mellanox.com>
Sat, 14 Dec 2019 09:24:25 +0000 (03:24 -0600)
committerSaeed Mahameed <saeedm@mellanox.com>
Fri, 13 Mar 2020 23:26:19 +0000 (16:26 -0700)
Annotate mutex destroy to keep it symmetric to init sequence.
It should be destroyed after its users (representor netdevices) are
destroyed in below flow.

esw_offloads_disable()
  esw_offloads_unload_rep()

Hence, initialize the mutex before creating the representors which uses
it.

Reviewed-by: Roi Dayan <roid@mellanox.com>
Reviewed-by: Bodong Wang <bodong@mellanox.com>
Signed-off-by: Parav Pandit <parav@mellanox.com>
Reviewed-by: Mark Bloch <markb@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c

index 8ff52e2..5b05dec 100644 (file)
@@ -2332,6 +2332,7 @@ int esw_offloads_enable(struct mlx5_eswitch *esw)
        else
                esw->offloads.encap = DEVLINK_ESWITCH_ENCAP_MODE_NONE;
 
+       mutex_init(&esw->offloads.termtbl_mutex);
        mlx5_rdma_enable_roce(esw->dev);
        err = esw_offloads_steering_init(esw);
        if (err)
@@ -2355,7 +2356,6 @@ int esw_offloads_enable(struct mlx5_eswitch *esw)
                goto err_vports;
 
        esw_offloads_devcom_init(esw);
-       mutex_init(&esw->offloads.termtbl_mutex);
 
        return 0;
 
@@ -2367,6 +2367,7 @@ err_vport_metadata:
        esw_offloads_steering_cleanup(esw);
 err_steering_init:
        mlx5_rdma_disable_roce(esw->dev);
+       mutex_destroy(&esw->offloads.termtbl_mutex);
        return err;
 }
 
@@ -2397,6 +2398,7 @@ void esw_offloads_disable(struct mlx5_eswitch *esw)
        esw_set_passing_vport_metadata(esw, false);
        esw_offloads_steering_cleanup(esw);
        mlx5_rdma_disable_roce(esw->dev);
+       mutex_destroy(&esw->offloads.termtbl_mutex);
        esw->offloads.encap = DEVLINK_ESWITCH_ENCAP_MODE_NONE;
 }