Reserve memory for kdump kernel within RMO region
When the kernel size exceeds 32MB(observed with some distros), memory
for kdump kernel can not be reserved as kdump kernel base is assumed to
be 32MB always. When the kernel has CONFIG_RELOCATABLE option enabled,
provide the feature to reserve the memory for kdump kernel anywhere in
the RMO region.
Signed-off-by: M. Mohan Kumar <mohan at in.ibm.com>
---
arch/powerpc/kernel/machine_kexec.c | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/arch/powerpc/kernel/machine_kexec.c b/arch/powerpc/kernel/machine_kexec.c
index baf1af0..99b2f9f 100644
--- a/arch/powerpc/kernel/machine_kexec.c
+++ b/arch/powerpc/kernel/machine_kexec.c
@@ -140,10 +140,29 @@ void __init reserve_crashkernel(void)
/* The crash region must not overlap the current kernel */
if (overlaps_crashkernel(__pa(_stext), _end - _stext)) {
+#ifdef CONFIG_RELOCATABLE
+ do {
+ /* Align kdump kernel to 16MB (size of large page) */
+ crashk_res.start = ALIGN(crashk_res.start +
+ (16 * 1024 * 1024), 0x1000000);
+ if (crashk_res.start + (_stext - _end) > lmb.rmo_size) {
+ printk(KERN_WARNING
+ "Not enough memory for crash kernel\n");
+ crashk_res.start = crashk_res.end = 0;
+ return;
+ }
+ } while (overlaps_crashkernel(__pa(_stext), _end - _stext));
+
+ crashk_res.end = crashk_res.start + crash_size - 1;
+ printk(KERN_INFO
+ "crash kernel memory overlaps with kernel memory\n"
+ "Moving it to %lx\n", (unsigned long)crashk_res.start);
+#else
printk(KERN_WARNING
"Crash kernel can not overlap current kernel\n");
crashk_res.start = crashk_res.end = 0;
return;
+#endif
}
/* Crash kernel trumps memory limit */
--
1.5.4
