net/mlx5: Call mlx5_sf_id_erase() once in mlx5_sf_dealloc()

[ Upstream commit 2597ee190b4eb48d3b7d35b7bb2cc18046ae087e ]

Before every call of mlx5_sf_dealloc(), there is a call to
mlx5_sf_id_erase(). So move it to the beginning of mlx5_sf_dealloc().
Also remove redundant mlx5_sf_id_erase() call from mlx5_sf_free()
as it is called only from mlx5_sf_dealloc().

Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Reviewed-by: Shay Drory <shayd@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
Stable-dep-of: 26e42ec7712d ("net/mlx5: Nack sync reset when SFs are present")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/sf/devlink.c b/drivers/net/ethernet/mellanox/mlx5/core/sf/devlink.c
index e34a8f88c518c123a6a74926a3e42b6ad59b549e..1dd01701df20eee085c1a16df736f252eb58be95 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/sf/devlink.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/sf/devlink.c
@@ -111,7 +111,6 @@ id_err:
 
 static void mlx5_sf_free(struct mlx5_sf_table *table, struct mlx5_sf *sf)
 {
-       mlx5_sf_id_erase(table, sf);
        mlx5_sf_hw_table_sf_free(table->dev, sf->controller, sf->id);
        trace_mlx5_sf_free(table->dev, sf->port_index, sf->controller, sf->hw_fn_id);
        kfree(sf);
@@ -361,6 +360,8 @@ int mlx5_devlink_sf_port_new(struct devlink *devlink,
 
 static void mlx5_sf_dealloc(struct mlx5_sf_table *table, struct mlx5_sf *sf)
 {
+       mlx5_sf_id_erase(table, sf);
+
        if (sf->hw_state == MLX5_VHCA_STATE_ALLOCATED) {
                mlx5_sf_free(table, sf);
        } else if (mlx5_sf_is_active(sf)) {
@@ -401,7 +402,6 @@ int mlx5_devlink_sf_port_del(struct devlink *devlink,
        }
 
        mlx5_eswitch_unload_sf_vport(esw, sf->hw_fn_id);
-       mlx5_sf_id_erase(table, sf);
 
        mutex_lock(&table->sf_state_lock);
        mlx5_sf_dealloc(table, sf);
@@ -473,7 +473,6 @@ static void mlx5_sf_deactivate_all(struct mlx5_sf_table *table)
         */
        xa_for_each(&table->port_indices, index, sf) {
                mlx5_eswitch_unload_sf_vport(esw, sf->hw_fn_id);
-               mlx5_sf_id_erase(table, sf);
                mlx5_sf_dealloc(table, sf);
        }
 }