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 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 v8 05/10] vdpa: Add an opaque pointer for vdpa_config_ops.dma_map() Date: Tue, 15 Jun 2021 22:13:26 +0800 [thread overview] Message-ID: <20210615141331.407-6-xieyongji@bytedance.com> (raw) In-Reply-To: <20210615141331.407-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 98f793bc9376..efd0cb3d964d 100644 --- a/drivers/vdpa/vdpa_sim/vdpa_sim.c +++ b/drivers/vdpa/vdpa_sim/vdpa_sim.c @@ -542,14 +542,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 fb41db3da611..1d5c5c6b6d5d 100644 --- a/drivers/vhost/vdpa.c +++ b/drivers/vhost/vdpa.c @@ -565,7 +565,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 f311d227aa1b..281f768cb597 100644 --- a/include/linux/vdpa.h +++ b/include/linux/vdpa.h @@ -245,7 +245,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
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 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 v8 05/10] vdpa: Add an opaque pointer for vdpa_config_ops.dma_map() Date: Tue, 15 Jun 2021 22:13:26 +0800 [thread overview] Message-ID: <20210615141331.407-6-xieyongji@bytedance.com> (raw) In-Reply-To: <20210615141331.407-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 98f793bc9376..efd0cb3d964d 100644 --- a/drivers/vdpa/vdpa_sim/vdpa_sim.c +++ b/drivers/vdpa/vdpa_sim/vdpa_sim.c @@ -542,14 +542,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 fb41db3da611..1d5c5c6b6d5d 100644 --- a/drivers/vhost/vdpa.c +++ b/drivers/vhost/vdpa.c @@ -565,7 +565,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 f311d227aa1b..281f768cb597 100644 --- a/include/linux/vdpa.h +++ b/include/linux/vdpa.h @@ -245,7 +245,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
next prev parent reply other threads:[~2021-06-15 14:17 UTC|newest] Thread overview: 193+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-06-15 14:13 [PATCH v8 00/10] Introduce VDUSE - vDPA Device in Userspace Xie Yongji 2021-06-15 14:13 ` Xie Yongji 2021-06-15 14:13 ` [PATCH v8 01/10] iova: Export alloc_iova_fast() and free_iova_fast(); Xie Yongji 2021-06-15 14:13 ` Xie Yongji 2021-06-15 14:13 ` [PATCH v8 02/10] file: Export receive_fd() to modules Xie Yongji 2021-06-15 14:13 ` Xie Yongji 2021-06-15 14:13 ` [PATCH v8 03/10] eventfd: Increase the recursion depth of eventfd_signal() Xie Yongji 2021-06-15 14:13 ` Xie Yongji 2021-06-17 8:33 ` He Zhe 2021-06-17 8:33 ` He Zhe 2021-06-17 8:33 ` He Zhe 2021-06-18 3:29 ` Yongji Xie 2021-06-18 3:29 ` Yongji Xie 2021-06-18 8:41 ` He Zhe 2021-06-18 8:41 ` He Zhe 2021-06-18 8:41 ` He Zhe 2021-06-18 8:44 ` [PATCH] eventfd: Enlarge recursion limit to allow vhost to work He Zhe 2021-06-18 8:44 ` He Zhe 2021-06-18 8:44 ` He Zhe 2021-07-03 8:31 ` Michael S. Tsirkin 2021-07-03 8:31 ` Michael S. Tsirkin 2021-07-03 8:31 ` Michael S. Tsirkin 2021-08-25 7:57 ` Yongji Xie 2021-08-25 7:57 ` Yongji Xie 2021-06-15 14:13 ` [PATCH v8 04/10] vhost-iotlb: Add an opaque pointer for vhost IOTLB Xie Yongji 2021-06-15 14:13 ` Xie Yongji 2021-06-15 14:13 ` Xie Yongji [this message] 2021-06-15 14:13 ` [PATCH v8 05/10] vdpa: Add an opaque pointer for vdpa_config_ops.dma_map() Xie Yongji 2021-06-15 14:13 ` [PATCH v8 06/10] vdpa: factor out vhost_vdpa_pa_map() and vhost_vdpa_pa_unmap() Xie Yongji 2021-06-15 14:13 ` Xie Yongji 2021-06-15 14:13 ` [PATCH v8 07/10] vdpa: Support transferring virtual addressing during DMA mapping Xie Yongji 2021-06-15 14:13 ` Xie Yongji 2021-06-15 14:13 ` [PATCH v8 08/10] vduse: Implement an MMU-based IOMMU driver Xie Yongji 2021-06-15 14:13 ` Xie Yongji 2021-06-15 14:13 ` [PATCH v8 09/10] vduse: Introduce VDUSE - vDPA Device in Userspace Xie Yongji 2021-06-15 14:13 ` Xie Yongji 2021-06-21 9:13 ` Jason Wang 2021-06-21 9:13 ` Jason Wang 2021-06-21 9:13 ` Jason Wang 2021-06-21 10:41 ` Yongji Xie 2021-06-21 10:41 ` Yongji Xie 2021-06-22 5:06 ` Jason Wang 2021-06-22 5:06 ` Jason Wang 2021-06-22 5:06 ` Jason Wang 2021-06-22 7:22 ` Yongji Xie 2021-06-22 7:22 ` Yongji Xie 2021-06-22 7:49 ` Jason Wang 2021-06-22 7:49 ` Jason Wang 2021-06-22 7:49 ` Jason Wang 2021-06-22 8:14 ` Yongji Xie 2021-06-22 8:14 ` Yongji Xie 2021-06-23 3:30 ` Jason Wang 2021-06-23 3:30 ` Jason Wang 2021-06-23 3:30 ` Jason Wang 2021-06-23 5:50 ` Yongji Xie 2021-06-23 5:50 ` Yongji Xie 2021-06-24 3:34 ` Jason Wang 2021-06-24 3:34 ` Jason Wang 2021-06-24 3:34 ` Jason Wang 2021-06-24 4:46 ` Yongji Xie 2021-06-24 4:46 ` Yongji Xie 2021-06-24 8:13 ` Jason Wang 2021-06-24 8:13 ` Jason Wang 2021-06-24 8:13 ` Jason Wang 2021-06-24 9:16 ` Yongji Xie 2021-06-24 9:16 ` Yongji Xie 2021-06-25 3:08 ` Jason Wang 2021-06-25 3:08 ` Jason Wang 2021-06-25 3:08 ` Jason Wang 2021-06-25 4:19 ` Yongji Xie 2021-06-25 4:19 ` Yongji Xie 2021-06-28 4:40 ` Jason Wang 2021-06-28 4:40 ` Jason Wang 2021-06-28 4:40 ` Jason Wang 2021-06-29 2:26 ` Yongji Xie 2021-06-29 2:26 ` Yongji Xie 2021-06-29 3:29 ` Jason Wang 2021-06-29 3:29 ` Jason Wang 2021-06-29 3:29 ` Jason Wang 2021-06-29 3:56 ` Yongji Xie 2021-06-29 3:56 ` Yongji Xie 2021-06-29 4:03 ` Jason Wang 2021-06-29 4:03 ` Jason Wang 2021-06-29 4:03 ` Jason Wang 2021-06-24 14:46 ` Stefan Hajnoczi 2021-06-24 14:46 ` Stefan Hajnoczi 2021-06-24 14:46 ` Stefan Hajnoczi 2021-06-29 2:59 ` Yongji Xie 2021-06-29 2:59 ` Yongji Xie 2021-06-30 9:51 ` Stefan Hajnoczi 2021-06-30 9:51 ` Stefan Hajnoczi 2021-06-30 9:51 ` Stefan Hajnoczi 2021-07-01 6:50 ` Yongji Xie 2021-07-01 6:50 ` Yongji Xie 2021-07-01 7:55 ` Jason Wang 2021-07-01 7:55 ` Jason Wang 2021-07-01 7:55 ` Jason Wang 2021-07-01 10:26 ` Yongji Xie 2021-07-01 10:26 ` Yongji Xie 2021-07-02 3:25 ` Jason Wang 2021-07-02 3:25 ` Jason Wang 2021-07-02 3:25 ` Jason Wang 2021-07-07 8:52 ` Stefan Hajnoczi 2021-07-07 8:52 ` Stefan Hajnoczi 2021-07-07 8:52 ` Stefan Hajnoczi 2021-07-07 9:19 ` Yongji Xie 2021-07-07 9:19 ` Yongji Xie 2021-06-15 14:13 ` [PATCH v8 10/10] Documentation: Add documentation for VDUSE Xie Yongji 2021-06-15 14:13 ` Xie Yongji 2021-06-24 13:01 ` Stefan Hajnoczi 2021-06-24 13:01 ` Stefan Hajnoczi 2021-06-24 13:01 ` Stefan Hajnoczi 2021-06-29 5:43 ` Yongji Xie 2021-06-29 5:43 ` Yongji Xie 2021-06-30 10:06 ` Stefan Hajnoczi 2021-06-30 10:06 ` Stefan Hajnoczi 2021-06-30 10:06 ` Stefan Hajnoczi 2021-07-01 10:00 ` Yongji Xie 2021-07-01 10:00 ` Yongji Xie 2021-07-01 13:15 ` Stefan Hajnoczi 2021-07-01 13:15 ` Stefan Hajnoczi 2021-07-01 13:15 ` Stefan Hajnoczi 2021-07-04 9:49 ` Yongji Xie 2021-07-04 9:49 ` Yongji Xie 2021-07-05 3:36 ` Jason Wang 2021-07-05 3:36 ` Jason Wang 2021-07-05 3:36 ` Jason Wang 2021-07-05 12:49 ` Stefan Hajnoczi 2021-07-05 12:49 ` Stefan Hajnoczi 2021-07-05 12:49 ` Stefan Hajnoczi 2021-07-06 2:34 ` Jason Wang 2021-07-06 2:34 ` Jason Wang 2021-07-06 2:34 ` Jason Wang 2021-07-06 10:14 ` Stefan Hajnoczi 2021-07-06 10:14 ` Stefan Hajnoczi 2021-07-06 10:14 ` Stefan Hajnoczi [not found] ` <CACGkMEs2HHbUfarum8uQ6wuXoDwLQUSXTsa-huJFiqr__4cwRg@mail.gmail.com> [not found] ` <YOSOsrQWySr0andk@stefanha-x1.localdomain> [not found] ` <100e6788-7fdf-1505-d69c-bc28a8bc7a78@redhat.com> [not found] ` <YOVr801d01YOPzLL@stefanha-x1.localdomain> 2021-07-07 9:24 ` Jason Wang 2021-07-07 9:24 ` Jason Wang 2021-07-07 9:24 ` Jason Wang 2021-07-07 15:54 ` Stefan Hajnoczi 2021-07-07 15:54 ` Stefan Hajnoczi 2021-07-07 15:54 ` Stefan Hajnoczi 2021-07-08 4:17 ` Jason Wang 2021-07-08 4:17 ` Jason Wang 2021-07-08 4:17 ` Jason Wang 2021-07-08 9:06 ` Stefan Hajnoczi 2021-07-08 9:06 ` Stefan Hajnoczi 2021-07-08 9:06 ` Stefan Hajnoczi 2021-07-08 12:35 ` Yongji Xie 2021-07-08 12:35 ` Yongji Xie 2021-07-06 3:04 ` Yongji Xie 2021-07-06 3:04 ` Yongji Xie 2021-07-06 10:22 ` Stefan Hajnoczi 2021-07-06 10:22 ` Stefan Hajnoczi 2021-07-06 10:22 ` Stefan Hajnoczi 2021-07-07 9:09 ` Yongji Xie 2021-07-07 9:09 ` Yongji Xie 2021-07-08 9:07 ` Stefan Hajnoczi 2021-07-08 9:07 ` Stefan Hajnoczi 2021-07-08 9:07 ` Stefan Hajnoczi 2021-06-24 15:12 ` [PATCH v8 00/10] Introduce VDUSE - vDPA Device in Userspace Stefan Hajnoczi 2021-06-24 15:12 ` Stefan Hajnoczi 2021-06-24 15:12 ` Stefan Hajnoczi 2021-06-29 3:15 ` Yongji Xie 2021-06-29 3:15 ` Yongji Xie 2021-06-28 10:33 ` Liu Xiaodong 2021-06-28 10:33 ` Liu Xiaodong 2021-06-28 10:33 ` Liu Xiaodong 2021-06-28 4:35 ` Jason Wang 2021-06-28 4:35 ` Jason Wang 2021-06-28 4:35 ` Jason Wang 2021-06-28 5:54 ` Liu, Xiaodong 2021-06-28 5:54 ` Liu, Xiaodong 2021-06-28 5:54 ` Liu, Xiaodong 2021-06-29 4:10 ` Jason Wang 2021-06-29 4:10 ` Jason Wang 2021-06-29 4:10 ` Jason Wang 2021-06-29 7:56 ` Liu, Xiaodong 2021-06-29 7:56 ` Liu, Xiaodong 2021-06-29 7:56 ` Liu, Xiaodong 2021-06-29 8:14 ` Yongji Xie 2021-06-29 8:14 ` Yongji Xie 2021-06-28 10:32 ` Yongji Xie 2021-06-28 10:32 ` Yongji Xie 2021-06-28 10:32 ` Yongji Xie 2021-06-29 4:12 ` Jason Wang 2021-06-29 4:12 ` Jason Wang 2021-06-29 4:12 ` Jason Wang 2021-06-29 6:40 ` Yongji Xie 2021-06-29 6:40 ` Yongji Xie 2021-06-29 7:33 ` Jason Wang 2021-06-29 7:33 ` Jason Wang 2021-06-29 7:33 ` 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=20210615141331.407-6-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=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=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 \ /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.