iommu/vt-d: Fixes for v6.1-rc6
Subsystems (2)
Lu Baolu
maintainerHi Joerg,
Below fixes are queued for v6.1. They aim to fix:
- Preset Access bit in FL non-leaf paging entries.
- Avoid setting hardware Reserved(0) bit.
This series is also available at github.
https://github.com/LuBaolu/intel-iommu/commits/vtd-fix-for-v6.1-rc6
Please consider it for the iommu/fix branch.
Best regards,
Lu Baolu
Tina Zhang (2):
iommu/vt-d: Preset Access bit for IOVA in FL non-leaf paging entries iommu/vt-d: Set SRE bit only when hardware has SRS cap
drivers/iommu/intel/iommu.c | 8 +++----- drivers/iommu/intel/pasid.c | 5 +++-- 2 files changed, 6 insertions(+), 7 deletions(-)
Signature · 1 line
2.34.1
Lu Baolu
maintainerPATCH 1/2 iommu/vt-d: Preset Access bit for IOVA in FL non-leaf paging entries
From: Tina Zhang <[email protected]>
The A/D bits are preseted for IOVA over first level(FL) usage for both kernel DMA (i.e, domain typs is IOMMU_DOMAIN_DMA) and user space DMA usage (i.e., domain type is IOMMU_DOMAIN_UNMANAGED).
Presetting A bit in FL requires to preset the bit in every related paging entries, including the non-leaf ones. Otherwise, hardware may treat this as an error. For example, in a case of ECAP_REG.SMPWC==0, DMA faults might occur with below DMAR fault messages (wrapped for line length) dumped.
DMAR: DRHD: handling fault status reg 2
DMAR: [DMA Read NO_PASID] Request device [aa:00.0] fault addr 0x10c3a6000
[fault reason 0x90]
SM: A/D bit update needed in first-level entry when set up in no snoop
--- drivers/iommu/intel/iommu.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/iommu/intel/iommu.c +3 -5
@@ -959,11 +959,9 @@ static struct dma_pte *pfn_to_dma_pte(struct dmar_domain *domain,domain_flush_cache (domain, tmp_page,VTD_PAGE_SIZE ); pteval = ((uint64_t )virt_to_dma_pfn (tmp_page) <<VTD_PAGE_SHIFT ) |DMA_PTE_READ |DMA_PTE_WRITE ; -if (domain_use_first_level (domain)) { - pteval |=DMA_FL_PTE_XD |DMA_FL_PTE_US ; -if (iommu_is_dma_domain (&domain->domain)) - pteval |=DMA_FL_PTE_ACCESS ; - } +if (domain_use_first_level (domain)) + pteval |=DMA_FL_PTE_XD |DMA_FL_PTE_US |DMA_FL_PTE_ACCESS ; +if (cmpxchg64 (&pte->val,0ULL , pteval))/* Someone else set it while we were thinking; use theirs. */ free_pgtable_page (tmp_page);
Signature · 1 line
2.34.1
Lu Baolu
maintainerPATCH 2/2 iommu/vt-d: Set SRE bit only when hardware has SRS cap
In reply to Lu BaoluFrom: Tina Zhang <[email protected]>
SRS cap is the hardware cap telling if the hardware IOMMU can support requests seeking supervisor privilege or not. SRE bit in scalable-mode PASID table entry is treated as Reserved(0) for implementation not supporting SRS cap.
Checking SRS cap before setting SRE bit can avoid the non-recoverable fault of "Non-zero reserved field set in PASID Table Entry" caused by setting SRE bit while there is no SRS cap support. The fault messages look like below:
DMAR: DRHD: handling fault status reg 2
DMAR: [DMA Read NO_PASID] Request device [00:0d.0] fault addr 0x1154e1000
[fault reason 0x5a]
SM: Non-zero reserved field set in PASID Table Entry
--- drivers/iommu/intel/pasid.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/iommu/intel/pasid.c +3 -2
@@ -642,7 +642,7 @@ 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). */ -if (pasid !=PASID_RID2PASID ) +if (pasid !=PASID_RID2PASID &&ecap_srs (iommu->ecap))pasid_set_sre (pte);pasid_set_present (pte);spin_unlock (&iommu->lock);
@@ -685,7 +685,8 @@ int intel_pasid_setup_pass_through(struct intel_iommu *iommu,* We should set SRE bit as well since the addresses are expected * to be GPAs. */ -pasid_set_sre (pte); +if (ecap_srs (iommu->ecap)) +pasid_set_sre (pte);pasid_set_present (pte);spin_unlock (&iommu->lock);
Signature · 1 line
2.34.1
Joerg Roedel
maintainerQuoted 7 lines · Lu Baolu
Tina Zhang (2):
iommu/vt-d: Preset Access bit for IOVA in FL non-leaf paging entries iommu/vt-d: Set SRE bit only when hardware has SRS capdrivers/iommu/intel/iommu.c | 8 +++----- drivers/iommu/intel/pasid.c | 5 +++-- 2 files changed, 6 insertions(+), 7 deletions(-)
Applied for v6.1, thanks Baolu and Tina.