From: Nicolin Chen <nicolinc@nvidia.com>
To: <jgg@nvidia.com>, <robin.murphy@arm.com>, <will@kernel.org>
Cc: <eric.auger@redhat.com>, <kevin.tian@intel.com>,
<baolu.lu@linux.intel.com>, <joro@8bytes.org>,
<shameerali.kolothum.thodi@huawei.com>,
<jean-philippe@linaro.org>,
<linux-arm-kernel@lists.infradead.org>, <iommu@lists.linux.dev>,
<linux-kernel@vger.kernel.org>
Subject: [PATCH v1 12/14] iommu/arm-smmu-v3: Support IOMMU_DOMAIN_NESTED type of allocations
Date: Thu, 9 Mar 2023 02:53:48 -0800 [thread overview]
Message-ID: <b01b2bad6d0d34908812d964eba118a9cc1e89ab.1678348754.git.nicolinc@nvidia.com> (raw)
In-Reply-To: <cover.1678348754.git.nicolinc@nvidia.com>
Add domain allocation support for IOMMU_DOMAIN_NESTED type. This includes
the "finalise" part to log in the user space Stream Table Entry info.
Co-developed-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Nicolin Chen <nicolinc@nvidia.com>
---
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 38 +++++++++++++++++++--
1 file changed, 36 insertions(+), 2 deletions(-)
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 5ff74edfbd68..1f318b5e0921 100644
--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
@@ -2214,6 +2214,19 @@ static int arm_smmu_domain_finalise(struct iommu_domain *domain,
return 0;
}
+ if (domain->type == IOMMU_DOMAIN_NESTED) {
+ if (!(smmu->features & ARM_SMMU_FEAT_TRANS_S1) ||
+ !(smmu->features & ARM_SMMU_FEAT_TRANS_S2)) {
+ dev_dbg(smmu->dev, "does not implement two stages\n");
+ return -EINVAL;
+ }
+ smmu_domain->stage = ARM_SMMU_DOMAIN_S1;
+ smmu_domain->s1_cfg.s1fmt = user_cfg->s1fmt;
+ smmu_domain->s1_cfg.s1cdmax = user_cfg->s1cdmax;
+ smmu_domain->s1_cfg.cdcfg.cdtab_dma = user_cfg->s1ctxptr;
+ return 0;
+ }
+
if (user_cfg_s2 && !(smmu->features & ARM_SMMU_FEAT_TRANS_S2))
return -EINVAL;
if (user_cfg_s2)
@@ -2863,6 +2876,11 @@ static void arm_smmu_remove_dev_pasid(struct device *dev, ioasid_t pasid)
arm_smmu_sva_remove_dev_pasid(domain, dev, pasid);
}
+static const struct iommu_domain_ops arm_smmu_nested_domain_ops = {
+ .attach_dev = arm_smmu_attach_dev,
+ .free = arm_smmu_domain_free,
+};
+
static struct iommu_domain *
__arm_smmu_domain_alloc(unsigned type,
struct arm_smmu_domain *s2,
@@ -2877,11 +2895,15 @@ __arm_smmu_domain_alloc(unsigned type,
return arm_smmu_sva_domain_alloc();
if (type != IOMMU_DOMAIN_UNMANAGED &&
+ type != IOMMU_DOMAIN_NESTED &&
type != IOMMU_DOMAIN_DMA &&
type != IOMMU_DOMAIN_DMA_FQ &&
type != IOMMU_DOMAIN_IDENTITY)
return NULL;
+ if (s2 && s2->stage != ARM_SMMU_DOMAIN_S2)
+ return NULL;
+
/*
* Allocate the domain and initialise some of its data structures.
* We can't really finalise the domain unless a master is given.
@@ -2889,10 +2911,14 @@ __arm_smmu_domain_alloc(unsigned type,
smmu_domain = kzalloc(sizeof(*smmu_domain), GFP_KERNEL);
if (!smmu_domain)
return NULL;
+ smmu_domain->s2 = s2;
domain = &smmu_domain->domain;
domain->type = type;
- domain->ops = arm_smmu_ops.default_domain_ops;
+ if (s2)
+ domain->ops = &arm_smmu_nested_domain_ops;
+ else
+ domain->ops = arm_smmu_ops.default_domain_ops;
mutex_init(&smmu_domain->init_mutex);
INIT_LIST_HEAD(&smmu_domain->devices);
@@ -2923,8 +2949,16 @@ arm_smmu_domain_alloc_user(struct device *dev, struct iommu_domain *parent,
const struct iommu_hwpt_arm_smmuv3 *user_cfg = user_data;
struct arm_smmu_master *master = dev_iommu_priv_get(dev);
unsigned type = IOMMU_DOMAIN_UNMANAGED;
+ struct arm_smmu_domain *s2 = NULL;
+
+ if (parent) {
+ if (parent->ops != arm_smmu_ops.default_domain_ops)
+ return NULL;
+ type = IOMMU_DOMAIN_NESTED;
+ s2 = to_smmu_domain(parent);
+ }
- return __arm_smmu_domain_alloc(type, NULL, master, user_cfg);
+ return __arm_smmu_domain_alloc(type, s2, master, user_cfg);
}
static struct iommu_ops arm_smmu_ops = {
--
2.39.2
next prev parent reply other threads:[~2023-03-09 10:55 UTC|newest]
Thread overview: 165+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-09 10:53 [PATCH v1 00/14] Add Nested Translation Support for SMMUv3 Nicolin Chen
2023-03-09 10:53 ` [PATCH v1 01/14] iommu: Add iommu_get_unmanaged_domain helper Nicolin Chen
2023-03-09 12:51 ` Robin Murphy
2023-03-09 14:19 ` Jason Gunthorpe
2023-03-09 19:04 ` Robin Murphy
2023-03-10 0:23 ` Jason Gunthorpe
2023-03-10 8:41 ` Eric Auger
2023-03-10 15:55 ` Jason Gunthorpe
2023-03-16 1:21 ` Nicolin Chen
2023-03-16 18:42 ` Robin Murphy
2023-03-16 20:01 ` Nicolin Chen
2023-03-20 12:51 ` Jason Gunthorpe
2023-03-10 10:14 ` Eric Auger
2023-03-10 15:33 ` Jason Gunthorpe
2023-03-10 15:44 ` Shameerali Kolothum Thodi
2023-03-10 15:56 ` Jason Gunthorpe
2023-03-10 16:07 ` Shameerali Kolothum Thodi
2023-03-10 16:21 ` Jason Gunthorpe
2023-03-10 16:30 ` Shameerali Kolothum Thodi
2023-03-10 17:03 ` Jason Gunthorpe
2023-03-22 16:07 ` Eric Auger
2023-03-22 17:02 ` Jason Gunthorpe
2023-03-22 17:41 ` Eric Auger
2023-03-22 18:07 ` Jason Gunthorpe
2023-03-16 19:51 ` Nicolin Chen
2023-03-16 19:56 ` Shameerali Kolothum Thodi
2023-03-22 15:44 ` Eric Auger
2023-03-09 10:53 ` [PATCH v1 02/14] iommufd: Add nesting related data structures for ARM SMMUv3 Nicolin Chen
2023-03-09 13:42 ` Jean-Philippe Brucker
2023-03-09 14:48 ` Jason Gunthorpe
2023-03-09 18:26 ` Jean-Philippe Brucker
2023-03-09 21:01 ` Jason Gunthorpe
2023-03-10 12:16 ` Jean-Philippe Brucker
2023-03-10 14:52 ` Robin Murphy
2023-03-10 15:25 ` Jason Gunthorpe
2023-03-10 15:57 ` Robin Murphy
2023-03-10 16:03 ` Jason Gunthorpe
2023-03-17 10:10 ` Tian, Kevin
2023-03-17 10:04 ` Tian, Kevin
2023-03-10 4:50 ` Nicolin Chen
2023-03-10 12:54 ` Jean-Philippe Brucker
2023-03-10 14:00 ` Jason Gunthorpe
2023-03-10 16:06 ` Jason Gunthorpe
2023-03-16 0:59 ` Nicolin Chen
2023-03-09 15:26 ` Shameerali Kolothum Thodi
2023-03-09 15:40 ` Jason Gunthorpe
2023-03-09 15:51 ` Shameerali Kolothum Thodi
2023-03-09 15:59 ` Jason Gunthorpe
2023-03-09 16:07 ` Shameerali Kolothum Thodi
2023-03-10 5:26 ` Nicolin Chen
2023-03-10 5:36 ` Nicolin Chen
2023-03-10 12:55 ` Jason Gunthorpe
2023-03-10 5:18 ` Nicolin Chen
2023-03-10 5:04 ` Nicolin Chen
2023-03-10 11:33 ` Eric Auger
2023-03-10 12:51 ` Jason Gunthorpe
2023-03-17 10:17 ` Tian, Kevin
2023-03-09 10:53 ` [PATCH v1 03/14] iommufd/device: Setup MSI on kernel-managed domains Nicolin Chen
2023-03-10 16:45 ` Eric Auger
2023-03-11 0:17 ` Nicolin Chen
2023-03-09 10:53 ` [PATCH v1 04/14] iommu/arm-smmu-v3: Add arm_smmu_hw_info Nicolin Chen
2023-03-09 13:03 ` Robin Murphy
2023-03-10 1:17 ` Nicolin Chen
2023-03-10 15:28 ` Robin Murphy
2023-03-16 0:13 ` Nicolin Chen
2023-03-16 15:19 ` Robin Murphy
2023-03-16 20:06 ` Nicolin Chen
2023-04-12 7:47 ` Nicolin Chen
2023-03-09 10:53 ` [PATCH v1 05/14] iommu/arm-smmu-v3: Remove ARM_SMMU_DOMAIN_NESTED Nicolin Chen
2023-03-10 16:39 ` Eric Auger
2023-03-10 17:05 ` Jason Gunthorpe
2023-03-11 0:24 ` Nicolin Chen
2023-03-11 0:23 ` Nicolin Chen
2023-03-09 10:53 ` [PATCH v1 06/14] iommu/arm-smmu-v3: Unset corresponding STE fields when s2_cfg is NULL Nicolin Chen
2023-03-09 13:13 ` Robin Murphy
2023-03-09 18:24 ` Shameerali Kolothum Thodi
2023-03-10 1:54 ` Nicolin Chen
2023-03-09 10:53 ` [PATCH v1 07/14] iommu/arm-smmu-v3: Add STRTAB_STE_0_CFG_NESTED for 2-stage translation Nicolin Chen
2023-03-09 10:53 ` [PATCH v1 08/14] iommu/arm-smmu-v3: Prepare for nested domain support Nicolin Chen
2023-03-10 20:39 ` Robin Murphy
2023-03-11 12:40 ` Nicolin Chen
2023-03-09 10:53 ` [PATCH v1 09/14] iommu/arm-smmu-v3: Implement arm_smmu_get_unmanaged_domain Nicolin Chen
2023-03-09 10:53 ` [PATCH v1 10/14] iommu/arm-smmu-v3: Pass in user_cfg to arm_smmu_domain_finalise Nicolin Chen
2023-03-09 10:53 ` [PATCH v1 11/14] iommu/arm-smmu-v3: Add arm_smmu_domain_alloc_user Nicolin Chen
2023-03-24 15:28 ` Eric Auger
2023-03-24 17:40 ` Nicolin Chen
2023-03-24 17:50 ` Jason Gunthorpe
2023-03-24 18:00 ` Nicolin Chen
2023-03-24 15:33 ` Eric Auger
2023-03-24 17:43 ` Nicolin Chen
2023-03-09 10:53 ` Nicolin Chen [this message]
2023-03-09 13:20 ` [PATCH v1 12/14] iommu/arm-smmu-v3: Support IOMMU_DOMAIN_NESTED type of allocations Robin Murphy
2023-03-09 14:28 ` Robin Murphy
2023-03-10 1:34 ` Nicolin Chen
2023-03-24 15:44 ` Eric Auger
2023-03-24 16:30 ` Jason Gunthorpe
2023-03-24 17:50 ` Nicolin Chen
2023-03-24 17:51 ` Jason Gunthorpe
2023-03-24 17:55 ` Nicolin Chen
2023-03-09 10:53 ` [PATCH v1 13/14] iommu/arm-smmu-v3: Add CMDQ_OP_TLBI_NH_VAA and CMDQ_OP_TLBI_NH_ALL Nicolin Chen
2023-03-09 13:44 ` Robin Murphy
2023-03-10 1:19 ` Nicolin Chen
2023-03-09 10:53 ` [PATCH v1 14/14] iommu/arm-smmu-v3: Add arm_smmu_cache_invalidate_user Nicolin Chen
2023-03-09 14:49 ` Robin Murphy
2023-03-09 15:31 ` Jason Gunthorpe
2023-03-10 4:20 ` Nicolin Chen
2023-03-10 16:19 ` Jason Gunthorpe
2023-03-11 11:56 ` Nicolin Chen
2023-03-11 12:53 ` Nicolin Chen
2023-03-20 13:03 ` Jason Gunthorpe
2023-03-20 15:56 ` Nicolin Chen
2023-03-20 16:04 ` Jason Gunthorpe
2023-03-20 16:59 ` Nicolin Chen
2023-03-20 18:45 ` Jason Gunthorpe
2023-03-20 21:22 ` Nicolin Chen
2023-03-20 22:19 ` Jason Gunthorpe
2023-03-22 20:57 ` Nicolin Chen
2023-03-23 12:17 ` Jason Gunthorpe
2023-03-17 9:41 ` Tian, Kevin
2023-03-17 14:24 ` Nicolin Chen
2023-03-20 12:59 ` Jason Gunthorpe
2023-03-20 16:12 ` Nicolin Chen
2023-03-20 18:00 ` Jason Gunthorpe
2023-03-21 8:34 ` Tian, Kevin
2023-03-21 11:48 ` Jason Gunthorpe
2023-03-22 6:42 ` Nicolin Chen
2023-03-22 12:43 ` Jason Gunthorpe
2023-03-22 17:11 ` Nicolin Chen
2023-03-22 17:28 ` Jason Gunthorpe
2023-03-22 19:21 ` Nicolin Chen
2023-03-22 19:41 ` Jason Gunthorpe
2023-03-22 20:43 ` Nicolin Chen
2023-03-23 12:16 ` Jason Gunthorpe
2023-03-23 18:13 ` Nicolin Chen
2023-03-23 18:27 ` Jason Gunthorpe
2023-03-24 9:02 ` Tian, Kevin
2023-03-24 14:57 ` Jason Gunthorpe
2023-03-24 17:35 ` Nicolin Chen
2023-03-28 3:03 ` Tian, Kevin
2023-03-24 8:47 ` Tian, Kevin
2023-03-24 14:44 ` Jason Gunthorpe
2023-03-28 2:48 ` Tian, Kevin
2023-03-28 12:26 ` Jason Gunthorpe
2023-03-31 8:09 ` Tian, Kevin
2023-03-17 9:24 ` Tian, Kevin
2023-03-10 3:51 ` Nicolin Chen
2023-03-10 17:53 ` Robin Murphy
2023-03-10 18:49 ` Jason Gunthorpe
2023-03-11 12:38 ` Nicolin Chen
2023-03-13 13:07 ` Robin Murphy
2023-03-16 0:01 ` Nicolin Chen
2023-03-16 14:58 ` Robin Murphy
2023-03-16 21:09 ` Nicolin Chen
2023-03-20 1:32 ` Nicolin Chen
2023-03-20 13:11 ` Jason Gunthorpe
2023-03-20 15:28 ` Nicolin Chen
2023-03-20 16:01 ` Jason Gunthorpe
2023-03-20 16:35 ` Nicolin Chen
2023-03-20 18:07 ` Jason Gunthorpe
2023-03-20 20:46 ` Nicolin Chen
2023-03-20 22:14 ` Jason Gunthorpe
2023-03-22 5:14 ` Nicolin Chen
2023-03-24 8:55 ` Tian, Kevin
2023-03-17 9:47 ` Tian, Kevin
2023-03-17 14:16 ` Nicolin Chen
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=b01b2bad6d0d34908812d964eba118a9cc1e89ab.1678348754.git.nicolinc@nvidia.com \
--to=nicolinc@nvidia.com \
--cc=baolu.lu@linux.intel.com \
--cc=eric.auger@redhat.com \
--cc=iommu@lists.linux.dev \
--cc=jean-philippe@linaro.org \
--cc=jgg@nvidia.com \
--cc=joro@8bytes.org \
--cc=kevin.tian@intel.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robin.murphy@arm.com \
--cc=shameerali.kolothum.thodi@huawei.com \
--cc=will@kernel.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;
as well as URLs for NNTP newsgroup(s).