iommu/vt-d: Fix checks and print in dmar_fault_dump_ptes()

There are some issues in dmar_fault_dump_ptes():

1. return value of phys_to_virt() is used for checking if an entry is
   present.
2. dump is confusing, e.g., "pasid table entry is not present", confusing
   by unpresent pasid table vs. unpresent pasid table entry. Current code
   means the former.
3. pgtable_walk() is called without checking if page table is present.

Fix 1 by checking present bit of an entry before dump a lower level entry.
Fix 2 by removing "entry" string, e.g., "pasid table is not present".
Fix 3 by checking page table present before walk.

Take issue 3 for example, before fix:

[  442.240357] DMAR: pasid dir entry: 0x000000012c83e001
[  442.246661] DMAR: pasid table entry[0]: 0x0000000000000000
[  442.253429] DMAR: pasid table entry[1]: 0x0000000000000000
[  442.260203] DMAR: pasid table entry[2]: 0x0000000000000000
[  442.266969] DMAR: pasid table entry[3]: 0x0000000000000000
[  442.273733] DMAR: pasid table entry[4]: 0x0000000000000000
[  442.280479] DMAR: pasid table entry[5]: 0x0000000000000000
[  442.287234] DMAR: pasid table entry[6]: 0x0000000000000000
[  442.293989] DMAR: pasid table entry[7]: 0x0000000000000000
[  442.300742] DMAR: PTE not present at level 2

After fix:
...
[  357.241214] DMAR: pasid table entry[6]: 0x0000000000000000
[  357.248022] DMAR: pasid table entry[7]: 0x0000000000000000
[  357.254824] DMAR: scalable mode page table is not present

Fixes: 914ff7719e8a ("iommu/vt-d: Dump DMAR translation structure when DMA fault occurs")
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Link: https://lore.kernel.org/r/20241024092146.715063-2-zhenzhong.duan@intel.com
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
index 2d67db67f5e343ae7151da7ee17b85035125353c..2337baa3cb806da3271c8095c57e90ca2697647d 100644 (file)
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -626,11 +626,11 @@ void dmar_fault_dump_ptes(struct intel_iommu *iommu, u16 source_id,
        pr_info("Dump %s table entries for IOVA 0x%llx\n", iommu->name, addr);
 
        /* root entry dump */
-       rt_entry = &iommu->root_entry[bus];
-       if (!rt_entry) {
-               pr_info("root table entry is not present\n");
+       if (!iommu->root_entry) {
+               pr_info("root table is not present\n");
                return;
        }
+       rt_entry = &iommu->root_entry[bus];
 
        if (sm_supported(iommu))
                pr_info("scalable mode root entry: hi 0x%016llx, low 0x%016llx\n",
@@ -641,7 +641,7 @@ void dmar_fault_dump_ptes(struct intel_iommu *iommu, u16 source_id,
        /* context entry dump */
        ctx_entry = iommu_context_addr(iommu, bus, devfn, 0);
        if (!ctx_entry) {
-               pr_info("context table entry is not present\n");
+               pr_info("context table is not present\n");
                return;
        }
 
@@ -650,17 +650,23 @@ void dmar_fault_dump_ptes(struct intel_iommu *iommu, u16 source_id,
 
        /* legacy mode does not require PASID entries */
        if (!sm_supported(iommu)) {
+               if (!context_present(ctx_entry)) {
+                       pr_info("legacy mode page table is not present\n");
+                       return;
+               }
                level = agaw_to_level(ctx_entry->hi & 7);
                pgtable = phys_to_virt(ctx_entry->lo & VTD_PAGE_MASK);
                goto pgtable_walk;
        }
 
-       /* get the pointer to pasid directory entry */
-       dir = phys_to_virt(ctx_entry->lo & VTD_PAGE_MASK);
-       if (!dir) {
-               pr_info("pasid directory entry is not present\n");
+       if (!context_present(ctx_entry)) {
+               pr_info("pasid directory table is not present\n");
                return;
        }
+
+       /* get the pointer to pasid directory entry */
+       dir = phys_to_virt(ctx_entry->lo & VTD_PAGE_MASK);
+
        /* For request-without-pasid, get the pasid from context entry */
        if (intel_iommu_sm && pasid == IOMMU_PASID_INVALID)
                pasid = IOMMU_NO_PASID;
@@ -672,7 +678,7 @@ void dmar_fault_dump_ptes(struct intel_iommu *iommu, u16 source_id,
        /* get the pointer to the pasid table entry */
        entries = get_pasid_table_from_pde(pde);
        if (!entries) {
-               pr_info("pasid table entry is not present\n");
+               pr_info("pasid table is not present\n");
                return;
        }
        index = pasid & PASID_PTE_MASK;
@@ -680,6 +686,11 @@ void dmar_fault_dump_ptes(struct intel_iommu *iommu, u16 source_id,
        for (i = 0; i < ARRAY_SIZE(pte->val); i++)
                pr_info("pasid table entry[%d]: 0x%016llx\n", i, pte->val[i]);
 
+       if (!pasid_pte_is_present(pte)) {
+               pr_info("scalable mode page table is not present\n");
+               return;
+       }
+
        if (pasid_pte_get_pgtt(pte) == PASID_ENTRY_PGTT_FL_ONLY) {
                level = pte->val[2] & BIT_ULL(2) ? 5 : 4;
                pgtable = phys_to_virt(pte->val[2] & VTD_PAGE_MASK);