Commit 58aca3db authored by Jason Wang's avatar Jason Wang Committed by Michael S. Tsirkin
Browse files

vdpa: support virtio_map 



Virtio core switches from DMA device to virtio_map, let's do that
as well for vDPA.

Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
Message-Id: <20250821064641.5025-8-jasowang@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Tested-by: default avatarLei Yang <leiyang@redhat.com>
Reviewed-by: default avatarEugenio Pérez <eperezma@redhat.com>
parent bee8c7c2

drivers/vdpa/alibaba/eni_vdpa.c

+1 −1
Original line number Diff line number Diff line
@@ -496,7 +496,7 @@ static int eni_vdpa_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	pci_set_master(pdev);

	pci_set_drvdata(pdev, eni_vdpa);



	eni_vdpa->vdpa.dma_dev = &pdev->dev;

	eni_vdpa->vdpa.vmap.dma_dev = &pdev->dev;

	eni_vdpa->queues = eni_vdpa_get_num_queues(eni_vdpa);



	eni_vdpa->vring = devm_kcalloc(&pdev->dev, eni_vdpa->queues,

drivers/vdpa/ifcvf/ifcvf_main.c

+1 −1
Original line number Diff line number Diff line
@@ -713,7 +713,7 @@ static int ifcvf_vdpa_dev_add(struct vdpa_mgmt_dev *mdev, const char *name, 


	ifcvf_mgmt_dev->adapter = adapter;

	adapter->pdev = pdev;

	adapter->vdpa.dma_dev = &pdev->dev;

	adapter->vdpa.vmap.dma_dev = &pdev->dev;

	adapter->vdpa.mdev = mdev;

	adapter->vf = vf;

	vdpa_dev = &adapter->vdpa;

drivers/vdpa/mlx5/core/mr.c

+2 −2
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ static int map_direct_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_direct_mr 
	u64 pa, offset;

	u64 paend;

	struct scatterlist *sg;

	struct device *dma = mvdev->vdev.dma_dev;

	struct device *dma = mvdev->vdev.vmap.dma_dev;



	for (map = vhost_iotlb_itree_first(iotlb, mr->start, mr->end - 1);

	     map; map = vhost_iotlb_itree_next(map, mr->start, mr->end - 1)) {
@@ -432,7 +432,7 @@ static int map_direct_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_direct_mr 


static void unmap_direct_mr(struct mlx5_vdpa_dev *mvdev, struct mlx5_vdpa_direct_mr *mr)

{

	struct device *dma = mvdev->vdev.dma_dev;

	struct device *dma = mvdev->vdev.vmap.dma_dev;



	destroy_direct_mr(mvdev, mr);

	dma_unmap_sg_attrs(dma, mr->sg_head.sgl, mr->nsg, DMA_BIDIRECTIONAL, 0);

drivers/vdpa/mlx5/net/mlx5_vnet.c

+8 −5
Original line number Diff line number Diff line
@@ -3395,14 +3395,17 @@ static int mlx5_vdpa_reset_map(struct vdpa_device *vdev, unsigned int asid) 
	return err;

}



static struct device *mlx5_get_vq_dma_dev(struct vdpa_device *vdev, u16 idx)

static union virtio_map mlx5_get_vq_map(struct vdpa_device *vdev, u16 idx)

{

	struct mlx5_vdpa_dev *mvdev = to_mvdev(vdev);

	union virtio_map map;



	if (is_ctrl_vq_idx(mvdev, idx))

		return &vdev->dev;

		map.dma_dev = &vdev->dev;

	else

		map.dma_dev = mvdev->vdev.vmap.dma_dev;



	return mvdev->vdev.dma_dev;

	return map;

}



static void free_irqs(struct mlx5_vdpa_net *ndev)
@@ -3686,7 +3689,7 @@ static const struct vdpa_config_ops mlx5_vdpa_ops = { 
	.set_map = mlx5_vdpa_set_map,

	.reset_map = mlx5_vdpa_reset_map,

	.set_group_asid = mlx5_set_group_asid,

	.get_vq_dma_dev = mlx5_get_vq_dma_dev,

	.get_vq_map = mlx5_get_vq_map,

	.free = mlx5_vdpa_free,

	.suspend = mlx5_vdpa_suspend,

	.resume = mlx5_vdpa_resume, /* Op disabled if not supported. */
@@ -3965,7 +3968,7 @@ static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name, 
	}



	ndev->mvdev.mlx_features = device_features;

	mvdev->vdev.dma_dev = &mdev->pdev->dev;

	mvdev->vdev.vmap.dma_dev = &mdev->pdev->dev;

	err = mlx5_vdpa_alloc_resources(&ndev->mvdev);

	if (err)

		goto err_alloc;

drivers/vdpa/octeon_ep/octep_vdpa_main.c

+1 −1
Original line number Diff line number Diff line
@@ -516,7 +516,7 @@ static int octep_vdpa_dev_add(struct vdpa_mgmt_dev *mdev, const char *name, 
	}



	oct_vdpa->pdev = pdev;

	oct_vdpa->vdpa.dma_dev = &pdev->dev;

	oct_vdpa->vdpa.vmap.dma_dev = &pdev->dev;

	oct_vdpa->vdpa.mdev = mdev;

	oct_vdpa->oct_hw = oct_hw;

	vdpa_dev = &oct_vdpa->vdpa;