Skip to contentSkip to conversation

powerpc/eeh: Handle hugepages in ioremap space

PATCH Applied Oliver O'Halloran 3 participants 3 messages Jul 10, 2019 – Jul 15, 2019

Subsystems (2)
lore
Share & tools
lore

Oliver O'Halloran

author reviewer
#0 lore raw

PATCH 1/1 powerpc/eeh: Handle hugepages in ioremap space

In commit 4a7b06c157a2 ("powerpc/eeh: Handle hugepages in ioremap space") support for using hugepages in the vmalloc and ioremap areas was enabled for radix. Unfortunately this broke EEH MMIO error checking.

Detection works by inserting a hook which checks the results of the ioreadXX() set of functions. When a read returns a 0xFFs response we need to check for an error which we do by mapping the (virtual) MMIO address back to a physical address, then mapping physical address to a PCI device via an interval tree.

When translating virt -> phys we currently assume the ioremap space is only populated by PAGE_SIZE mappings. If a hugepage mapping is found we emit a WARN_ON(), but otherwise handles the check as though a normal page was found. In pathalogical cases such as copying a buffer containing a lot of 0xFFs from BAR memory this can result in the system not booting because it's too busy printing WARN_ON()s.

There's no real reason to assume huge pages can't be present and we're prefectly capable of handling them, so do that.

Cc Nicholas Piggin <[email protected]>
Fixes 4a7b06c157a2 ("powerpc/eeh: Handle hugepages in ioremap space")

---
I'm assuming that we aren't going to be doing THP in the ioremap area.

---
 arch/powerpc/kernel/eeh.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)
arch/powerpc/kernel/eeh.c +12 -3
index 4557fb1aeb2c..976ca0496442 100644
@@ -354,10 +354,19 @@ static inline unsigned long eeh_token_to_phys(unsigned long token)
 	ptep = find_init_mm_pte(token, &hugepage_shift);
 	if (!ptep)
 		return token;
-	WARN_ON(hugepage_shift);
-	pa = pte_pfn(*ptep) << PAGE_SHIFT;
 
-	return pa | (token & (PAGE_SIZE-1));
+	pa = pte_pfn(*ptep);
+
+	/* On radix we can do hugepage mappings for io, so handle that */
+	if (hugepage_shift) {
+		pa <<= hugepage_shift;
+		pa |= token & ((1ul << hugepage_shift) - 1);
+	} else {
+		pa <<= PAGE_SHIFT;
+		pa |= token & (PAGE_SIZE - 1);
+	}
+
+	return pa;
 }
 
 /*
Signature · 1 line
2.21.0
Tested-by on v1 1/1
#1 lore raw
Quoted 20 lines · Oliver O'Halloran

In commit 4a7b06c157a2 ("powerpc/eeh: Handle hugepages in ioremap space") support for using hugepages in the vmalloc and ioremap areas was enabled for radix. Unfortunately this broke EEH MMIO error checking.

Detection works by inserting a hook which checks the results of the ioreadXX() set of functions. When a read returns a 0xFFs response we need to check for an error which we do by mapping the (virtual) MMIO address back to a physical address, then mapping physical address to a PCI device via an interval tree.

When translating virt -> phys we currently assume the ioremap space is only populated by PAGE_SIZE mappings. If a hugepage mapping is found we emit a WARN_ON(), but otherwise handles the check as though a normal page was found. In pathalogical cases such as copying a buffer containing a lot of 0xFFs from BAR memory this can result in the system not booting because it's too busy printing WARN_ON()s.

Quoted 7 lines

There's no real reason to assume huge pages can't be present and we're prefectly capable of handling them, so do that.

Cc Nicholas Piggin <[email protected]>
Fixes 4a7b06c157a2 ("powerpc/eeh: Handle hugepages in ioremap space")

Thanks
-Sachin

#2 lore raw
In reply to Oliver O'Halloran
Quoted 17 lines · Oliver O'Halloran

In commit 4a7b06c157a2 ("powerpc/eeh: Handle hugepages in ioremap space") support for using hugepages in the vmalloc and ioremap areas was enabled for radix. Unfortunately this broke EEH MMIO error checking.

Detection works by inserting a hook which checks the results of the ioreadXX() set of functions. When a read returns a 0xFFs response we need to check for an error which we do by mapping the (virtual) MMIO address back to a physical address, then mapping physical address to a PCI device via an interval tree.

When translating virt -> phys we currently assume the ioremap space is only populated by PAGE_SIZE mappings. If a hugepage mapping is found we emit a WARN_ON(), but otherwise handles the check as though a normal page was found. In pathalogical cases such as copying a buffer containing a lot of 0xFFs from BAR memory this can result in the system not booting because it's too busy printing WARN_ON()s.

Quoted 8 lines

There's no real reason to assume huge pages can't be present and we're prefectly capable of handling them, so do that.

Cc Nicholas Piggin <[email protected]>
Fixes 4a7b06c157a2 ("powerpc/eeh: Handle hugepages in ioremap space")

Applied to powerpc next, thanks.

https://git.kernel.org/powerpc/c/33439620680be5225c1b8806579a291e0d761ca0

cheers