Skip to contentSkip to conversation

iommu/vt-d: Enhance capability check for nested parent domain allocation

PATCH In review Yi Liu 4 participants 4 messages Oct 24, 2023 – Oct 25, 2023

Subsystems (4)
lore
Share & tools
lore

Yi Liu

author
#0 lore raw

PATCH 1/1 iommu/vt-d: Enhance capability check for nested parent domain allocation

This adds the scalable mode check before allocating the nested parent domain as checking nested capability is not enough. User may turn off scalable mode which also means no nested support even if the hardware supports it.

Fixes c97d1b20d383 ("iommu/vt-d: Add domain_alloc_user op")

---
v1: Based on Joao's dirty page tracking v6 https://github.com/jpemartins/linux/commits/iommufd-v6

---
 drivers/iommu/intel/iommu.c | 2 +-
 drivers/iommu/intel/iommu.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/iommu/intel/iommu.c +1 -1
index eb92a201cc0b..65f46f1347e6 100644
@@ -4090,7 +4090,7 @@ intel_iommu_domain_alloc_user(struct device *dev, u32 flags)
 	if (!iommu)
 		return ERR_PTR(-ENODEV);
 
-	if ((flags & IOMMU_HWPT_ALLOC_NEST_PARENT) && !ecap_nest(iommu->ecap))
+	if ((flags & IOMMU_HWPT_ALLOC_NEST_PARENT) && !nested_supported(iommu))
 		return ERR_PTR(-EOPNOTSUPP);
 
 	dirty_tracking = (flags & IOMMU_HWPT_ALLOC_DIRTY_TRACKING);
drivers/iommu/intel/iommu.h +2 -0
index 3bb569146229..cc7301579773 100644
@@ -544,6 +544,8 @@ enum {
 				 ecap_pasid((iommu)->ecap))
 #define ssads_supported(iommu) (sm_supported(iommu) &&                 \
 				ecap_slads((iommu)->ecap))
+#define nested_supported(iommu)	(sm_supported(iommu) &&			\
+				 ecap_nest((iommu)->ecap))
 
 struct pasid_entry;
 struct pasid_state_entry;
Signature · 1 line
2.34.1
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 4 lines · Yi Liu

This adds the scalable mode check before allocating the nested parent domain as checking nested capability is not enough. User may turn off scalable mode which also means no nested support even if the hardware supports it.

Quoted 8 lines
Fixes c97d1b20d383 ("iommu/vt-d: Add domain_alloc_user op")

---
v1: Based on Joao's dirty page tracking v6 https://github.com/jpemartins/linux/commits/iommufd-v6

---
  drivers/iommu/intel/iommu.c | 2 +-
  drivers/iommu/intel/iommu.h | 2 ++
  2 files changed, 3 insertions(+), 1 deletion(-)

Hi Jason,

Given that this fixes a commit in the iommufd tree, can you please pick this fix as well?

Best regards,
baolu

#2 lore raw
Quoted 14 lines · Baolu Lu
Quoted 4 lines · Yi Liu

This adds the scalable mode check before allocating the nested parent domain as checking nested capability is not enough. User may turn off scalable mode which also means no nested support even if the hardware supports it.

Quoted 8 lines
Fixes c97d1b20d383 ("iommu/vt-d: Add domain_alloc_user op")

---
v1: Based on Joao's dirty page tracking v6 https://github.com/jpemartins/linux/commits/iommufd-v6

---
  drivers/iommu/intel/iommu.c | 2 +-
  drivers/iommu/intel/iommu.h | 2 ++
  2 files changed, 3 insertions(+), 1 deletion(-)
Quoted 6 lines

Hi Jason,

Given that this fixes a commit in the iommufd tree, can you please pick this fix as well?

Done

Thanks
Jason

Reviewed-by on v1 1/1
#3 lore raw
In reply to Yi Liu
Quoted 10 lines

From: Liu, Yi L <[email protected]>
Sent: Tuesday, October 24, 2023 11:00 PM

This adds the scalable mode check before allocating the nested parent domain
as checking nested capability is not enough. User may turn off scalable mode which also means no nested support even if the hardware supports it.

Fixes c97d1b20d383 ("iommu/vt-d: Add domain_alloc_user op")