public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Lu Baolu <baolu.lu@linux.intel.com>
To: Joerg Roedel <joro@8bytes.org>, Will Deacon <will@kernel.org>,
	Robin Murphy <robin.murphy@arm.com>,
	Jason Gunthorpe <jgg@ziepe.ca>, Kevin Tian <kevin.tian@intel.com>
Cc: Yi Liu <yi.l.liu@intel.com>, David Airlie <airlied@gmail.com>,
	Daniel Vetter <daniel@ffwll.ch>, Kalle Valo <kvalo@kernel.org>,
	Bjorn Andersson <andersson@kernel.org>,
	Mathieu Poirier <mathieu.poirier@linaro.org>,
	Alex Williamson <alex.williamson@redhat.com>,
	mst@redhat.com, Jason Wang <jasowang@redhat.com>,
	Thierry Reding <thierry.reding@gmail.com>,
	Jonathan Hunter <jonathanh@nvidia.com>,
	Mikko Perttunen <mperttunen@nvidia.com>,
	iommu@lists.linux.dev, dri-devel@lists.freedesktop.org,
	linux-kernel@vger.kernel.org, Lu Baolu <baolu.lu@linux.intel.com>
Subject: [PATCH v2 04/22] vhost-vdpa: Use iommu_user_domain_alloc()
Date: Tue,  4 Jun 2024 09:51:16 +0800	[thread overview]
Message-ID: <20240604015134.164206-5-baolu.lu@linux.intel.com> (raw)
In-Reply-To: <20240604015134.164206-1-baolu.lu@linux.intel.com>

Replace iommu_domain_alloc() with iommu_user_domain_alloc().

Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
---
 drivers/vhost/vdpa.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/drivers/vhost/vdpa.c b/drivers/vhost/vdpa.c
index 63a53680a85c..d15673cb05f2 100644
--- a/drivers/vhost/vdpa.c
+++ b/drivers/vhost/vdpa.c
@@ -1312,26 +1312,24 @@ static int vhost_vdpa_alloc_domain(struct vhost_vdpa *v)
 	struct vdpa_device *vdpa = v->vdpa;
 	const struct vdpa_config_ops *ops = vdpa->config;
 	struct device *dma_dev = vdpa_get_dma_dev(vdpa);
-	const struct bus_type *bus;
 	int ret;
 
 	/* Device want to do DMA by itself */
 	if (ops->set_map || ops->dma_map)
 		return 0;
 
-	bus = dma_dev->bus;
-	if (!bus)
-		return -EFAULT;
-
 	if (!device_iommu_capable(dma_dev, IOMMU_CAP_CACHE_COHERENCY)) {
 		dev_warn_once(&v->dev,
 			      "Failed to allocate domain, device is not IOMMU cache coherent capable\n");
 		return -ENOTSUPP;
 	}
 
-	v->domain = iommu_domain_alloc(bus);
-	if (!v->domain)
-		return -EIO;
+	v->domain = iommu_user_domain_alloc(dma_dev, 0);
+	if (IS_ERR(v->domain)) {
+		ret = PTR_ERR(v->domain);
+		v->domain = NULL;
+		return ret;
+	}
 
 	ret = iommu_attach_device(v->domain, dma_dev);
 	if (ret)
-- 
2.34.1


  parent reply	other threads:[~2024-06-04  1:54 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-04  1:51 [PATCH v2 00/22] iommu: Refactoring domain allocation interface Lu Baolu
2024-06-04  1:51 ` [PATCH v2 01/22] iommu: Add iommu_user_domain_alloc() interface Lu Baolu
2024-06-04  8:03   ` Yi Liu
2024-06-05  2:00     ` Baolu Lu
2024-06-05  6:23       ` Yi Liu
2024-06-06  2:04         ` Baolu Lu
2024-06-04  1:51 ` [PATCH v2 02/22] iommufd: Use iommu_user_domain_alloc() Lu Baolu
2024-06-04 16:51   ` Jason Gunthorpe
2024-06-05  2:17     ` Baolu Lu
2024-06-05 12:02       ` Jason Gunthorpe
2024-06-04  1:51 ` [PATCH v2 03/22] vfio/type1: " Lu Baolu
2024-06-04  1:51 ` Lu Baolu [this message]
2024-06-04  1:51 ` [PATCH v2 05/22] iommu: Add iommu_paging_domain_alloc() interface Lu Baolu
2024-06-04  1:51 ` [PATCH v2 06/22] drm/msm: Use iommu_paging_domain_alloc() Lu Baolu
2024-06-04  7:48   ` Dmitry Baryshkov
2024-06-04  1:51 ` [PATCH v2 07/22] drm/nouveau/tegra: " Lu Baolu
2024-06-04  1:51 ` [PATCH v2 08/22] gpu: host1x: " Lu Baolu
2024-06-04  1:51 ` [PATCH v2 09/22] media: nvidia: tegra: " Lu Baolu
2024-06-04  1:51 ` [PATCH v2 10/22] media: venus: firmware: " Lu Baolu
2024-06-04  1:51 ` [PATCH v2 11/22] ath10k: " Lu Baolu
2024-06-04 13:35   ` Jeff Johnson
2024-06-04 13:39   ` Jeff Johnson
2024-06-04  1:51 ` [PATCH v2 12/22] wifi: ath11k: " Lu Baolu
2024-06-04  8:19   ` Kalle Valo
2024-06-04 13:34   ` Jeff Johnson
2024-06-04  1:51 ` [PATCH v2 13/22] remoteproc: " Lu Baolu
2024-06-04  1:51 ` [PATCH v2 14/22] soc/fsl/qbman: " Lu Baolu
2024-06-04  1:51 ` [PATCH v2 15/22] RDMA/usnic: " Lu Baolu
2024-06-04 16:44   ` Jason Gunthorpe
2024-06-04  1:51 ` [PATCH v2 16/22] iommu/vt-d: Add helper to allocate paging domain Lu Baolu
2024-06-04  1:51 ` [PATCH v2 17/22] ARM: dma-mapping: Pass device to arm_iommu_create_mapping() Lu Baolu
2024-06-04  1:51 ` [PATCH v2 18/22] ARM: dma-mapping: Use iommu_paging_domain_alloc() Lu Baolu
2024-06-04  1:51 ` [PATCH v2 19/22] drm/rockchip: " Lu Baolu
2024-06-04  1:51 ` [PATCH v2 20/22] drm/tegra: Remove call to iommu_domain_alloc() Lu Baolu
2024-06-04  1:51 ` [PATCH v2 21/22] iommu: Remove iommu_present() Lu Baolu
2024-06-04  1:51 ` [PATCH v2 22/22] iommu: Remove iommu_domain_alloc() Lu Baolu

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=20240604015134.164206-5-baolu.lu@linux.intel.com \
    --to=baolu.lu@linux.intel.com \
    --cc=airlied@gmail.com \
    --cc=alex.williamson@redhat.com \
    --cc=andersson@kernel.org \
    --cc=daniel@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=iommu@lists.linux.dev \
    --cc=jasowang@redhat.com \
    --cc=jgg@ziepe.ca \
    --cc=jonathanh@nvidia.com \
    --cc=joro@8bytes.org \
    --cc=kevin.tian@intel.com \
    --cc=kvalo@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mathieu.poirier@linaro.org \
    --cc=mperttunen@nvidia.com \
    --cc=mst@redhat.com \
    --cc=robin.murphy@arm.com \
    --cc=thierry.reding@gmail.com \
    --cc=will@kernel.org \
    --cc=yi.l.liu@intel.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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox