Skip to content

Commit 1f5d647

Browse files
dtatuleamstsirkin
authored andcommitted
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: Cosmin Ratiu <[email protected]> Acked-by: Eugenio Pérez <[email protected]> Signed-off-by: Dragos Tatulea <[email protected]> Message-Id: <[email protected]> Signed-off-by: Michael S. Tsirkin <[email protected]>
1 parent 106e4df commit 1f5d647

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

drivers/vdpa/mlx5/net/mlx5_vnet.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,10 @@ static bool is_index_valid(struct mlx5_vdpa_dev *mvdev, u16 idx)
144144
return idx <= mvdev->max_idx;
145145
}
146146

147-
static void free_resources(struct mlx5_vdpa_net *ndev);
147+
static void free_fixed_resources(struct mlx5_vdpa_net *ndev);
148148
static void init_mvqs(struct mlx5_vdpa_net *ndev);
149-
static int setup_driver(struct mlx5_vdpa_dev *mvdev);
150-
static void teardown_driver(struct mlx5_vdpa_net *ndev);
149+
static int setup_vq_resources(struct mlx5_vdpa_dev *mvdev);
150+
static void teardown_vq_resources(struct mlx5_vdpa_net *ndev);
151151

152152
static bool mlx5_vdpa_debug;
153153

@@ -2848,7 +2848,7 @@ static int mlx5_vdpa_change_map(struct mlx5_vdpa_dev *mvdev,
28482848
if (err)
28492849
return err;
28502850

2851-
teardown_driver(ndev);
2851+
teardown_vq_resources(ndev);
28522852
}
28532853

28542854
mlx5_vdpa_update_mr(mvdev, new_mr, asid);
@@ -2862,7 +2862,7 @@ static int mlx5_vdpa_change_map(struct mlx5_vdpa_dev *mvdev,
28622862

28632863
if (teardown) {
28642864
restore_channels_info(ndev);
2865-
err = setup_driver(mvdev);
2865+
err = setup_vq_resources(mvdev);
28662866
if (err)
28672867
return err;
28682868
}
@@ -2873,7 +2873,7 @@ static int mlx5_vdpa_change_map(struct mlx5_vdpa_dev *mvdev,
28732873
}
28742874

28752875
/* reslock must be held for this function */
2876-
static int setup_driver(struct mlx5_vdpa_dev *mvdev)
2876+
static int setup_vq_resources(struct mlx5_vdpa_dev *mvdev)
28772877
{
28782878
struct mlx5_vdpa_net *ndev = to_mlx5_vdpa_ndev(mvdev);
28792879
int err;
@@ -2931,7 +2931,7 @@ static int setup_driver(struct mlx5_vdpa_dev *mvdev)
29312931
}
29322932

29332933
/* reslock must be held for this function */
2934-
static void teardown_driver(struct mlx5_vdpa_net *ndev)
2934+
static void teardown_vq_resources(struct mlx5_vdpa_net *ndev)
29352935
{
29362936

29372937
WARN_ON(!rwsem_is_locked(&ndev->reslock));
@@ -2997,7 +2997,7 @@ static void mlx5_vdpa_set_status(struct vdpa_device *vdev, u8 status)
29972997
goto err_setup;
29982998
}
29992999
register_link_notifier(ndev);
3000-
err = setup_driver(mvdev);
3000+
err = setup_vq_resources(mvdev);
30013001
if (err) {
30023002
mlx5_vdpa_warn(mvdev, "failed to setup driver\n");
30033003
goto err_driver;
@@ -3040,7 +3040,7 @@ static int mlx5_vdpa_compat_reset(struct vdpa_device *vdev, u32 flags)
30403040

30413041
down_write(&ndev->reslock);
30423042
unregister_link_notifier(ndev);
3043-
teardown_driver(ndev);
3043+
teardown_vq_resources(ndev);
30443044
clear_vqs_ready(ndev);
30453045
if (flags & VDPA_RESET_F_CLEAN_MAP)
30463046
mlx5_vdpa_destroy_mr_resources(&ndev->mvdev);
@@ -3197,7 +3197,7 @@ static void mlx5_vdpa_free(struct vdpa_device *vdev)
31973197

31983198
ndev = to_mlx5_vdpa_ndev(mvdev);
31993199

3200-
free_resources(ndev);
3200+
free_fixed_resources(ndev);
32013201
mlx5_vdpa_destroy_mr_resources(mvdev);
32023202
if (!is_zero_ether_addr(ndev->config.mac)) {
32033203
pfmdev = pci_get_drvdata(pci_physfn(mvdev->mdev->pdev));
@@ -3467,7 +3467,7 @@ static int query_mtu(struct mlx5_core_dev *mdev, u16 *mtu)
34673467
return 0;
34683468
}
34693469

3470-
static int alloc_resources(struct mlx5_vdpa_net *ndev)
3470+
static int alloc_fixed_resources(struct mlx5_vdpa_net *ndev)
34713471
{
34723472
struct mlx5_vdpa_net_resources *res = &ndev->res;
34733473
int err;
@@ -3494,7 +3494,7 @@ static int alloc_resources(struct mlx5_vdpa_net *ndev)
34943494
return err;
34953495
}
34963496

3497-
static void free_resources(struct mlx5_vdpa_net *ndev)
3497+
static void free_fixed_resources(struct mlx5_vdpa_net *ndev)
34983498
{
34993499
struct mlx5_vdpa_net_resources *res = &ndev->res;
35003500

@@ -3735,7 +3735,7 @@ static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name,
37353735
goto err_res;
37363736
}
37373737

3738-
err = alloc_resources(ndev);
3738+
err = alloc_fixed_resources(ndev);
37393739
if (err)
37403740
goto err_mr;
37413741

@@ -3758,7 +3758,7 @@ static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name,
37583758
err_reg:
37593759
destroy_workqueue(mvdev->wq);
37603760
err_res2:
3761-
free_resources(ndev);
3761+
free_fixed_resources(ndev);
37623762
err_mr:
37633763
mlx5_vdpa_destroy_mr_resources(mvdev);
37643764
err_res:

0 commit comments

Comments
 (0)