When we're using the Radix MMU we map the kernel linear mapping with
1G pages. That means we must do memory hot remove in blocks of at
least that size. Otherwise the linear mapping can end up not mapping
all of memory because we've removed part of a 1G region but unmapped
the entire 1G region from the linear mapping.
Currently on pseries we consult the device tree to find out the the
"LMB" (Logical Memory Block) size. This is the unit of memory hotplug
communicated to us by the hypervisor, but it does not take into
account anything the kernel has done itself, such as use 1G pages for
the linear mapping.
So take what's in the device tree as a start, but make sure we round
up to 1G when Radix is enabled if the size from the device tree is
smaller.
Note that this code is also theoretically broken on hash, except that
with hash we use 16MB pages for the linear mapping and all hypervisors
I'm aware of use at least a 256MB LMB size.
Fixes: 4b5d62ca17a1 ("powerpc/mm: add radix__remove_section_mapping()")
Cc: sta...@vger.kernel.org # v4.11+
Signed-off-by: Michael Ellerman <m...@ellerman.id.au>
---
arch/powerpc/platforms/pseries/hotplug-memory.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c
b/arch/powerpc/platforms/pseries/hotplug-memory.c
index 1d48ab424bd9..a602be935777 100644
--- a/arch/powerpc/platforms/pseries/hotplug-memory.c
+++ b/arch/powerpc/platforms/pseries/hotplug-memory.c
@@ -67,6 +67,15 @@ unsigned long pseries_memory_block_size(void)
}
}
}
+
+ /*
+ * We map the kernel linear region with 1GB large pages on radix. For
+ * memory hot unplug to work our memory block size must be at least
+ * that big.
+ */
+ if (radix_enabled())
+ memblock_size = max(1u << 30, memblock_size);
+
return memblock_size;
}
--
2.14.3
