Commit 1f5d6476 authored by Dragos Tatulea's avatar Dragos Tatulea Committed by Michael S. Tsirkin

vdpa/mlx5: Clarify meaning thorough function rename

setup_driver()/teardown_driver() are a bit vague. These functions are
used for virtqueue resources.

Same for alloc_resources()/teardown_resources(): they represent fixed
resources that are meant to exist during the device lifetime.
Reviewed-by: default avatarCosmin Ratiu <cratiu@nvidia.com>
Acked-by: default avatarEugenio Pérez <eperezma@redhat.com>
Signed-off-by: default avatarDragos Tatulea <dtatulea@nvidia.com>
Message-Id: <20240626-stage-vdpa-vq-precreate-v2-1-560c491078df@nvidia.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 106e4df1
...@@ -144,10 +144,10 @@ static bool is_index_valid(struct mlx5_vdpa_dev *mvdev, u16 idx) ...@@ -144,10 +144,10 @@ static bool is_index_valid(struct mlx5_vdpa_dev *mvdev, u16 idx)
return idx <= mvdev->max_idx; return idx <= mvdev->max_idx;
} }
static void free_resources(struct mlx5_vdpa_net *ndev); static void free_fixed_resources(struct mlx5_vdpa_net *ndev);
static void init_mvqs(struct mlx5_vdpa_net *ndev); static void init_mvqs(struct mlx5_vdpa_net *ndev);
static int setup_driver(struct mlx5_vdpa_dev *mvdev); static int setup_vq_resources(struct mlx5_vdpa_dev *mvdev);
static void teardown_driver(struct mlx5_vdpa_net *ndev); static void teardown_vq_resources(struct mlx5_vdpa_net *ndev);
static bool mlx5_vdpa_debug; static bool mlx5_vdpa_debug;
...@@ -2848,7 +2848,7 @@ static int mlx5_vdpa_change_map(struct mlx5_vdpa_dev *mvdev, ...@@ -2848,7 +2848,7 @@ static int mlx5_vdpa_change_map(struct mlx5_vdpa_dev *mvdev,
if (err) if (err)
return err; return err;
teardown_driver(ndev); teardown_vq_resources(ndev);
} }
mlx5_vdpa_update_mr(mvdev, new_mr, asid); mlx5_vdpa_update_mr(mvdev, new_mr, asid);
...@@ -2862,7 +2862,7 @@ static int mlx5_vdpa_change_map(struct mlx5_vdpa_dev *mvdev, ...@@ -2862,7 +2862,7 @@ static int mlx5_vdpa_change_map(struct mlx5_vdpa_dev *mvdev,
if (teardown) { if (teardown) {
restore_channels_info(ndev); restore_channels_info(ndev);
err = setup_driver(mvdev); err = setup_vq_resources(mvdev);
if (err) if (err)
return err; return err;
} }
...@@ -2873,7 +2873,7 @@ static int mlx5_vdpa_change_map(struct mlx5_vdpa_dev *mvdev, ...@@ -2873,7 +2873,7 @@ static int mlx5_vdpa_change_map(struct mlx5_vdpa_dev *mvdev,
} }
/* reslock must be held for this function */ /* reslock must be held for this function */
static int setup_driver(struct mlx5_vdpa_dev *mvdev) static int setup_vq_resources(struct mlx5_vdpa_dev *mvdev)
{ {
struct mlx5_vdpa_net *ndev = to_mlx5_vdpa_ndev(mvdev); struct mlx5_vdpa_net *ndev = to_mlx5_vdpa_ndev(mvdev);
int err; int err;
...@@ -2931,7 +2931,7 @@ static int setup_driver(struct mlx5_vdpa_dev *mvdev) ...@@ -2931,7 +2931,7 @@ static int setup_driver(struct mlx5_vdpa_dev *mvdev)
} }
/* reslock must be held for this function */ /* reslock must be held for this function */
static void teardown_driver(struct mlx5_vdpa_net *ndev) static void teardown_vq_resources(struct mlx5_vdpa_net *ndev)
{ {
WARN_ON(!rwsem_is_locked(&ndev->reslock)); WARN_ON(!rwsem_is_locked(&ndev->reslock));
...@@ -2997,7 +2997,7 @@ static void mlx5_vdpa_set_status(struct vdpa_device *vdev, u8 status) ...@@ -2997,7 +2997,7 @@ static void mlx5_vdpa_set_status(struct vdpa_device *vdev, u8 status)
goto err_setup; goto err_setup;
} }
register_link_notifier(ndev); register_link_notifier(ndev);
err = setup_driver(mvdev); err = setup_vq_resources(mvdev);
if (err) { if (err) {
mlx5_vdpa_warn(mvdev, "failed to setup driver\n"); mlx5_vdpa_warn(mvdev, "failed to setup driver\n");
goto err_driver; goto err_driver;
...@@ -3040,7 +3040,7 @@ static int mlx5_vdpa_compat_reset(struct vdpa_device *vdev, u32 flags) ...@@ -3040,7 +3040,7 @@ static int mlx5_vdpa_compat_reset(struct vdpa_device *vdev, u32 flags)
down_write(&ndev->reslock); down_write(&ndev->reslock);
unregister_link_notifier(ndev); unregister_link_notifier(ndev);
teardown_driver(ndev); teardown_vq_resources(ndev);
clear_vqs_ready(ndev); clear_vqs_ready(ndev);
if (flags & VDPA_RESET_F_CLEAN_MAP) if (flags & VDPA_RESET_F_CLEAN_MAP)
mlx5_vdpa_destroy_mr_resources(&ndev->mvdev); mlx5_vdpa_destroy_mr_resources(&ndev->mvdev);
...@@ -3197,7 +3197,7 @@ static void mlx5_vdpa_free(struct vdpa_device *vdev) ...@@ -3197,7 +3197,7 @@ static void mlx5_vdpa_free(struct vdpa_device *vdev)
ndev = to_mlx5_vdpa_ndev(mvdev); ndev = to_mlx5_vdpa_ndev(mvdev);
free_resources(ndev); free_fixed_resources(ndev);
mlx5_vdpa_destroy_mr_resources(mvdev); mlx5_vdpa_destroy_mr_resources(mvdev);
if (!is_zero_ether_addr(ndev->config.mac)) { if (!is_zero_ether_addr(ndev->config.mac)) {
pfmdev = pci_get_drvdata(pci_physfn(mvdev->mdev->pdev)); pfmdev = pci_get_drvdata(pci_physfn(mvdev->mdev->pdev));
...@@ -3467,7 +3467,7 @@ static int query_mtu(struct mlx5_core_dev *mdev, u16 *mtu) ...@@ -3467,7 +3467,7 @@ static int query_mtu(struct mlx5_core_dev *mdev, u16 *mtu)
return 0; return 0;
} }
static int alloc_resources(struct mlx5_vdpa_net *ndev) static int alloc_fixed_resources(struct mlx5_vdpa_net *ndev)
{ {
struct mlx5_vdpa_net_resources *res = &ndev->res; struct mlx5_vdpa_net_resources *res = &ndev->res;
int err; int err;
...@@ -3494,7 +3494,7 @@ static int alloc_resources(struct mlx5_vdpa_net *ndev) ...@@ -3494,7 +3494,7 @@ static int alloc_resources(struct mlx5_vdpa_net *ndev)
return err; return err;
} }
static void free_resources(struct mlx5_vdpa_net *ndev) static void free_fixed_resources(struct mlx5_vdpa_net *ndev)
{ {
struct mlx5_vdpa_net_resources *res = &ndev->res; struct mlx5_vdpa_net_resources *res = &ndev->res;
...@@ -3735,7 +3735,7 @@ static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name, ...@@ -3735,7 +3735,7 @@ static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name,
goto err_res; goto err_res;
} }
err = alloc_resources(ndev); err = alloc_fixed_resources(ndev);
if (err) if (err)
goto err_mr; goto err_mr;
...@@ -3758,7 +3758,7 @@ static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name, ...@@ -3758,7 +3758,7 @@ static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name,
err_reg: err_reg:
destroy_workqueue(mvdev->wq); destroy_workqueue(mvdev->wq);
err_res2: err_res2:
free_resources(ndev); free_fixed_resources(ndev);
err_mr: err_mr:
mlx5_vdpa_destroy_mr_resources(mvdev); mlx5_vdpa_destroy_mr_resources(mvdev);
err_res: err_res:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment