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>,
Kevin Tian <kevin.tian@intel.com>, Jason Gunthorpe <jgg@ziepe.ca>
Cc: Tina Zhang <tina.zhang@intel.com>, Yi Liu <yi.l.liu@intel.com>,
iommu@lists.linux.dev, linux-kernel@vger.kernel.org,
Jason Gunthorpe <jgg@nvidia.com>,
Vasant Hegde <vasant.hegde@amd.com>,
Lu Baolu <baolu.lu@linux.intel.com>
Subject: [PATCH 11/12] iommu: Add ops->domain_alloc_sva()
Date: Mon, 25 Mar 2024 10:17:04 +0800 [thread overview]
Message-ID: <20240325021705.249769-12-baolu.lu@linux.intel.com> (raw)
In-Reply-To: <20240325021705.249769-1-baolu.lu@linux.intel.com>
From: Jason Gunthorpe <jgg@nvidia.com>
Make a new op that receives the device and the mm_struct that the SVA
domain should be created for. Unlike domain_alloc_paging() the dev
argument is never NULL here.
This allows drivers to fully initialize the SVA domain and allocate the
mmu_notifier during allocation. It allows the notifier lifetime to follow
the lifetime of the iommu_domain.
Since we have only one call site, upgrade the new op to return ERR_PTR
instead of NULL.
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
[Removed smmu3 related changes - Vasant]
Signed-off-by: Vasant Hegde <vasant.hegde@amd.com>
Reviewed-by: Tina Zhang <tina.zhang@intel.com>
Link: https://lore.kernel.org/r/20240311090843.133455-15-vasant.hegde@amd.com
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
---
include/linux/iommu.h | 3 +++
drivers/iommu/iommu-sva.c | 16 +++++++++++-----
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index 2e925b5eba53..8aabe83af8f2 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -518,6 +518,7 @@ static inline int __iommu_copy_struct_from_user_array(
* Upon failure, ERR_PTR must be returned.
* @domain_alloc_paging: Allocate an iommu_domain that can be used for
* UNMANAGED, DMA, and DMA_FQ domain types.
+ * @domain_alloc_sva: Allocate an iommu_domain for Shared Virtual Addressing.
* @probe_device: Add device to iommu driver handling
* @release_device: Remove device from iommu driver handling
* @probe_finalize: Do final setup work after the device is added to an IOMMU
@@ -558,6 +559,8 @@ struct iommu_ops {
struct device *dev, u32 flags, struct iommu_domain *parent,
const struct iommu_user_data *user_data);
struct iommu_domain *(*domain_alloc_paging)(struct device *dev);
+ struct iommu_domain *(*domain_alloc_sva)(struct device *dev,
+ struct mm_struct *mm);
struct iommu_device *(*probe_device)(struct device *dev);
void (*release_device)(struct device *dev);
diff --git a/drivers/iommu/iommu-sva.c b/drivers/iommu/iommu-sva.c
index 640acc804e8c..18a35e798b72 100644
--- a/drivers/iommu/iommu-sva.c
+++ b/drivers/iommu/iommu-sva.c
@@ -108,8 +108,8 @@ struct iommu_sva *iommu_sva_bind_device(struct device *dev, struct mm_struct *mm
/* Allocate a new domain and set it on device pasid. */
domain = iommu_sva_domain_alloc(dev, mm);
- if (!domain) {
- ret = -ENOMEM;
+ if (IS_ERR(domain)) {
+ ret = PTR_ERR(domain);
goto out_free_handle;
}
@@ -283,9 +283,15 @@ struct iommu_domain *iommu_sva_domain_alloc(struct device *dev,
const struct iommu_ops *ops = dev_iommu_ops(dev);
struct iommu_domain *domain;
- domain = ops->domain_alloc(IOMMU_DOMAIN_SVA);
- if (!domain)
- return NULL;
+ if (ops->domain_alloc_sva) {
+ domain = ops->domain_alloc_sva(dev, mm);
+ if (IS_ERR(domain))
+ return domain;
+ } else {
+ domain = ops->domain_alloc(IOMMU_DOMAIN_SVA);
+ if (!domain)
+ return ERR_PTR(-ENOMEM);
+ }
domain->type = IOMMU_DOMAIN_SVA;
mmgrab(mm);
--
2.34.1
next prev parent reply other threads:[~2024-03-25 2:18 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-25 2:16 [PATCH 00/12] Consolidate domain cache invalidation Lu Baolu
2024-03-25 2:16 ` [PATCH 01/12] iommu/vt-d: Add cache tag assignment interface Lu Baolu
2024-03-28 7:12 ` Tian, Kevin
2024-04-06 12:55 ` Baolu Lu
2024-04-07 4:35 ` Baolu Lu
2024-04-08 2:28 ` Tian, Kevin
2024-04-10 15:41 ` Jason Gunthorpe
2024-04-10 23:14 ` Tian, Kevin
2024-04-11 13:17 ` Baolu Lu
2024-04-11 13:42 ` Jason Gunthorpe
2024-04-11 12:10 ` Baolu Lu
2024-04-11 12:38 ` Baolu Lu
2024-04-12 3:38 ` Tian, Kevin
2024-03-25 2:16 ` [PATCH 02/12] iommu/vt-d: Add cache tag invalidation helpers Lu Baolu
2024-03-28 7:39 ` Tian, Kevin
2024-04-07 5:33 ` Baolu Lu
2024-04-08 2:33 ` Tian, Kevin
2024-04-08 2:53 ` Baolu Lu
2024-04-08 3:14 ` Tian, Kevin
2024-03-25 2:16 ` [PATCH 03/12] iommu/vt-d: Add trace events for cache tag interface Lu Baolu
2024-03-25 2:16 ` [PATCH 04/12] iommu/vt-d: Use cache_tag_flush_all() in flush_iotlb_all Lu Baolu
2024-03-28 7:47 ` Tian, Kevin
2024-04-07 5:56 ` Baolu Lu
2024-03-25 2:16 ` [PATCH 05/12] iommu/vt-d: Use cache_tag_flush_range() in tlb_sync Lu Baolu
2024-03-25 2:16 ` [PATCH 06/12] iommu/vt-d: Use cache_tag_flush_cm_range() in iotlb_sync_map Lu Baolu
2024-03-28 7:48 ` Tian, Kevin
2024-04-07 6:41 ` Baolu Lu
2024-04-08 2:51 ` Tian, Kevin
2024-04-08 2:57 ` Baolu Lu
2024-03-25 2:17 ` [PATCH 07/12] iommu/vt-d: Cleanup use of iommu_flush_iotlb_psi() Lu Baolu
2024-03-28 7:50 ` Tian, Kevin
2024-04-07 7:06 ` Baolu Lu
2024-04-08 2:57 ` Tian, Kevin
2024-03-25 2:17 ` [PATCH 08/12] iommu/vt-d: Use cache_tag_flush_range() in cache_invalidate_user Lu Baolu
2024-03-28 7:54 ` Tian, Kevin
2024-04-07 7:15 ` Baolu Lu
2024-03-25 2:17 ` [PATCH 09/12] iommu/vt-d: Use cache helpers in arch_invalidate_secondary_tlbs Lu Baolu
2024-03-25 2:17 ` [PATCH 10/12] iommu/vt-d: Retire intel_svm_dev Lu Baolu
2024-03-25 2:17 ` Lu Baolu [this message]
2024-03-25 2:17 ` [PATCH 12/12] iommu/vt-d: Retire struct intel_svm Lu Baolu
2024-03-28 7:59 ` [PATCH 00/12] Consolidate domain cache invalidation Tian, Kevin
2024-04-07 7:28 ` Baolu Lu
2024-04-08 3:03 ` Tian, Kevin
2024-04-08 3:05 ` Baolu Lu
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=20240325021705.249769-12-baolu.lu@linux.intel.com \
--to=baolu.lu@linux.intel.com \
--cc=iommu@lists.linux.dev \
--cc=jgg@nvidia.com \
--cc=jgg@ziepe.ca \
--cc=joro@8bytes.org \
--cc=kevin.tian@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=robin.murphy@arm.com \
--cc=tina.zhang@intel.com \
--cc=vasant.hegde@amd.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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).