iommu/vt-d: Use user privilege for RID2PASID translation
Subsystems (2)
Lu Baolu
maintainerPATCH RESEND 1/1 iommu/vt-d: Use user privilege for RID2PASID translation
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.
--- 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
Quoted 31 lines · 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.
Suggested-by Jacob Pan <[email protected]>Fixes b802d070a52a1 ("iommu/vt-d: Use iova over first level")Signed-off-by Lu Baolu <[email protected]>--- drivers/iommu/intel/iommu.c | 7 +++++-- drivers/iommu/intel/pasid.c | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-)drivers/iommu/intel/iommu.c +1
-1@@ -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
drivers/iommu/intel/iommu.c static int domain_setup_first_level(struct intel_iommu *iommu, · line 2549
Quoted 8 lines
drivers/iommu/intel/iommu.c +4
-1@@ -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 ;
Given that we are still not bought into the supervisor PASID, should we make this an explicit request before turning on SUPERVISOR mode always? Since pasid_set_sre() has no return, we have no way to fail it.
Quoted 20 lines
drivers/iommu/intel/iommu.c +0
-0if (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 · 1 line
2.25.1
Signature · 8 lines
Cheers, Ashok [Forgiveness is the attribute of the STRONG - Gandhi] _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerHi Ashok,
Quoted 35 lines · Ashok
Quoted 34 lines · 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.
Suggested-by Jacob Pan <[email protected]>Fixes b802d070a52a1 ("iommu/vt-d: Use iova over first level")Signed-off-by Lu Baolu <[email protected]>--- drivers/iommu/intel/iommu.c | 7 +++++-- drivers/iommu/intel/pasid.c | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-)drivers/iommu/intel/iommu.c +1
-1@@ -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 ;
Quoted 10 lines
drivers/iommu/intel/iommu.c static int domain_setup_first_level(struct intel_iommu *iommu, · line 2549
Quoted 5 lines
drivers/iommu/intel/iommu.c +4
-1- flags |= (level ==5 ) ?PASID_FLAG_FL5LP :0 ; +if (pasid !=PASID_RID2PASID ) + flags |=PASID_FLAG_SUPERVISOR_MODE ; +if (level ==5 ) + flags |=PASID_FLAG_FL5LP ;Given that we are still not bought into the supervisor PASID, should we make this an explicit request before turning on SUPERVISOR mode always? Since
pasid_set_sre()has no return, we have no way to fail it.
The supervisor PASID is now supported in VT-d implementation. This patch is only for RID2PASID. We need a separated patch to remove the superisor pasid code once we reach a consensus.
Does this work for you?
Best regards,
baolu
Quoted 22 lines
Quoted 21 lines
drivers/iommu/intel/iommu.c +0
-0if (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 · 1 line
2.25.1