Commit c10fb945 authored by Xie Yongji's avatar Xie Yongji Committed by Michael S. Tsirkin

vdpa: Add an opaque pointer for vdpa_config_ops.dma_map()

Add an opaque pointer for DMA mapping.
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-9-xieyongji@bytedance.comSigned-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 59dfe4f1
...@@ -555,14 +555,14 @@ static int vdpasim_set_map(struct vdpa_device *vdpa, ...@@ -555,14 +555,14 @@ static int vdpasim_set_map(struct vdpa_device *vdpa,
} }
static int vdpasim_dma_map(struct vdpa_device *vdpa, u64 iova, u64 size, static int vdpasim_dma_map(struct vdpa_device *vdpa, u64 iova, u64 size,
u64 pa, u32 perm) u64 pa, u32 perm, void *opaque)
{ {
struct vdpasim *vdpasim = vdpa_to_sim(vdpa); struct vdpasim *vdpasim = vdpa_to_sim(vdpa);
int ret; int ret;
spin_lock(&vdpasim->iommu_lock); spin_lock(&vdpasim->iommu_lock);
ret = vhost_iotlb_add_range(vdpasim->iommu, iova, iova + size - 1, pa, ret = vhost_iotlb_add_range_ctx(vdpasim->iommu, iova, iova + size - 1,
perm); pa, perm, opaque);
spin_unlock(&vdpasim->iommu_lock); spin_unlock(&vdpasim->iommu_lock);
return ret; return ret;
......
...@@ -571,7 +571,7 @@ static int vhost_vdpa_map(struct vhost_vdpa *v, ...@@ -571,7 +571,7 @@ static int vhost_vdpa_map(struct vhost_vdpa *v,
return r; return r;
if (ops->dma_map) { if (ops->dma_map) {
r = ops->dma_map(vdpa, iova, size, pa, perm); r = ops->dma_map(vdpa, iova, size, pa, perm, NULL);
} else if (ops->set_map) { } else if (ops->set_map) {
if (!v->in_batch) if (!v->in_batch)
r = ops->set_map(vdpa, dev->iotlb); r = ops->set_map(vdpa, dev->iotlb);
......
...@@ -270,7 +270,7 @@ struct vdpa_config_ops { ...@@ -270,7 +270,7 @@ struct vdpa_config_ops {
/* DMA ops */ /* DMA ops */
int (*set_map)(struct vdpa_device *vdev, struct vhost_iotlb *iotlb); int (*set_map)(struct vdpa_device *vdev, struct vhost_iotlb *iotlb);
int (*dma_map)(struct vdpa_device *vdev, u64 iova, u64 size, int (*dma_map)(struct vdpa_device *vdev, u64 iova, u64 size,
u64 pa, u32 perm); u64 pa, u32 perm, void *opaque);
int (*dma_unmap)(struct vdpa_device *vdev, u64 iova, u64 size); int (*dma_unmap)(struct vdpa_device *vdev, u64 iova, u64 size);
/* Free device resources */ /* Free device resources */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment