Skip to contentSkip to conversation

powerpc: ensure that swiotlb buffer is allocated from low memory

PATCH Applied Mike Rapoport 4 participants 5 messages Dec 4, 2019 – Dec 18, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 powerpc: ensure that swiotlb buffer is allocated from low memory

From: Mike Rapoport <[email protected]>

Some powerpc platforms (e.g. 85xx) limit DMA-able memory way below 4G. If a system has more physical memory than this limit, the swiotlb buffer is not addressable because it is allocated from memblock using top-down mode.

Force memblock to bottom-up mode before calling swiotlb_init() to ensure that the swiotlb buffer is DMA-able.

Cc Benjamin Herrenschmidt <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Darren Stevens <[email protected]>
Cc mad skateman <[email protected]>
Cc Michael Ellerman <[email protected]>
Cc Nicolas Saenz Julienne <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Robin Murphy <[email protected]>
Cc Rob Herring <[email protected]>
---
 arch/powerpc/mm/mem.c | 8 ++++++++
 1 file changed, 8 insertions(+)
arch/powerpc/mm/mem.c +8 -0
index be941d382c8d..14c2c53e3f9e 100644
@@ -260,6 +260,14 @@ void __init mem_init(void)
 	BUILD_BUG_ON(MMU_PAGE_COUNT > 16);
 
 #ifdef CONFIG_SWIOTLB
+	/*
+	 * Some platforms (e.g. 85xx) limit DMA-able memory way below
+	 * 4G. We force memblock to bottom-up mode to ensure that the
+	 * memory allocated in swiotlb_init() is DMA-able.
+	 * As it's the last memblock allocation, no need to reset it
+	 * back to to-down.
+	 */
+	memblock_set_bottom_up(true);
 	swiotlb_init(0);
 #endif
 
Signature · 1 line
2.24.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 lines · Mike Rapoport

From: Mike Rapoport <[email protected]>

Some powerpc platforms (e.g. 85xx) limit DMA-able memory way below 4G. If a system has more physical memory than this limit, the swiotlb buffer is not addressable because it is allocated from memblock using top-down mode.

Quoted 6 lines

Force memblock to bottom-up mode before calling swiotlb_init() to ensure that the swiotlb buffer is DMA-able.

Looks good:

#2 lore raw
In reply to Mike Rapoport
Quoted 10 lines · Mike Rapoport

From: Mike Rapoport <[email protected]>

Some powerpc platforms (e.g. 85xx) limit DMA-able memory way below 4G. If a system has more physical memory than this limit, the swiotlb buffer is not addressable because it is allocated from memblock using top-down mode.

Force memblock to bottom-up mode before calling swiotlb_init() to ensure that the swiotlb buffer is DMA-able.

This wasn't bisected, but I thought it was a regression. Do we know what commit caused it?

Was it 25078dc1f74b ("powerpc: use mm zones more sensibly") ?

Or was that a red herring?

cheers

Quoted 36 lines
Cc Benjamin Herrenschmidt <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Darren Stevens <[email protected]>
Cc mad skateman <[email protected]>
Cc Michael Ellerman <[email protected]>
Cc Nicolas Saenz Julienne <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Robin Murphy <[email protected]>
Cc Rob Herring <[email protected]>
---
 arch/powerpc/mm/mem.c | 8 ++++++++
 1 file changed, 8 insertions(+)
arch/powerpc/mm/mem.c +8 -0
index be941d382c8d..14c2c53e3f9e 100644
@@ -260,6 +260,14 @@ void __init mem_init(void)
 	BUILD_BUG_ON(MMU_PAGE_COUNT > 16);
 
 #ifdef CONFIG_SWIOTLB
+	/*
+	 * Some platforms (e.g. 85xx) limit DMA-able memory way below
+	 * 4G. We force memblock to bottom-up mode to ensure that the
+	 * memory allocated in swiotlb_init() is DMA-able.
+	 * As it's the last memblock allocation, no need to reset it
+	 * back to to-down.
+	 */
+	memblock_set_bottom_up(true);
 	swiotlb_init(0);
 #endif
 
Signature · 1 line
2.24.0
#3 lore raw
Quoted 10 lines · Michael Ellerman
Quoted 9 lines · Mike Rapoport

From: Mike Rapoport <[email protected]>

Some powerpc platforms (e.g. 85xx) limit DMA-able memory way below 4G. If a system has more physical memory than this limit, the swiotlb buffer is not addressable because it is allocated from memblock using top-down mode.

Force memblock to bottom-up mode before calling swiotlb_init() to ensure that the swiotlb buffer is DMA-able.

Quoted 6 lines
Quoted 1 line

This wasn't bisected, but I thought it was a regression. Do we know what commit caused it?

Was it 25078dc1f74b ("powerpc: use mm zones more sensibly") ?

swiotlb buffer is initialized before zones are actually used, so probably not :)

Quoted 40 lines

Or was that a red herring?

cheers

Quoted 36 lines
Cc Benjamin Herrenschmidt <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Darren Stevens <[email protected]>
Cc mad skateman <[email protected]>
Cc Michael Ellerman <[email protected]>
Cc Nicolas Saenz Julienne <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Robin Murphy <[email protected]>
Cc Rob Herring <[email protected]>
---
 arch/powerpc/mm/mem.c | 8 ++++++++
 1 file changed, 8 insertions(+)
arch/powerpc/mm/mem.c +8 -0
index be941d382c8d..14c2c53e3f9e 100644
@@ -260,6 +260,14 @@ void __init mem_init(void)
 	BUILD_BUG_ON(MMU_PAGE_COUNT > 16);
 
 #ifdef CONFIG_SWIOTLB
+	/*
+	 * Some platforms (e.g. 85xx) limit DMA-able memory way below
+	 * 4G. We force memblock to bottom-up mode to ensure that the
+	 * memory allocated in swiotlb_init() is DMA-able.
+	 * As it's the last memblock allocation, no need to reset it
+	 * back to to-down.
+	 */
+	memblock_set_bottom_up(true);
 	swiotlb_init(0);
 #endif
 
Signature · 1 line
2.24.0
Signature · 2 lines
Sincerely yours,
Mike.
#4 lore raw
In reply to Mike Rapoport
Quoted 6 lines · Mike Rapoport

From: Mike Rapoport <[email protected]>

Some powerpc platforms (e.g. 85xx) limit DMA-able memory way below 4G. If a system has more physical memory than this limit, the swiotlb buffer is not addressable because it is allocated from memblock using top-down mode.

Quoted 6 lines

Force memblock to bottom-up mode before calling swiotlb_init() to ensure that the swiotlb buffer is DMA-able.

Applied to powerpc fixes, thanks.

https://git.kernel.org/powerpc/c/8fabc623238e68b3ac63c0dd1657bf86c1fa33af

cheers