From: Xie Yongji <xieyongji@bytedance.com> To: mst@redhat.com, jasowang@redhat.com, stefanha@redhat.com, sgarzare@redhat.com, parav@nvidia.com, hch@infradead.org, christian.brauner@canonical.com, rdunlap@infradead.org, willy@infradead.org, viro@zeniv.linux.org.uk, axboe@kernel.dk, bcrl@kvack.org, corbet@lwn.net, mika.penttila@nextfour.com, dan.carpenter@oracle.com, joro@8bytes.org, gregkh@linuxfoundation.org, zhe.he@windriver.com, xiaodong.liu@intel.com, joe@perches.com, robin.murphy@arm.com Cc: kvm@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, iommu@lists.linux-foundation.org, songmuchun@bytedance.com, linux-fsdevel@vger.kernel.org Subject: [PATCH v11 07/12] vdpa: Add an opaque pointer for vdpa_config_ops.dma_map() Date: Wed, 18 Aug 2021 20:06:37 +0800 [thread overview] Message-ID: <20210818120642.165-8-xieyongji@bytedance.com> (raw) In-Reply-To: <20210818120642.165-1-xieyongji@bytedance.com> Add an opaque pointer for DMA mapping. Suggested-by: Jason Wang <jasowang@redhat.com> Signed-off-by: Xie Yongji <xieyongji@bytedance.com> Acked-by: Jason Wang <jasowang@redhat.com> --- drivers/vdpa/vdpa_sim/vdpa_sim.c | 6 +++--- drivers/vhost/vdpa.c | 2 +- include/linux/vdpa.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.c b/drivers/vdpa/vdpa_sim/vdpa_sim.c index e30d89b399d9..827d613c4eb6 100644 --- a/drivers/vdpa/vdpa_sim/vdpa_sim.c +++ b/drivers/vdpa/vdpa_sim/vdpa_sim.c @@ -544,14 +544,14 @@ static int vdpasim_set_map(struct vdpa_device *vdpa, } 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); int ret; spin_lock(&vdpasim->iommu_lock); - ret = vhost_iotlb_add_range(vdpasim->iommu, iova, iova + size - 1, pa, - perm); + ret = vhost_iotlb_add_range_ctx(vdpasim->iommu, iova, iova + size - 1, + pa, perm, opaque); spin_unlock(&vdpasim->iommu_lock); return ret; diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c index d99d75ad30cc..87ab104792fb 100644 --- a/drivers/vhost/vdpa.c +++ b/drivers/vhost/vdpa.c @@ -574,7 +574,7 @@ static int vhost_vdpa_map(struct vhost_vdpa *v, return r; 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) { if (!v->in_batch) r = ops->set_map(vdpa, dev->iotlb); diff --git a/include/linux/vdpa.h b/include/linux/vdpa.h index af7ea5ad795f..18f81612217e 100644 --- a/include/linux/vdpa.h +++ b/include/linux/vdpa.h @@ -271,7 +271,7 @@ struct vdpa_config_ops { /* DMA ops */ int (*set_map)(struct vdpa_device *vdev, struct vhost_iotlb *iotlb); 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); /* Free device resources */ -- 2.11.0 _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu
WARNING: multiple messages have this Message-ID (diff)
From: Xie Yongji <xieyongji@bytedance.com> To: mst@redhat.com, jasowang@redhat.com, stefanha@redhat.com, sgarzare@redhat.com, parav@nvidia.com, hch@infradead.org, christian.brauner@canonical.com, rdunlap@infradead.org, willy@infradead.org, viro@zeniv.linux.org.uk, axboe@kernel.dk, bcrl@kvack.org, corbet@lwn.net, mika.penttila@nextfour.com, dan.carpenter@oracle.com, joro@8bytes.org, gregkh@linuxfoundation.org, zhe.he@windriver.com, xiaodong.liu@intel.com, joe@perches.com, robin.murphy@arm.com Cc: songmuchun@bytedance.com, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, kvm@vger.kernel.org, linux-fsdevel@vger.kernel.org, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org Subject: [PATCH v11 07/12] vdpa: Add an opaque pointer for vdpa_config_ops.dma_map() Date: Wed, 18 Aug 2021 20:06:37 +0800 [thread overview] Message-ID: <20210818120642.165-8-xieyongji@bytedance.com> (raw) In-Reply-To: <20210818120642.165-1-xieyongji@bytedance.com> Add an opaque pointer for DMA mapping. Suggested-by: Jason Wang <jasowang@redhat.com> Signed-off-by: Xie Yongji <xieyongji@bytedance.com> Acked-by: Jason Wang <jasowang@redhat.com> --- drivers/vdpa/vdpa_sim/vdpa_sim.c | 6 +++--- drivers/vhost/vdpa.c | 2 +- include/linux/vdpa.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.c b/drivers/vdpa/vdpa_sim/vdpa_sim.c index e30d89b399d9..827d613c4eb6 100644 --- a/drivers/vdpa/vdpa_sim/vdpa_sim.c +++ b/drivers/vdpa/vdpa_sim/vdpa_sim.c @@ -544,14 +544,14 @@ static int vdpasim_set_map(struct vdpa_device *vdpa, } 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); int ret; spin_lock(&vdpasim->iommu_lock); - ret = vhost_iotlb_add_range(vdpasim->iommu, iova, iova + size - 1, pa, - perm); + ret = vhost_iotlb_add_range_ctx(vdpasim->iommu, iova, iova + size - 1, + pa, perm, opaque); spin_unlock(&vdpasim->iommu_lock); return ret; diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c index d99d75ad30cc..87ab104792fb 100644 --- a/drivers/vhost/vdpa.c +++ b/drivers/vhost/vdpa.c @@ -574,7 +574,7 @@ static int vhost_vdpa_map(struct vhost_vdpa *v, return r; 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) { if (!v->in_batch) r = ops->set_map(vdpa, dev->iotlb); diff --git a/include/linux/vdpa.h b/include/linux/vdpa.h index af7ea5ad795f..18f81612217e 100644 --- a/include/linux/vdpa.h +++ b/include/linux/vdpa.h @@ -271,7 +271,7 @@ struct vdpa_config_ops { /* DMA ops */ int (*set_map)(struct vdpa_device *vdev, struct vhost_iotlb *iotlb); 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); /* Free device resources */ -- 2.11.0
next prev parent reply other threads:[~2021-08-18 12:08 UTC|newest] Thread overview: 77+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-08-18 12:06 [PATCH v11 00/12] Introduce VDUSE - vDPA Device in Userspace Xie Yongji 2021-08-18 12:06 ` Xie Yongji 2021-08-18 12:06 ` [PATCH v11 01/12] iova: Export alloc_iova_fast() and free_iova_fast() Xie Yongji 2021-08-18 12:06 ` Xie Yongji 2021-08-23 6:24 ` Jason Wang 2021-08-23 6:24 ` Jason Wang 2021-08-23 6:24 ` Jason Wang 2021-08-24 18:08 ` Michael S. Tsirkin 2021-08-24 18:08 ` Michael S. Tsirkin 2021-08-24 18:08 ` Michael S. Tsirkin 2021-08-25 9:55 ` Will Deacon 2021-08-25 9:55 ` Will Deacon 2021-08-25 9:55 ` Will Deacon 2021-08-25 10:39 ` John Garry 2021-08-25 10:39 ` John Garry 2021-08-25 12:17 ` Yongji Xie 2021-08-25 12:17 ` Yongji Xie 2021-08-27 9:03 ` John Garry 2021-08-27 9:03 ` John Garry 2021-08-18 12:06 ` [PATCH v11 02/12] file: Export receive_fd() to modules Xie Yongji 2021-08-18 12:06 ` Xie Yongji 2021-08-18 12:06 ` [PATCH v11 03/12] vdpa: Fix some coding style issues Xie Yongji 2021-08-18 12:06 ` Xie Yongji 2021-08-23 6:27 ` Jason Wang 2021-08-23 6:27 ` Jason Wang 2021-08-23 6:27 ` Jason Wang 2021-08-24 11:09 ` Stefano Garzarella 2021-08-24 11:09 ` Stefano Garzarella 2021-08-24 11:09 ` Stefano Garzarella 2021-08-18 12:06 ` [PATCH v11 04/12] vdpa: Add reset callback in vdpa_config_ops Xie Yongji 2021-08-18 12:06 ` Xie Yongji 2021-08-23 6:31 ` Jason Wang 2021-08-23 6:31 ` Jason Wang 2021-08-23 6:31 ` Jason Wang 2021-08-23 7:44 ` Yongji Xie 2021-08-23 7:44 ` Yongji Xie 2021-08-18 12:06 ` [PATCH v11 05/12] vhost-vdpa: Handle the failure of vdpa_reset() Xie Yongji 2021-08-18 12:06 ` Xie Yongji 2021-08-23 6:32 ` Jason Wang 2021-08-23 6:32 ` Jason Wang 2021-08-23 6:32 ` Jason Wang 2021-08-24 11:12 ` Stefano Garzarella 2021-08-24 11:12 ` Stefano Garzarella 2021-08-24 11:12 ` Stefano Garzarella 2021-08-18 12:06 ` [PATCH v11 06/12] vhost-iotlb: Add an opaque pointer for vhost IOTLB Xie Yongji 2021-08-18 12:06 ` Xie Yongji 2021-08-18 12:06 ` Xie Yongji [this message] 2021-08-18 12:06 ` [PATCH v11 07/12] vdpa: Add an opaque pointer for vdpa_config_ops.dma_map() Xie Yongji 2021-08-18 12:06 ` [PATCH v11 08/12] vdpa: factor out vhost_vdpa_pa_map() and vhost_vdpa_pa_unmap() Xie Yongji 2021-08-18 12:06 ` Xie Yongji 2021-08-18 12:06 ` [PATCH v11 09/12] vdpa: Support transferring virtual addressing during DMA mapping Xie Yongji 2021-08-18 12:06 ` Xie Yongji 2021-08-18 12:06 ` [PATCH v11 10/12] vduse: Implement an MMU-based software IOTLB Xie Yongji 2021-08-18 12:06 ` Xie Yongji 2021-08-27 8:57 ` John Garry 2021-08-27 8:57 ` John Garry 2021-08-27 9:25 ` Yongji Xie 2021-08-27 9:25 ` Yongji Xie 2021-08-18 12:06 ` [PATCH v11 11/12] vduse: Introduce VDUSE - vDPA Device in Userspace Xie Yongji 2021-08-18 12:06 ` Xie Yongji 2021-08-19 3:09 ` kernel test robot 2021-08-23 6:56 ` Jason Wang 2021-08-23 6:56 ` Jason Wang 2021-08-23 6:56 ` Jason Wang 2021-08-24 18:10 ` Michael S. Tsirkin 2021-08-24 18:10 ` Michael S. Tsirkin 2021-08-24 18:10 ` Michael S. Tsirkin 2021-08-25 5:37 ` Yongji Xie 2021-08-25 5:37 ` Yongji Xie 2021-08-18 12:06 ` [PATCH v11 12/12] Documentation: Add documentation for VDUSE Xie Yongji 2021-08-18 12:06 ` Xie Yongji 2021-08-23 6:57 ` Jason Wang 2021-08-23 6:57 ` Jason Wang 2021-08-23 6:57 ` Jason Wang 2021-08-23 7:54 ` Jason Wang 2021-08-23 7:54 ` Jason Wang 2021-08-23 7:54 ` Jason Wang
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210818120642.165-8-xieyongji@bytedance.com \ --to=xieyongji@bytedance.com \ --cc=axboe@kernel.dk \ --cc=bcrl@kvack.org \ --cc=christian.brauner@canonical.com \ --cc=corbet@lwn.net \ --cc=dan.carpenter@oracle.com \ --cc=gregkh@linuxfoundation.org \ --cc=hch@infradead.org \ --cc=iommu@lists.linux-foundation.org \ --cc=jasowang@redhat.com \ --cc=joe@perches.com \ --cc=joro@8bytes.org \ --cc=kvm@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mika.penttila@nextfour.com \ --cc=mst@redhat.com \ --cc=netdev@vger.kernel.org \ --cc=parav@nvidia.com \ --cc=rdunlap@infradead.org \ --cc=robin.murphy@arm.com \ --cc=sgarzare@redhat.com \ --cc=songmuchun@bytedance.com \ --cc=stefanha@redhat.com \ --cc=viro@zeniv.linux.org.uk \ --cc=virtualization@lists.linux-foundation.org \ --cc=willy@infradead.org \ --cc=xiaodong.liu@intel.com \ --cc=zhe.he@windriver.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.