From: Lu Baolu <baolu.lu@linux.intel.com>
To: Joerg Roedel <joro@8bytes.org>
Cc: Jason Gunthorpe <jgg@nvidia.com>,
Kevin Tian <kevin.tian@intel.com>, Yi Liu <yi.l.liu@intel.com>,
iommu@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: [PATCH 08/13] iommu/vt-d: Limit intel_iommu_set_dev_pasid() for paging domain
Date: Fri, 8 Nov 2024 10:13:59 +0800 [thread overview]
Message-ID: <20241108021406.173972-9-baolu.lu@linux.intel.com> (raw)
In-Reply-To: <20241108021406.173972-1-baolu.lu@linux.intel.com>
From: Yi Liu <yi.l.liu@intel.com>
intel_iommu_set_dev_pasid() is only supposed to be used by paging domain,
so limit it.
Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>
Reviewed-by: Kevin Tian <kevin.tian@intel.com>
Signed-off-by: Yi Liu <yi.l.liu@intel.com>
Link: https://lore.kernel.org/r/20241107122234.7424-9-yi.l.liu@intel.com
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
---
drivers/iommu/intel/iommu.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
index d19bd0ff5220..f3ccbe516dcb 100644
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -4154,6 +4154,9 @@ static int intel_iommu_set_dev_pasid(struct iommu_domain *domain,
struct dev_pasid_info *dev_pasid;
int ret;
+ if (WARN_ON_ONCE(!(domain->type & __IOMMU_DOMAIN_PAGING)))
+ return -EINVAL;
+
if (!pasid_supported(iommu) || dev_is_real_dma_subdevice(dev))
return -EOPNOTSUPP;
@@ -4182,8 +4185,7 @@ static int intel_iommu_set_dev_pasid(struct iommu_domain *domain,
domain_remove_dev_pasid(old, dev, pasid);
- if (domain->type & __IOMMU_DOMAIN_PAGING)
- intel_iommu_debugfs_create_dev_pasid(dev_pasid);
+ intel_iommu_debugfs_create_dev_pasid(dev_pasid);
return 0;
--
2.43.0
next prev parent reply other threads:[~2024-11-08 2:15 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-08 2:13 [PATCH 00/13] [PULL REQUEST] Intel IOMMU updates for v6.13 (2nd Lu Baolu
2024-11-08 2:13 ` [PATCH 01/13] iommu: Pass old domain to set_dev_pasid op Lu Baolu
2024-11-08 2:13 ` [PATCH 02/13] iommu/vt-d: Add a helper to flush cache for updating present pasid entry Lu Baolu
2024-11-08 2:13 ` [PATCH 03/13] iommu/vt-d: Refactor the pasid setup helpers Lu Baolu
2024-11-08 2:13 ` [PATCH 04/13] iommu/vt-d: Add pasid replace helpers Lu Baolu
2024-11-08 2:13 ` [PATCH 05/13] iommu/vt-d: Consolidate the struct dev_pasid_info add/remove Lu Baolu
2024-11-08 2:13 ` [PATCH 06/13] iommu/vt-d: Add iommu_domain_did() to get did Lu Baolu
2024-11-08 2:13 ` [PATCH 07/13] iommu/vt-d: Make intel_iommu_set_dev_pasid() to handle domain replacement Lu Baolu
2024-11-08 2:13 ` Lu Baolu [this message]
2024-11-08 2:14 ` [PATCH 09/13] iommu/vt-d: Make intel_svm_set_dev_pasid() support " Lu Baolu
2024-11-08 2:14 ` [PATCH 10/13] iommu/vt-d: Make identity_domain_set_dev_pasid() to handle " Lu Baolu
2024-11-08 2:14 ` [PATCH 11/13] iommu/vt-d: Add set_dev_pasid callback for nested domain Lu Baolu
2024-11-08 2:14 ` [PATCH 12/13] iommu/arm-smmu-v3: Make set_dev_pasid() op support replace Lu Baolu
2024-11-08 2:14 ` [PATCH 13/13] iommu: Make set_dev_pasid op support domain replacement Lu Baolu
2024-11-08 13:05 ` [PATCH 00/13] [PULL REQUEST] Intel IOMMU updates for v6.13 (2nd Joerg Roedel
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=20241108021406.173972-9-baolu.lu@linux.intel.com \
--to=baolu.lu@linux.intel.com \
--cc=iommu@lists.linux.dev \
--cc=jgg@nvidia.com \
--cc=joro@8bytes.org \
--cc=kevin.tian@intel.com \
--cc=linux-kernel@vger.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