Commit d8945ec4 authored by Xie Yongji's avatar Xie Yongji Committed by Michael S. Tsirkin
Browse files

vdpa: Support transferring virtual addressing during DMA mapping 



This patch introduces an attribute for vDPA device to indicate
whether virtual address can be used. If vDPA device driver set
it, vhost-vdpa bus driver will not pin user page and transfer
userspace virtual address instead of physical address during
DMA mapping. And corresponding vma->vm_file and offset will be
also passed as an opaque pointer.

Suggested-by: default avatarJason Wang <jasowang@redhat.com>
Signed-off-by: default avatarXie Yongji <xieyongji@bytedance.com>
Acked-by: default avatarJason Wang <jasowang@redhat.com>
Link: https://lore.kernel.org/r/20210831103634.33-11-xieyongji@bytedance.com


Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 22af48cf

drivers/vdpa/ifcvf/ifcvf_main.c

+1 −1
Original line number Diff line number Diff line
@@ -515,7 +515,7 @@ static int ifcvf_vdpa_dev_add(struct vdpa_mgmt_dev *mdev, const char *name) 
	pdev = ifcvf_mgmt_dev->pdev;

	dev = &pdev->dev;

	adapter = vdpa_alloc_device(struct ifcvf_adapter, vdpa,

				    dev, &ifc_vdpa_ops, name);

				    dev, &ifc_vdpa_ops, name, false);

	if (IS_ERR(adapter)) {

		IFCVF_ERR(pdev, "Failed to allocate vDPA structure");

		return PTR_ERR(adapter);

drivers/vdpa/mlx5/net/mlx5_vnet.c

+1 −1
Original line number Diff line number Diff line
@@ -2425,7 +2425,7 @@ static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name) 
	max_vqs = min_t(u32, max_vqs, MLX5_MAX_SUPPORTED_VQS);



	ndev = vdpa_alloc_device(struct mlx5_vdpa_net, mvdev.vdev, mdev->device, &mlx5_vdpa_ops,

				 name);

				 name, false);

	if (IS_ERR(ndev))

		return PTR_ERR(ndev);

drivers/vdpa/vdpa.c

+8 −1
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ static void vdpa_release_dev(struct device *d) 
 * @config: the bus operations that is supported by this device

 * @size: size of the parent structure that contains private data

 * @name: name of the vdpa device; optional.

 * @use_va: indicate whether virtual address must be used by this device

 *

 * Driver should use vdpa_alloc_device() wrapper macro instead of

 * using this directly.
@@ -80,7 +81,8 @@ static void vdpa_release_dev(struct device *d) 
 */

struct vdpa_device *__vdpa_alloc_device(struct device *parent,

					const struct vdpa_config_ops *config,

					size_t size, const char *name)

					size_t size, const char *name,

					bool use_va)

{

	struct vdpa_device *vdev;

	int err = -EINVAL;
@@ -91,6 +93,10 @@ struct vdpa_device *__vdpa_alloc_device(struct device *parent, 
	if (!!config->dma_map != !!config->dma_unmap)

		goto err;



	/* It should only work for the device that use on-chip IOMMU */

	if (use_va && !(config->dma_map || config->set_map))

		goto err;



	err = -ENOMEM;

	vdev = kzalloc(size, GFP_KERNEL);

	if (!vdev)
@@ -106,6 +112,7 @@ struct vdpa_device *__vdpa_alloc_device(struct device *parent, 
	vdev->index = err;

	vdev->config = config;

	vdev->features_valid = false;

	vdev->use_va = use_va;



	if (name)

		err = dev_set_name(&vdev->dev, "%s", name);

drivers/vdpa/vdpa_sim/vdpa_sim.c

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ struct vdpasim *vdpasim_create(struct vdpasim_dev_attr *dev_attr) 
		ops = &vdpasim_config_ops;



	vdpasim = vdpa_alloc_device(struct vdpasim, vdpa, NULL, ops,

				    dev_attr->name);

				    dev_attr->name, false);

	if (IS_ERR(vdpasim)) {

		ret = PTR_ERR(vdpasim);

		goto err_alloc;

drivers/vdpa/virtio_pci/vp_vdpa.c

+1 −1
Original line number Diff line number Diff line
@@ -446,7 +446,7 @@ static int vp_vdpa_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
		return ret;



	vp_vdpa = vdpa_alloc_device(struct vp_vdpa, vdpa,

				    dev, &vp_vdpa_ops, NULL);

				    dev, &vp_vdpa_ops, NULL, false);

	if (IS_ERR(vp_vdpa)) {

		dev_err(dev, "vp_vdpa: Failed to allocate vDPA structure\n");

		return PTR_ERR(vp_vdpa);