Skip to content

Commit 194b334

Browse files
Jacob Panjoergroedel
authored andcommitted
iommu/vt-d: Fix PASID directory pointer coherency
On platforms that do not support IOMMU Extended capability bit 0 Page-walk Coherency, CPU caches are not snooped when IOMMU is accessing any translation structures. IOMMU access goes only directly to memory. Intel IOMMU code was missing a flush for the PASID table directory that resulted in the unrecoverable fault as shown below. This patch adds clflush calls whenever allocating and updating a PASID table directory to ensure cache coherency. On the reverse direction, there's no need to clflush the PASID directory pointer when we deactivate a context entry in that IOMMU hardware will not see the old PASID directory pointer after we clear the context entry. PASID directory entries are also never freed once allocated. DMAR: DRHD: handling fault status reg 3 DMAR: [DMA Read NO_PASID] Request device [00:0d.2] fault addr 0x1026a4000 [fault reason 0x51] SM: Present bit in Directory Entry is clear DMAR: Dump dmar1 table entries for IOVA 0x1026a4000 DMAR: scalable mode root entry: hi 0x0000000102448001, low 0x0000000101b3e001 DMAR: context entry: hi 0x0000000000000000, low 0x0000000101b4d401 DMAR: pasid dir entry: 0x0000000101b4e001 DMAR: pasid table entry[0]: 0x0000000000000109 DMAR: pasid table entry[1]: 0x0000000000000001 DMAR: pasid table entry[2]: 0x0000000000000000 DMAR: pasid table entry[3]: 0x0000000000000000 DMAR: pasid table entry[4]: 0x0000000000000000 DMAR: pasid table entry[5]: 0x0000000000000000 DMAR: pasid table entry[6]: 0x0000000000000000 DMAR: pasid table entry[7]: 0x0000000000000000 DMAR: PTE not present at level 4 Cc: <[email protected]> Fixes: 0bbeb01 ("iommu/vt-d: Manage scalalble mode PASID tables") Reviewed-by: Kevin Tian <[email protected]> Reported-by: Sukumar Ghorai <[email protected]> Signed-off-by: Ashok Raj <[email protected]> Signed-off-by: Jacob Pan <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Lu Baolu <[email protected]> Signed-off-by: Joerg Roedel <[email protected]>
1 parent 16a75bb commit 194b334

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

drivers/iommu/intel/pasid.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,9 @@ int intel_pasid_alloc_table(struct device *dev)
128128
pasid_table->max_pasid = 1 << (order + PAGE_SHIFT + 3);
129129
info->pasid_table = pasid_table;
130130

131+
if (!ecap_coherent(info->iommu->ecap))
132+
clflush_cache_range(pasid_table->table, size);
133+
131134
return 0;
132135
}
133136

@@ -215,6 +218,10 @@ static struct pasid_entry *intel_pasid_get_entry(struct device *dev, u32 pasid)
215218
free_pgtable_page(entries);
216219
goto retry;
217220
}
221+
if (!ecap_coherent(info->iommu->ecap)) {
222+
clflush_cache_range(entries, VTD_PAGE_SIZE);
223+
clflush_cache_range(&dir[dir_index].val, sizeof(*dir));
224+
}
218225
}
219226

220227
return &entries[index];

0 commit comments

Comments
 (0)