iommu/vt-d: Fixes for v5.13-rc3
Subsystems (2)
Lu Baolu
maintainerHi 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
Lu Baolu
maintainerPATCH 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.
--- drivers/iommu/intel/iommu.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/iommu/intel/iommu.c +2 -0
@@ -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
Lu Baolu
maintainerPATCH 2/2 iommu/vt-d: Use user privilege for RID2PASID translation
In reply to Lu BaoluWhen 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.
--- 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
@@ -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
@@ -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
Joerg Roedel
maintainerQuoted 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 valuePlease consider them for v5.13.
Quoted 8 lines
Best regards,
Lu BaoluDan Carpenter (1):
iommu/vt-d: Check for allocation failure inaux_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