mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Nicolin Chen <nicolinc@nvidia.com>
To: <jgg@nvidia.com>, <kevin.tian@intel.com>, <corbet@lwn.net>,
	<will@kernel.org>
Cc: <robin.murphy@arm.com>, <joro@8bytes.org>,
	<thierry.reding@gmail.com>, <vdumpa@nvidia.com>,
	<jonathanh@nvidia.com>, <shuah@kernel.org>, <praan@google.com>,
	<nathan@kernel.org>, <peterz@infradead.org>, <yi.l.liu@intel.com>,
	<jsnitsel@redhat.com>, <mshavit@google.com>,
	<zhangzekun11@huawei.com>, <iommu@lists.linux.dev>,
	<linux-doc@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	<linux-arm-kernel@lists.infradead.org>,
	<linux-tegra@vger.kernel.org>, <linux-kselftest@vger.kernel.org>,
	<patches@lists.linux.dev>
Subject: [PATCH v1 14/16] iommu/arm-smmu-v3: Add vsmmu_alloc impl op
Date: Thu, 10 Apr 2025 23:37:53 -0700	[thread overview]
Message-ID: <c5193cce7c23590b54e6d03e77fedfcb02037cef.1744353300.git.nicolinc@nvidia.com> (raw)
In-Reply-To: <cover.1744353300.git.nicolinc@nvidia.com>

An impl driver might support its own vIOMMU object, as the following patch
will add IOMMU_VIOMMU_TYPE_TEGRA241_CMDQV.

Add a vsmmu_alloc op to give impl a try, upon failure fallback to standard
vsmmu allocation for IOMMU_VIOMMU_TYPE_ARM_SMMUV3.

Signed-off-by: Nicolin Chen <nicolinc@nvidia.com>
---
 drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h     |  6 ++++++
 .../iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c | 17 +++++++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

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 6b8f0d20dac3..a5835af72417 100644
--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h
@@ -16,6 +16,7 @@
 #include <linux/sizes.h>
 
 struct arm_smmu_device;
+struct arm_smmu_domain;
 
 /* MMIO registers */
 #define ARM_SMMU_IDR0			0x0
@@ -720,6 +721,11 @@ struct arm_smmu_impl_ops {
 	int (*init_structures)(struct arm_smmu_device *smmu);
 	struct arm_smmu_cmdq *(*get_secondary_cmdq)(
 		struct arm_smmu_device *smmu, struct arm_smmu_cmdq_ent *ent);
+	struct arm_vsmmu *(*vsmmu_alloc)(
+		struct arm_smmu_device *smmu,
+		struct arm_smmu_domain *smmu_domain, struct iommufd_ctx *ictx,
+		unsigned int viommu_type,
+		const struct iommu_user_data *user_data);
 };
 
 /* An SMMUv3 instance */
diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c
index 66855cae775e..aa8653af50f2 100644
--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c
@@ -392,10 +392,7 @@ struct iommufd_viommu *arm_vsmmu_alloc(struct device *dev,
 		iommu_get_iommu_dev(dev, struct arm_smmu_device, iommu);
 	struct arm_smmu_master *master = dev_iommu_priv_get(dev);
 	struct arm_smmu_domain *s2_parent = to_smmu_domain(parent);
-	struct arm_vsmmu *vsmmu;
-
-	if (viommu_type != IOMMU_VIOMMU_TYPE_ARM_SMMUV3)
-		return ERR_PTR(-EOPNOTSUPP);
+	struct arm_vsmmu *vsmmu = NULL;
 
 	if (!(smmu->features & ARM_SMMU_FEAT_NESTING))
 		return ERR_PTR(-EOPNOTSUPP);
@@ -423,8 +420,16 @@ struct iommufd_viommu *arm_vsmmu_alloc(struct device *dev,
 	    !(smmu->features & ARM_SMMU_FEAT_S2FWB))
 		return ERR_PTR(-EOPNOTSUPP);
 
-	vsmmu = iommufd_viommu_alloc(ictx, struct arm_vsmmu, core,
-				     &arm_vsmmu_ops);
+	if (master->smmu->impl_ops && master->smmu->impl_ops->vsmmu_alloc)
+		vsmmu = master->smmu->impl_ops->vsmmu_alloc(
+			master->smmu, s2_parent, ictx, viommu_type, user_data);
+	if (PTR_ERR(vsmmu) == -EOPNOTSUPP) {
+		if (viommu_type != IOMMU_VIOMMU_TYPE_ARM_SMMUV3)
+			return ERR_PTR(-EOPNOTSUPP);
+		/* Fallback to standard SMMUv3 type if viommu_type matches */
+		vsmmu = iommufd_viommu_alloc(ictx, struct arm_vsmmu, core,
+					     &arm_vsmmu_ops);
+	}
 	if (IS_ERR(vsmmu))
 		return ERR_CAST(vsmmu);
 
-- 
2.43.0


  parent reply	other threads:[~2025-04-11  6:38 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-04-11  6:37 [PATCH v1 00/16] iommufd: Add vIOMMU infrastructure (Part-4 vCMDQ) Nicolin Chen
2025-04-11  6:37 ` [PATCH v1 01/16] iommu: Pass in a driver-level user data structure to viommu_alloc op Nicolin Chen
2025-04-23 13:16   ` Jason Gunthorpe
2025-04-11  6:37 ` [PATCH v1 02/16] iommufd/viommu: Allow driver-specific user data for a vIOMMU object Nicolin Chen
2025-04-23 13:16   ` Jason Gunthorpe
2025-04-11  6:37 ` [PATCH v1 03/16] iommu: Add iommu_copy_struct_to_user helper Nicolin Chen
2025-04-11 12:35   ` ALOK TIWARI
2025-04-14 18:03     ` Nicolin Chen
2025-04-14 15:25   ` Matt Ochs
2025-04-14 18:01     ` Nicolin Chen
2025-04-23 13:17   ` Jason Gunthorpe
2025-04-11  6:37 ` [PATCH v1 04/16] iommufd: Add iommufd_struct_destroy to revert iommufd_viommu_alloc Nicolin Chen
2025-04-23 13:18   ` Jason Gunthorpe
2025-04-11  6:37 ` [PATCH v1 05/16] iommufd/selftest: Support user_data in mock_viommu_alloc Nicolin Chen
2025-04-11  6:37 ` [PATCH v1 06/16] iommufd/selftest: Add covearge for viommu data Nicolin Chen
2025-04-11  6:37 ` [PATCH v1 07/16] iommufd/viommu: Add driver-allocated vDEVICE support Nicolin Chen
2025-04-21  8:00   ` Tian, Kevin
2025-04-21 15:35     ` Nicolin Chen
2025-04-23 13:36   ` Jason Gunthorpe
2025-04-11  6:37 ` [PATCH v1 08/16] iommufd/viommu: Introduce IOMMUFD_OBJ_VCMDQ and its related struct Nicolin Chen
2025-04-21  8:03   ` Tian, Kevin
2025-04-21 15:38     ` Nicolin Chen
2025-04-11  6:37 ` [PATCH v1 09/16] iommufd/viommmu: Add IOMMUFD_CMD_VCMDQ_ALLOC ioctl Nicolin Chen
2025-04-21  8:05   ` Tian, Kevin
2025-04-21 15:42     ` Nicolin Chen
2025-04-11  6:37 ` [PATCH v1 10/16] iommufd: Add mmap interface Nicolin Chen
2025-04-21  8:16   ` Tian, Kevin
2025-04-21 17:23     ` Nicolin Chen
2025-04-21 17:45     ` Nicolin Chen
2025-04-11  6:37 ` [PATCH v1 11/16] iommufd/selftest: Add coverage for the new " Nicolin Chen
2025-04-11  6:37 ` [PATCH v1 12/16] Documentation: userspace-api: iommufd: Update vCMDQ Nicolin Chen
2025-04-11  6:37 ` [PATCH v1 13/16] iommu/tegra241-cmdqv: Use request_threaded_irq Nicolin Chen
2025-04-11  6:37 ` Nicolin Chen [this message]
2025-04-21  8:23   ` [PATCH v1 14/16] iommu/arm-smmu-v3: Add vsmmu_alloc impl op Tian, Kevin
2025-04-21 17:47     ` Nicolin Chen
2025-04-11  6:37 ` [PATCH v1 15/16] iommu/tegra241-cmdqv: Add user-space use support Nicolin Chen
2025-04-21  8:37   ` Tian, Kevin
2025-04-21 19:14     ` Nicolin Chen
2025-04-23  8:05       ` Tian, Kevin
2025-04-23 11:55         ` Jason Gunthorpe
2025-04-23 18:31           ` Nicolin Chen
2025-04-23 23:13             ` Jason Gunthorpe
2025-04-24  6:51               ` Nicolin Chen
2025-04-24  8:04                 ` Tian, Kevin
2025-04-24 13:40                 ` Jason Gunthorpe
2025-04-24 15:46                   ` Nicolin Chen
2025-04-11  6:37 ` [PATCH v1 16/16] iommu/tegra241-cmdqv: Add IOMMU_VEVENTQ_TYPE_TEGRA241_CMDQV support Nicolin Chen
2025-04-23  7:28 ` [PATCH v1 00/16] iommufd: Add vIOMMU infrastructure (Part-4 vCMDQ) Vasant Hegde
2025-04-23  7:45   ` Nicolin Chen
2025-04-24 11:21     ` Vasant Hegde
2025-04-24  8:21 ` Tian, Kevin
2025-04-24 15:54   ` 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=c5193cce7c23590b54e6d03e77fedfcb02037cef.1744353300.git.nicolinc@nvidia.com \
    --to=nicolinc@nvidia.com \
    --cc=corbet@lwn.net \
    --cc=iommu@lists.linux.dev \
    --cc=jgg@nvidia.com \
    --cc=jonathanh@nvidia.com \
    --cc=joro@8bytes.org \
    --cc=jsnitsel@redhat.com \
    --cc=kevin.tian@intel.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=linux-tegra@vger.kernel.org \
    --cc=mshavit@google.com \
    --cc=nathan@kernel.org \
    --cc=patches@lists.linux.dev \
    --cc=peterz@infradead.org \
    --cc=praan@google.com \
    --cc=robin.murphy@arm.com \
    --cc=shuah@kernel.org \
    --cc=thierry.reding@gmail.com \
    --cc=vdumpa@nvidia.com \
    --cc=will@kernel.org \
    --cc=yi.l.liu@intel.com \
    --cc=zhangzekun11@huawei.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

all inboxes | Powered by JetHome®