Commit 0b916a9c authored by Dragos Tatulea's avatar Dragos Tatulea Committed by Michael S. Tsirkin
Browse files

vdpa/mlx5: Rename function 



A followup patch will use this name for something else.

Signed-off-by: default avatarDragos Tatulea <dtatulea@nvidia.com>
Reviewed-by: default avatarCosmin Ratiu <cratiu@nvidia.com>
Message-Id: <20240830105838.2666587-5-dtatulea@nvidia.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent e1ba5c94

drivers/vdpa/mlx5/core/mlx5_vdpa.h

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ int mlx5_vdpa_create_mkey(struct mlx5_vdpa_dev *mvdev, u32 *mkey, u32 *in, 
int mlx5_vdpa_destroy_mkey(struct mlx5_vdpa_dev *mvdev, u32 mkey);

struct mlx5_vdpa_mr *mlx5_vdpa_create_mr(struct mlx5_vdpa_dev *mvdev,

					 struct vhost_iotlb *iotlb);

void mlx5_vdpa_destroy_mr_resources(struct mlx5_vdpa_dev *mvdev);

void mlx5_vdpa_clean_mrs(struct mlx5_vdpa_dev *mvdev);

void mlx5_vdpa_get_mr(struct mlx5_vdpa_dev *mvdev,

		      struct mlx5_vdpa_mr *mr);

void mlx5_vdpa_put_mr(struct mlx5_vdpa_dev *mvdev,

drivers/vdpa/mlx5/core/mr.c

+1 −1
Original line number Diff line number Diff line
@@ -719,7 +719,7 @@ static void mlx5_vdpa_show_mr_leaks(struct mlx5_vdpa_dev *mvdev) 


}



void mlx5_vdpa_destroy_mr_resources(struct mlx5_vdpa_dev *mvdev)

void mlx5_vdpa_clean_mrs(struct mlx5_vdpa_dev *mvdev)

{

	if (!mvdev->res.valid)

		return;

drivers/vdpa/mlx5/net/mlx5_vnet.c

+4 −4
Original line number Diff line number Diff line
@@ -3223,7 +3223,7 @@ static void mlx5_vdpa_set_status(struct vdpa_device *vdev, u8 status) 
err_driver:

	unregister_link_notifier(ndev);

err_setup:

	mlx5_vdpa_destroy_mr_resources(&ndev->mvdev);

	mlx5_vdpa_clean_mrs(&ndev->mvdev);

	ndev->mvdev.status |= VIRTIO_CONFIG_S_FAILED;

err_clear:

	up_write(&ndev->reslock);
@@ -3275,7 +3275,7 @@ static int mlx5_vdpa_compat_reset(struct vdpa_device *vdev, u32 flags) 
	}



	if (flags & VDPA_RESET_F_CLEAN_MAP)

		mlx5_vdpa_destroy_mr_resources(&ndev->mvdev);

		mlx5_vdpa_clean_mrs(&ndev->mvdev);

	ndev->mvdev.status = 0;

	ndev->mvdev.suspended = false;

	ndev->cur_num_vqs = MLX5V_DEFAULT_VQ_COUNT;
@@ -3433,7 +3433,7 @@ static void mlx5_vdpa_free(struct vdpa_device *vdev) 
	ndev = to_mlx5_vdpa_ndev(mvdev);



	free_fixed_resources(ndev);

	mlx5_vdpa_destroy_mr_resources(mvdev);

	mlx5_vdpa_clean_mrs(mvdev);

	if (!is_zero_ether_addr(ndev->config.mac)) {

		pfmdev = pci_get_drvdata(pci_physfn(mvdev->mdev->pdev));

		mlx5_mpfs_del_mac(pfmdev, ndev->config.mac);
@@ -4008,7 +4008,7 @@ static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name, 
err_res2:

	free_fixed_resources(ndev);

err_mr:

	mlx5_vdpa_destroy_mr_resources(mvdev);

	mlx5_vdpa_clean_mrs(mvdev);

err_res:

	mlx5_vdpa_free_resources(&ndev->mvdev);

err_mpfs: