diff options
| author | Jiri Pirko <jiri@nvidia.com> | 2023-06-02 17:02:52 +0300 |
|---|---|---|
| committer | Saeed Mahameed <saeedm@nvidia.com> | 2023-09-20 09:33:07 +0300 |
| commit | a3cc822beacc7ccabc6966e75e721944818f37ff (patch) | |
| tree | 8ce7d1e8162cd4227f4ca672730955449d897135 /drivers/net/ethernet/mellanox/mlx5/core/sf | |
| parent | a65362f2be8daec046f371ada0e0f9f9cd8ed5dd (diff) | |
| download | linux-a3cc822beacc7ccabc6966e75e721944818f37ff.tar.xz | |
net/mlx5: Push common deletion code into mlx5_sf_del()
Don't call the same functions for SF deletion on multiple places.
Instead, introduce a helper mlx5_sf_del() and move the code there.
Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Reviewed-by: Shay Drory <shayd@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx5/core/sf')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/sf/devlink.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/sf/devlink.c b/drivers/net/ethernet/mellanox/mlx5/core/sf/devlink.c index 454185ef04f3..c8a043b2a8e0 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/sf/devlink.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/sf/devlink.c @@ -364,13 +364,20 @@ static void mlx5_sf_dealloc(struct mlx5_sf_table *table, struct mlx5_sf *sf) mutex_unlock(&table->sf_state_lock); } +static void mlx5_sf_del(struct mlx5_sf_table *table, struct mlx5_sf *sf) +{ + struct mlx5_eswitch *esw = table->dev->priv.eswitch; + + mlx5_eswitch_unload_sf_vport(esw, sf->hw_fn_id); + mlx5_sf_dealloc(table, sf); +} + int mlx5_devlink_sf_port_del(struct devlink *devlink, struct devlink_port *dl_port, struct netlink_ext_ack *extack) { struct mlx5_core_dev *dev = devlink_priv(devlink); struct mlx5_sf *sf = mlx5_sf_by_dl_port(dl_port); - struct mlx5_eswitch *esw = dev->priv.eswitch; struct mlx5_sf_table *table; table = mlx5_sf_table_try_get(dev); @@ -380,8 +387,7 @@ int mlx5_devlink_sf_port_del(struct devlink *devlink, return -EOPNOTSUPP; } - mlx5_eswitch_unload_sf_vport(esw, sf->hw_fn_id); - mlx5_sf_dealloc(table, sf); + mlx5_sf_del(table, sf); mlx5_sf_table_put(table); return 0; } @@ -439,17 +445,14 @@ static void mlx5_sf_table_enable(struct mlx5_sf_table *table) static void mlx5_sf_del_all(struct mlx5_sf_table *table) { - struct mlx5_eswitch *esw = table->dev->priv.eswitch; unsigned long index; struct mlx5_sf *sf; /* At this point, no new user commands can start and no vhca event can * arrive. It is safe to destroy all user created SFs. */ - xa_for_each(&table->function_ids, index, sf) { - mlx5_eswitch_unload_sf_vport(esw, sf->hw_fn_id); - mlx5_sf_dealloc(table, sf); - } + xa_for_each(&table->function_ids, index, sf) + mlx5_sf_del(table, sf); } static void mlx5_sf_table_disable(struct mlx5_sf_table *table) |