Commit 049cbeab authored by Dragos Tatulea's avatar Dragos Tatulea Committed by Michael S. Tsirkin
Browse files

vdpa/mlx5: Create helper function for dma mappings 



Necessary for upcoming cvq separation from mr allocation.

Acked-by: default avatarJason Wang <jasowang@redhat.com>
Signed-off-by: default avatarDragos Tatulea <dtatulea@nvidia.com>
Message-Id: <20231018171456.1624030-7-dtatulea@nvidia.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarSi-Wei Liu <si-wei.liu@oracle.com>
Tested-by: default avatarSi-Wei Liu <si-wei.liu@oracle.com>
Tested-by: default avatarLei Yang <leiyang@redhat.com>
parent c8068d9b

drivers/vdpa/mlx5/core/mlx5_vdpa.h

+1 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ int mlx5_vdpa_create_mr(struct mlx5_vdpa_dev *mvdev, struct vhost_iotlb *iotlb, 
			unsigned int asid);

void mlx5_vdpa_destroy_mr(struct mlx5_vdpa_dev *mvdev);

void mlx5_vdpa_destroy_mr_asid(struct mlx5_vdpa_dev *mvdev, unsigned int asid);

int mlx5_vdpa_create_dma_mr(struct mlx5_vdpa_dev *mvdev);



#define mlx5_vdpa_warn(__dev, format, ...)                                                         \

	dev_warn((__dev)->mdev->device, "%s:%d:(pid %d) warning: " format, __func__, __LINE__,     \

drivers/vdpa/mlx5/core/mr.c

+5 −0
Original line number Diff line number Diff line
@@ -619,3 +619,8 @@ int mlx5_vdpa_handle_set_map(struct mlx5_vdpa_dev *mvdev, struct vhost_iotlb *io 


	return err;

}



int mlx5_vdpa_create_dma_mr(struct mlx5_vdpa_dev *mvdev)

{

	return mlx5_vdpa_create_mr(mvdev, NULL, 0);

}

drivers/vdpa/mlx5/net/mlx5_vnet.c

+2 −2
Original line number Diff line number Diff line
@@ -2880,7 +2880,7 @@ static int mlx5_vdpa_reset(struct vdpa_device *vdev) 
	++mvdev->generation;



	if (MLX5_CAP_GEN(mvdev->mdev, umem_uid_0)) {

		if (mlx5_vdpa_create_mr(mvdev, NULL, 0))

		if (mlx5_vdpa_create_dma_mr(mvdev))

			mlx5_vdpa_warn(mvdev, "create MR failed\n");

	}

	up_write(&ndev->reslock);
@@ -3485,7 +3485,7 @@ static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name, 
		goto err_mpfs;



	if (MLX5_CAP_GEN(mvdev->mdev, umem_uid_0)) {

		err = mlx5_vdpa_create_mr(mvdev, NULL, 0);

		err = mlx5_vdpa_create_dma_mr(mvdev);

		if (err)

			goto err_res;

	}