Skip to content

Commit 9ce8cff

Browse files
antheasheftig
authored andcommitted
iommu: Fix mapping check for 0x0 to avoid re-mapping it
Commit 789a591 ("iommu/amd: Use the generic iommu page table") introduces the shared iommu page table for AMD IOMMU. Some bioses contain an identity mapping for address 0x0, which is not parsed properly (e.g., certain Strix Halo devices). This causes the DMA components of the device to fail to initialize (e.g., the NVMe SSD controller), leading to a failed post. Specifically, on the GPD Win 5, the NVME and SSD GPU fail to mount, making collecting errors difficult. While debugging, it was found that a -EADDRINUSE error was emitted and its source was traced to iommu_iova_to_phys(). After adding some debug prints, it was found that phys_addr becomes 0, which causes the code to try to re-map the 0 address and fail, causing a cascade leading to a failed post. This is because the GPD Win 5 contains a 0x0-0x1 identity mapping for DMA devices, causing it to be repeated for each device. The cause of this failure is the following check in iommu_create_device_direct_mappings(), where address aliasing is handled via the following check: ``` phys_addr = iommu_iova_to_phys(domain, addr); if (!phys_addr) { map_size += pg_size; continue; } ```` Obviously, the iommu_iova_to_phys() signature is faulty and aliases unmapped and 0 together, causing the allocation code to try to re-allocate the 0 address per device. However, it has too many instantiations to fix. Therefore, use a ternary so that when addr is 0, the check is done for address 1 instead. Suggested-by: Robin Murphy <[email protected]> Fixes: 789a591 ("iommu/amd: Use the generic iommu page table") Signed-off-by: Antheas Kapenekakis <[email protected]> Cherry-picked-for: https://gitlab.archlinux.org/archlinux/packaging/packages/linux/-/issues/182
1 parent 295d33e commit 9ce8cff

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

drivers/iommu/iommu.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1207,7 +1207,11 @@ static int iommu_create_device_direct_mappings(struct iommu_domain *domain,
12071207
if (addr == end)
12081208
goto map_end;
12091209

1210-
phys_addr = iommu_iova_to_phys(domain, addr);
1210+
/*
1211+
* Return address by iommu_iova_to_phys for 0 is
1212+
* ambiguous. Offset to address 1 if addr is 0.
1213+
*/
1214+
phys_addr = iommu_iova_to_phys(domain, addr ? addr : 1);
12111215
if (!phys_addr) {
12121216
map_size += pg_size;
12131217
continue;

0 commit comments

Comments
 (0)