Skip to contentSkip to conversation

iommu/vt-d: Fixes for v5.13-rc3

GIT PULL New Lu Baolu 2 participants 4 messages May 19, 2021

Subsystems (2)
lore
Share & tools
lore

Lu Baolu

author maintainer
#0 lore raw

Hi Joerg,

Two small fixes are queued in this series. It includes:

- Use user privilege for RID2PASID translation
- Check memory allocation return value

Please consider them for v5.13.

Best regards,
Lu Baolu

Dan Carpenter (1):
iommu/vt-d: Check for allocation failure in aux_detach_device()

Lu Baolu (1):
iommu/vt-d: Use user privilege for RID2PASID translation

 drivers/iommu/intel/iommu.c | 9 +++++++--
 drivers/iommu/intel/pasid.c | 3 ++-
 2 files changed, 9 insertions(+), 3 deletions(-)
Signature · 6 lines
2.25.1

_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
author maintainer
#1 lore raw

PATCH 1/2 iommu/vt-d: Check for allocation failure in aux_detach_device()

From: Dan Carpenter <[email protected]>

In current kernels small allocations never fail, but checking for allocation failure is the correct thing to do.

Fixes 18abda7a2d55 ("iommu/vt-d: Fix general protection fault in aux_detach_device()")
---
 drivers/iommu/intel/iommu.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/iommu/intel/iommu.c +2 -0
index 708f430af1c4..9a7b79b5af18 100644
@@ -4606,6 +4606,8 @@ static int auxiliary_link_device(struct dmar_domain *domain,
 
 	if (!sinfo) {
 		sinfo = kzalloc(sizeof(*sinfo), GFP_ATOMIC);
+		if (!sinfo)
+			return -ENOMEM;
 		sinfo->domain = domain;
 		sinfo->pdev = dev;
 		list_add(&sinfo->link_phys, &info->subdevices);
Signature · 6 lines
2.25.1

_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
author maintainer
#2 lore raw

PATCH 2/2 iommu/vt-d: Use user privilege for RID2PASID translation

In reply to Lu Baolu

When first-level page tables are used for IOVA translation, we use user privilege by setting U/S bit in the page table entry. This is to make it consistent with the second level translation, where the U/S enforcement is not available. Clear the SRE (Supervisor Request Enable) field in the pasid table entry of RID2PASID so that requests requesting the supervisor privilege are blocked and treated as DMA remapping faults.

Fixes b802d070a52a1 ("iommu/vt-d: Use iova over first level")
---
 drivers/iommu/intel/iommu.c | 7 +++++--
 drivers/iommu/intel/pasid.c | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)
drivers/iommu/intel/iommu.c +5 -2
index 9a7b79b5af18..be35284a2016 100644
@@ -2525,9 +2525,9 @@ static int domain_setup_first_level(struct intel_iommu *iommu,
 				    struct device *dev,
 				    u32 pasid)
 {
-	int flags = PASID_FLAG_SUPERVISOR_MODE;
 	struct dma_pte *pgd = domain->pgd;
 	int agaw, level;
+	int flags = 0;
 
 	/*
 	 * Skip top levels of page tables for iommu which has
@@ -2543,7 +2543,10 @@ static int domain_setup_first_level(struct intel_iommu *iommu,
 	if (level != 4 && level != 5)
 		return -EINVAL;
 
-	flags |= (level == 5) ? PASID_FLAG_FL5LP : 0;
+	if (pasid != PASID_RID2PASID)
+		flags |= PASID_FLAG_SUPERVISOR_MODE;
+	if (level == 5)
+		flags |= PASID_FLAG_FL5LP;
 
 	if (domain->domain.type == IOMMU_DOMAIN_UNMANAGED)
 		flags |= PASID_FLAG_PAGE_SNOOP;
drivers/iommu/intel/pasid.c +2 -1
index 72646bafc52f..72dc84821dad 100644
@@ -699,7 +699,8 @@ int intel_pasid_setup_second_level(struct intel_iommu *iommu,
 	 * Since it is a second level only translation setup, we should
 	 * set SRE bit as well (addresses are expected to be GPAs).
 	 */
-	pasid_set_sre(pte);
+	if (pasid != PASID_RID2PASID)
+		pasid_set_sre(pte);
 	pasid_set_present(pte);
 	pasid_flush_caches(iommu, pte, pasid, did);
 
Signature · 6 lines
2.25.1

_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
maintainer
#3 lore raw
In reply to Lu Baolu
Quoted 9 lines · Lu Baolu

Hi Joerg,

Two small fixes are queued in this series. It includes:

- Use user privilege for RID2PASID translation
- Check memory allocation return value

Please consider them for v5.13.

Quoted 8 lines

Best regards,
Lu Baolu

Dan Carpenter (1):
iommu/vt-d: Check for allocation failure in aux_detach_device()

Lu Baolu (1):
iommu/vt-d: Use user privilege for RID2PASID translation

Applied for v5.13, thanks.

_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu