Misc fixes to intel iommu driver
Subsystems (2)
cover Misc fixes to intel iommu driver
Hi,
This series includes two minor enhancements and one bug fix. Please have a review.
Thanks,
Yi Liu
---
Liu Yi L (3):
iommu/vt-d: Using pasid_pte_is_present() helper function iommu/vt-d: Add present bit check in pasid entry setup helper
functions
iommu/vt-d: Fix Unexpected page request in Privilege Mode
drivers/iommu/intel/pasid.c | 28 +++++++++++++++++++++++++--- drivers/iommu/intel/pasid.h | 5 +++++ 2 files changed, 30 insertions(+), 3 deletions(-)
Signature · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH 1/3 iommu/vt-d: Using pasid_pte_is_present() helper function
Use pasid_pte_is_present() for present bit check in intel_pasid_tear_down_entry().
--- drivers/iommu/intel/pasid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/intel/pasid.c +1 -1
@@ -517,7 +517,7 @@ void intel_pasid_tear_down_entry(struct intel_iommu *iommu, struct device *dev,if (WARN_ON (!pte))return ; -if (!(pte->val[0 ] &PASID_PTE_PRESENT )) +if (!pasid_pte_is_present (pte))return ; did =pasid_get_domain_id (pte);
Signature · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH 2/3 iommu/vt-d: Add present bit check in pasid entry setup helper functions
In reply to Liu Yi LThe helper functions is not capable to modify the pasid entries which are still in use. So should have a check against present bit.
--- drivers/iommu/intel/pasid.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/iommu/intel/pasid.c +16 -0
@@ -534,6 +534,10 @@ void intel_pasid_tear_down_entry(struct intel_iommu *iommu, struct device *dev,devtlb_invalidation_with_pasid (iommu, dev, pasid); } +/* +* This function flushes cache for a newly setup pasid table entry. +* Caller of it should not modify the in-use pasid table entries. +*/ static void pasid_flush_caches (struct intel_iommu *iommu,struct pasid_entry *pte,u32 pasid,u16 did)
@@ -585,6 +589,10 @@ int intel_pasid_setup_first_level(struct intel_iommu *iommu,if (WARN_ON (!pte))return -EINVAL ; +/* Caller must ensure PASID entry is not in use. */ +if (pasid_pte_is_present (pte)) +return -EBUSY ; +pasid_clear_entry (pte);/* Setup the first level page table pointer: */
@@ -684,6 +692,10 @@ int intel_pasid_setup_second_level(struct intel_iommu *iommu,return -ENODEV ; } +/* Caller must ensure PASID entry is not in use. */ +if (pasid_pte_is_present (pte)) +return -EBUSY ; +pasid_clear_entry (pte);pasid_set_domain_id (pte, did);pasid_set_slptr (pte, pgd_val);
@@ -723,6 +735,10 @@ int intel_pasid_setup_pass_through(struct intel_iommu *iommu,return -ENODEV ; } +/* Caller must ensure PASID entry is not in use. */ +if (pasid_pte_is_present (pte)) +return -EBUSY ; +pasid_clear_entry (pte);pasid_set_domain_id (pte, did);pasid_set_address_width (pte, iommu->agaw);
Signature · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH 3/3 iommu/vt-d: Fix Unexpected page request in Privilege Mode
In reply to Liu Yi LThis patch fixes the below error. This is due to improper iotlb invalidation in intel_pasid_tear_down_entry().
[ 180.187556] Unexpected page request in Privilege Mode [ 180.187565] Unexpected page request in Privilege Mode [ 180.279933] Unexpected page request in Privilege Mode [ 180.279937] Unexpected page request in Privilege Mode
Per chapter 6.5.3.3 of VT-d spec 3.3, when tear down a pasid entry, software should use Domain selective IOTLB flush if the PGTT of the pasid entry is SL only or Nested, while for the pasid entries whose PGTT is FL only or PT using PASID-based IOTLB flush is enough.
--- drivers/iommu/intel/pasid.c | 10 ++++++++-- drivers/iommu/intel/pasid.h | 5 +++++ 2 files changed, 13 insertions(+), 2 deletions(-)
drivers/iommu/intel/pasid.c +8 -2
@@ -511,7 +511,7 @@ void intel_pasid_tear_down_entry(struct intel_iommu *iommu, struct device *dev, u32 pasid, bool fault_ignore) {struct pasid_entry *pte; -u16 did; +u16 did, pgtt; pte =intel_pasid_get_entry (dev, pasid);if (WARN_ON (!pte))
@@ -521,13 +521,19 @@ void intel_pasid_tear_down_entry(struct intel_iommu *iommu, struct device *dev,return ; did =pasid_get_domain_id (pte); + pgtt =pasid_pte_get_pgtt (pte); +intel_pasid_clear_entry (dev, pasid, fault_ignore);if (!ecap_coherent (iommu->ecap))clflush_cache_range (pte,sizeof (*pte));pasid_cache_invalidation_with_pasid (iommu, did, pasid); -qi_flush_piotlb (iommu, did, pasid,0 ,-1 ,0 ); + +if (pgtt ==PASID_ENTRY_PGTT_PT || pgtt ==PASID_ENTRY_PGTT_FL_ONLY ) +qi_flush_piotlb (iommu, did, pasid,0 ,-1 ,0 ); +else + iommu->flush.flush_iotlb (iommu, did,0 ,0 ,DMA_TLB_DSI_FLUSH );/* Device IOTLB doesn't need to be flushed in caching mode. */ if (!cap_caching_mode (iommu->cap))
drivers/iommu/intel/pasid.h +5 -0
@@ -99,6 +99,11 @@ static inline bool pasid_pte_is_present(struct pasid_entry *pte)return READ_ONCE (pte->val[0 ]) &PASID_PTE_PRESENT ; } +static inline u16 pasid_pte_get_pgtt (struct pasid_entry *pte) +{ +return (READ_ONCE (pte->val[0 ]) >>6 ) &0x7 ; +} +extern unsigned int intel_pasid_max_id;int intel_pasid_alloc_table (struct device *dev);void intel_pasid_free_table (struct device *dev);
Signature · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Lu Baolu
maintainerRe: [PATCH v1 3/3] iommu/vt-d: Fix Unexpected page request in Privilege Mode
Quoted 13 lines · Liu Yi L
This patch fixes the below error. This is due to improper iotlb invalidation in
intel_pasid_tear_down_entry().[ 180.187556] Unexpected page request in Privilege Mode [ 180.187565] Unexpected page request in Privilege Mode [ 180.279933] Unexpected page request in Privilege Mode [ 180.279937] Unexpected page request in Privilege ModePer chapter 6.5.3.3 of VT-d spec 3.3, when tear down a pasid entry, software should use Domain selective IOTLB flush if the PGTT of the pasid entry is SL only or Nested, while for the pasid entries whose PGTT is FL only or PT using PASID-based IOTLB flush is enough.
Quoted 5 lines
Fixes 1c4f88b7f1f9 ("iommu/vt-d: Shared virtual address in scalable mode")Cc Lu Baolu<[email protected]>Signed-off-by Kumar Sanjay K<[email protected]>Signed-off-by Liu Yi L<[email protected]>Tested-by Yi Sun<[email protected]>
Good catch! Thanks!
It has been queued for iommu/fix.
Best regards,
baolu
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu