All of lore.kernel.org
 help / color / mirror / Atom feed
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
Cc: 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 v7 07/12] vdpa: Add an opaque pointer for vdpa_config_ops.dma_map()
Date: Mon, 17 May 2021 17:55:08 +0800	[thread overview]
Message-ID: <20210517095513.850-8-xieyongji@bytedance.com> (raw)
In-Reply-To: <20210517095513.850-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 a1496c596120..1dd8e07554f8 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
Cc: kvm@vger.kernel.org, netdev@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	virtualization@lists.linux-foundation.org,
	iommu@lists.linux-foundation.org, linux-fsdevel@vger.kernel.org
Subject: [PATCH v7 07/12] vdpa: Add an opaque pointer for vdpa_config_ops.dma_map()
Date: Mon, 17 May 2021 17:55:08 +0800	[thread overview]
Message-ID: <20210517095513.850-8-xieyongji@bytedance.com> (raw)
In-Reply-To: <20210517095513.850-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 a1496c596120..1dd8e07554f8 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

  parent reply	other threads:[~2021-05-17  9:56 UTC|newest]

Thread overview: 123+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-17  9:55 [PATCH v7 00/12] Introduce VDUSE - vDPA Device in Userspace Xie Yongji
2021-05-17  9:55 ` Xie Yongji
2021-05-17  9:55 ` [PATCH v7 01/12] iova: Export alloc_iova_fast() Xie Yongji
2021-05-17  9:55   ` Xie Yongji
2021-05-26  2:36   ` Jason Wang
2021-05-26  2:36     ` Jason Wang
2021-05-26  2:36     ` Jason Wang
2021-05-26  2:43     ` Yongji Xie
2021-05-26  2:43       ` Yongji Xie
2021-05-17  9:55 ` [PATCH v7 02/12] file: Export receive_fd() to modules Xie Yongji
2021-05-17  9:55   ` Xie Yongji
2021-05-20  6:18   ` Al Viro
2021-05-20  6:18     ` Al Viro
2021-05-20  6:18     ` Al Viro
2021-05-20  6:32     ` Yongji Xie
2021-05-20  6:32       ` Yongji Xie
2021-05-17  9:55 ` [PATCH v7 03/12] eventfd: Increase the recursion depth of eventfd_signal() Xie Yongji
2021-05-17  9:55   ` Xie Yongji
2021-05-17  9:55 ` [PATCH v7 04/12] virtio-blk: Add validation for block size in config space Xie Yongji
2021-05-17  9:55   ` Xie Yongji
2021-05-19 13:39   ` Yongji Xie
2021-05-19 13:39     ` Yongji Xie
2021-05-19 14:42     ` Dan Carpenter
2021-05-19 14:42       ` Dan Carpenter
2021-05-19 14:42       ` Dan Carpenter
2021-05-20  5:25       ` Yongji Xie
2021-05-20  5:25         ` Yongji Xie
2021-05-20  5:43         ` Michael S. Tsirkin
2021-05-20  5:43           ` Michael S. Tsirkin
2021-05-20  5:43           ` Michael S. Tsirkin
2021-05-20  7:08           ` Yongji Xie
2021-05-20  7:08             ` Yongji Xie
2021-05-17  9:55 ` [PATCH v7 05/12] virtio_scsi: Add validation for residual bytes from response Xie Yongji
2021-05-17  9:55   ` Xie Yongji
2021-05-26  2:41   ` Jason Wang
2021-05-26  2:41     ` Jason Wang
2021-05-26  2:41     ` Jason Wang
2021-05-17  9:55 ` [PATCH v7 06/12] vhost-iotlb: Add an opaque pointer for vhost IOTLB Xie Yongji
2021-05-17  9:55   ` Xie Yongji
2021-05-17  9:55 ` Xie Yongji [this message]
2021-05-17  9:55   ` [PATCH v7 07/12] vdpa: Add an opaque pointer for vdpa_config_ops.dma_map() Xie Yongji
2021-05-17  9:55 ` [PATCH v7 08/12] vdpa: factor out vhost_vdpa_pa_map() and vhost_vdpa_pa_unmap() Xie Yongji
2021-05-17  9:55   ` Xie Yongji
2021-05-17  9:55 ` [PATCH v7 09/12] vdpa: Support transferring virtual addressing during DMA mapping Xie Yongji
2021-05-17  9:55   ` Xie Yongji
2021-05-17  9:55 ` [PATCH v7 10/12] vduse: Implement an MMU-based IOMMU driver Xie Yongji
2021-05-17  9:55   ` Xie Yongji
2021-05-17  9:55 ` [PATCH v7 11/12] vduse: Introduce VDUSE - vDPA Device in Userspace Xie Yongji
2021-05-17  9:55   ` Xie Yongji
2021-05-20  6:28   ` Al Viro
2021-05-20  6:28     ` Al Viro
2021-05-20  6:28     ` Al Viro
2021-05-20  7:03     ` Yongji Xie
2021-05-20  7:03       ` Yongji Xie
2021-05-27  4:12   ` Jason Wang
2021-05-27  4:12     ` Jason Wang
2021-05-27  4:12     ` Jason Wang
2021-05-27  4:57     ` Yongji Xie
2021-05-27  4:57       ` Yongji Xie
2021-05-27  5:00       ` Jason Wang
2021-05-27  5:00         ` Jason Wang
2021-05-27  5:00         ` Jason Wang
2021-05-27  5:08         ` Yongji Xie
2021-05-27  5:08           ` Yongji Xie
2021-05-27  5:40           ` Jason Wang
2021-05-27  5:40             ` Jason Wang
2021-05-27  5:40             ` Jason Wang
2021-05-27  7:34             ` Yongji Xie
2021-05-27  7:34               ` Yongji Xie
2021-05-27  8:41               ` Jason Wang
2021-05-27  8:41                 ` Jason Wang
2021-05-27  8:41                 ` Jason Wang
2021-05-27  8:43                 ` Jason Wang
2021-05-27  8:43                   ` Jason Wang
2021-05-27  8:43                   ` Jason Wang
2021-05-27 10:14                   ` Yongji Xie
2021-05-27 10:14                     ` Yongji Xie
2021-05-28  1:33                     ` Jason Wang
2021-05-28  1:33                       ` Jason Wang
2021-05-28  1:33                       ` Jason Wang
2021-05-28  3:54                       ` Yongji Xie
2021-05-28  3:54                         ` Yongji Xie
2021-05-28  6:38                         ` Jason Wang
2021-05-28  6:38                           ` Jason Wang
2021-05-28  6:38                           ` Jason Wang
2021-05-27 13:17                 ` Yongji Xie
2021-05-27 13:17                   ` Yongji Xie
2021-05-28  2:31                   ` Jason Wang
2021-05-28  2:31                     ` Jason Wang
2021-05-28  2:31                     ` Jason Wang
2021-05-31  4:27                     ` Yongji Xie
2021-05-31  4:27                       ` Yongji Xie
2021-05-31  4:38                       ` Jason Wang
2021-05-31  4:38                         ` Jason Wang
2021-05-31  4:38                         ` Jason Wang
2021-05-31  6:24                         ` Yongji Xie
2021-05-31  6:24                           ` Yongji Xie
2021-05-31  4:56   ` Greg KH
2021-05-31  4:56     ` Greg KH
2021-05-31  4:56     ` Greg KH
2021-05-31  6:19     ` Yongji Xie
2021-05-31  6:19       ` Yongji Xie
2021-05-31  6:32       ` Greg KH
2021-05-31  6:32         ` Greg KH
2021-05-31  6:32         ` Greg KH
2021-05-31  7:13         ` Yongji Xie
2021-05-31  7:13           ` Yongji Xie
2021-05-17  9:55 ` [PATCH v7 12/12] Documentation: Add documentation for VDUSE Xie Yongji
2021-05-17  9:55   ` Xie Yongji
2021-05-20  6:06 ` [PATCH v7 00/12] Introduce VDUSE - vDPA Device in Userspace Michael S. Tsirkin
2021-05-20  6:06   ` Michael S. Tsirkin
2021-05-20  6:06   ` Michael S. Tsirkin
2021-05-20  9:06   ` Yongji Xie
2021-05-20  9:06     ` Yongji Xie
2021-05-25  6:40     ` Jason Wang
2021-05-25  6:40       ` Jason Wang
2021-05-25  6:40       ` Jason Wang
2021-05-25  6:48       ` Michael S. Tsirkin
2021-05-25  6:48         ` Michael S. Tsirkin
2021-05-25  6:48         ` Michael S. Tsirkin
2021-05-25  7:11         ` Jason Wang
2021-05-25  7:11           ` Jason Wang
2021-05-25  7:11           ` 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=20210517095513.850-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=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=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: link
Be 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.