From: Lu Baolu <baolu.lu@linux.intel.com>
To: Joerg Roedel <joro@8bytes.org>, Jason Gunthorpe <jgg@nvidia.com>,
Christoph Hellwig <hch@infradead.org>,
Bjorn Helgaas <bhelgaas@google.com>,
Kevin Tian <kevin.tian@intel.com>,
Ashok Raj <ashok.raj@intel.com>, Will Deacon <will@kernel.org>,
Robin Murphy <robin.murphy@arm.com>,
Jean-Philippe Brucker <jean-philippe@linaro.com>,
Dave Jiang <dave.jiang@intel.com>,
Fenghua Yu <fenghua.yu@intel.com>, Vinod Koul <vkoul@kernel.org>
Cc: Eric Auger <eric.auger@redhat.com>, Liu Yi L <yi.l.liu@intel.com>,
Jacob jun Pan <jacob.jun.pan@intel.com>,
Zhangfei Gao <zhangfei.gao@linaro.org>,
Zhu Tony <tony.zhu@intel.com>,
iommu@lists.linux.dev, linux-pci@vger.kernel.org,
linux-kernel@vger.kernel.org, Lu Baolu <baolu.lu@linux.intel.com>,
Jean-Philippe Brucker <jean-philippe@linaro.org>
Subject: [PATCH v12 12/17] arm-smmu-v3/sva: Add SVA domain support
Date: Fri, 26 Aug 2022 20:11:36 +0800 [thread overview]
Message-ID: <20220826121141.50743-13-baolu.lu@linux.intel.com> (raw)
In-Reply-To: <20220826121141.50743-1-baolu.lu@linux.intel.com>
Add support for SVA domain allocation and provide an SVA-specific
iommu_domain_ops. This implementation is based on the existing SVA
code. Possible cleanup and refactoring are left for incremental
changes later.
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Reviewed-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
Tested-by: Zhangfei Gao <zhangfei.gao@linaro.org>
---
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 13 ++++
.../iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 61 +++++++++++++++++++
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 21 ++++++-
3 files changed, 94 insertions(+), 1 deletion(-)
diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h
index d2ba86470c42..c9544b656756 100644
--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h
@@ -758,6 +758,9 @@ struct iommu_sva *arm_smmu_sva_bind(struct device *dev, struct mm_struct *mm);
void arm_smmu_sva_unbind(struct iommu_sva *handle);
u32 arm_smmu_sva_get_pasid(struct iommu_sva *handle);
void arm_smmu_sva_notifier_synchronize(void);
+struct iommu_domain *arm_smmu_sva_domain_alloc(void);
+void arm_smmu_sva_block_dev_pasid(struct iommu_domain *domain,
+ struct device *dev, ioasid_t id);
#else /* CONFIG_ARM_SMMU_V3_SVA */
static inline bool arm_smmu_sva_supported(struct arm_smmu_device *smmu)
{
@@ -803,5 +806,15 @@ static inline u32 arm_smmu_sva_get_pasid(struct iommu_sva *handle)
}
static inline void arm_smmu_sva_notifier_synchronize(void) {}
+
+static inline struct iommu_domain *arm_smmu_sva_domain_alloc(void)
+{
+ return NULL;
+}
+
+static inline void arm_smmu_sva_block_dev_pasid(struct iommu_domain *domain,
+ struct device *dev, ioasid_t id)
+{
+}
#endif /* CONFIG_ARM_SMMU_V3_SVA */
#endif /* _ARM_SMMU_V3_H */
diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c
index f155d406c5d5..953ba19a1af8 100644
--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c
@@ -549,3 +549,64 @@ void arm_smmu_sva_notifier_synchronize(void)
*/
mmu_notifier_synchronize();
}
+
+void arm_smmu_sva_block_dev_pasid(struct iommu_domain *domain,
+ struct device *dev, ioasid_t id)
+{
+ struct mm_struct *mm = domain->mm;
+ struct arm_smmu_bond *bond = NULL, *t;
+ struct arm_smmu_master *master = dev_iommu_priv_get(dev);
+
+ mutex_lock(&sva_lock);
+ list_for_each_entry(t, &master->bonds, list) {
+ if (t->mm == mm) {
+ bond = t;
+ break;
+ }
+ }
+
+ if (!WARN_ON(!bond) && refcount_dec_and_test(&bond->refs)) {
+ list_del(&bond->list);
+ arm_smmu_mmu_notifier_put(bond->smmu_mn);
+ kfree(bond);
+ }
+ mutex_unlock(&sva_lock);
+}
+
+static int arm_smmu_sva_set_dev_pasid(struct iommu_domain *domain,
+ struct device *dev, ioasid_t id)
+{
+ int ret = 0;
+ struct iommu_sva *handle;
+ struct mm_struct *mm = domain->mm;
+
+ mutex_lock(&sva_lock);
+ handle = __arm_smmu_sva_bind(dev, mm);
+ if (IS_ERR(handle))
+ ret = PTR_ERR(handle);
+ mutex_unlock(&sva_lock);
+
+ return ret;
+}
+
+static void arm_smmu_sva_domain_free(struct iommu_domain *domain)
+{
+ kfree(domain);
+}
+
+static const struct iommu_domain_ops arm_smmu_sva_domain_ops = {
+ .set_dev_pasid = arm_smmu_sva_set_dev_pasid,
+ .free = arm_smmu_sva_domain_free
+};
+
+struct iommu_domain *arm_smmu_sva_domain_alloc(void)
+{
+ struct iommu_domain *domain;
+
+ domain = kzalloc(sizeof(*domain), GFP_KERNEL);
+ if (!domain)
+ return NULL;
+ domain->ops = &arm_smmu_sva_domain_ops;
+
+ return domain;
+}
diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
index 5520a9607758..a27ce693cc65 100644
--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
@@ -2015,9 +2015,25 @@ static int blocking_domain_attach_dev(struct iommu_domain *domain,
return 0;
}
+static int blocking_domain_set_dev_pasid(struct iommu_domain *_domain,
+ struct device *dev, ioasid_t pasid)
+{
+ struct iommu_domain *domain;
+
+ domain = iommu_get_domain_for_dev_pasid(dev, pasid, IOMMU_DOMAIN_SVA);
+ if (IS_ERR(domain))
+ return PTR_ERR(domain);
+
+ if (domain)
+ arm_smmu_sva_block_dev_pasid(domain, dev, pasid);
+
+ return 0;
+}
+
static struct iommu_domain blocking_domain = {
.ops = &(const struct iommu_domain_ops) {
- .attach_dev = blocking_domain_attach_dev
+ .attach_dev = blocking_domain_attach_dev,
+ .set_dev_pasid = blocking_domain_set_dev_pasid
}
};
@@ -2028,6 +2044,9 @@ static struct iommu_domain *arm_smmu_domain_alloc(unsigned type)
if (type == IOMMU_DOMAIN_BLOCKED)
return &blocking_domain;
+ if (type == IOMMU_DOMAIN_SVA)
+ return arm_smmu_sva_domain_alloc();
+
if (type != IOMMU_DOMAIN_UNMANAGED &&
type != IOMMU_DOMAIN_DMA &&
type != IOMMU_DOMAIN_DMA_FQ &&
--
2.25.1
next prev parent reply other threads:[~2022-08-26 12:19 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-26 12:11 [PATCH v12 00/17] iommu: SVA and IOPF refactoring Lu Baolu
2022-08-26 12:11 ` [PATCH v12 01/17] iommu: Add max_pasids field in struct iommu_device Lu Baolu
2022-08-26 12:11 ` [PATCH v12 02/17] iommu: Add max_pasids field in struct dev_iommu Lu Baolu
2022-08-26 12:11 ` [PATCH v12 03/17] iommu: Remove SVM_FLAG_SUPERVISOR_MODE support Lu Baolu
2022-08-26 12:11 ` [PATCH v12 04/17] PCI: Enable PASID only when ACS RR & UF enabled on upstream path Lu Baolu
2022-08-26 14:26 ` Jason Gunthorpe
2022-08-26 12:11 ` [PATCH v12 05/17] iommu: Add attach/detach_dev_pasid iommu interface Lu Baolu
2022-08-26 14:37 ` Jason Gunthorpe
2022-08-28 12:52 ` Baolu Lu
2022-08-26 12:11 ` [PATCH v12 06/17] iommu: Add IOMMU SVA domain support Lu Baolu
2022-08-26 12:11 ` [PATCH v12 07/17] iommu: Try to allocate blocking domain when probing device Lu Baolu
2022-08-26 14:52 ` Jason Gunthorpe
2022-08-29 3:40 ` Baolu Lu
2022-08-29 17:27 ` Jason Gunthorpe
2022-08-30 1:46 ` Baolu Lu
2022-08-30 13:29 ` Jason Gunthorpe
2022-08-31 1:49 ` Baolu Lu
2022-08-31 14:10 ` Jason Gunthorpe
2022-09-01 10:44 ` Baolu Lu
2022-09-02 12:48 ` Jason Gunthorpe
2022-08-26 12:11 ` [PATCH v12 08/17] iommu: Make free of iommu_domain_ops optional Lu Baolu
2022-08-26 14:53 ` Jason Gunthorpe
2022-08-26 14:55 ` Jason Gunthorpe
2022-08-26 12:11 ` [PATCH v12 09/17] iommu/vt-d: Add blocking domain support Lu Baolu
2022-08-26 14:54 ` Jason Gunthorpe
2022-08-28 12:55 ` Baolu Lu
2022-08-26 12:11 ` [PATCH v12 10/17] iommu/vt-d: Add SVA " Lu Baolu
2022-08-26 12:11 ` [PATCH v12 11/17] arm-smmu-v3: Add blocking " Lu Baolu
2022-08-26 14:31 ` Jason Gunthorpe
2022-08-26 12:11 ` Lu Baolu [this message]
2022-08-26 14:56 ` [PATCH v12 12/17] arm-smmu-v3/sva: Add SVA " Jason Gunthorpe
2022-08-28 13:57 ` Baolu Lu
2022-08-29 17:29 ` Jason Gunthorpe
2022-08-30 2:04 ` Baolu Lu
2022-08-26 12:11 ` [PATCH v12 13/17] iommu/sva: Refactoring iommu_sva_bind/unbind_device() Lu Baolu
2022-08-30 7:30 ` Yuan Can
2022-08-30 7:45 ` Baolu Lu
2022-08-30 7:46 ` Baolu Lu
2022-08-26 12:11 ` [PATCH v12 14/17] iommu: Remove SVA related callbacks from iommu ops Lu Baolu
2022-08-26 12:11 ` [PATCH v12 15/17] iommu: Prepare IOMMU domain for IOPF Lu Baolu
2022-08-26 12:11 ` [PATCH v12 16/17] iommu: Per-domain I/O page fault handling Lu Baolu
2022-08-26 12:11 ` [PATCH v12 17/17] iommu: Rename iommu-sva-lib.{c,h} Lu Baolu
2022-08-26 15:50 ` [PATCH v12 00/17] iommu: SVA and IOPF refactoring Jason Gunthorpe
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=20220826121141.50743-13-baolu.lu@linux.intel.com \
--to=baolu.lu@linux.intel.com \
--cc=ashok.raj@intel.com \
--cc=bhelgaas@google.com \
--cc=dave.jiang@intel.com \
--cc=eric.auger@redhat.com \
--cc=fenghua.yu@intel.com \
--cc=hch@infradead.org \
--cc=iommu@lists.linux.dev \
--cc=jacob.jun.pan@intel.com \
--cc=jean-philippe@linaro.com \
--cc=jean-philippe@linaro.org \
--cc=jgg@nvidia.com \
--cc=joro@8bytes.org \
--cc=kevin.tian@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=robin.murphy@arm.com \
--cc=tony.zhu@intel.com \
--cc=vkoul@kernel.org \
--cc=will@kernel.org \
--cc=yi.l.liu@intel.com \
--cc=zhangfei.gao@linaro.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox