Re: kdump broken on 2.6.37-rc4

["H. Peter Anvin" <hpa@zytor.com>]

[-- Attachment #1: Type: text/plain, Size: 645 bytes --]

On 12/15/2010 08:29 PM, Yinghai Lu wrote:
> please check
> 
> [PATCH] x86, crashkernel, 32bit: only try to get range under 512M
> 
> Steanishlaw report kdump is 32bit is broken.
> 
> in misc.c for decompresser, it will do sanity checking to make sure heap
> heap under 512M.
> 
> So limit it in first kernel under 512M for 32bit system.
> 
> Reported-by: Stanislaw Gruszka <sgruszka@redhat.com>
> Signed-off-by: Yinghai Lu <yinghai@kernel.org>
> 
> ---
>  arch/x86/kernel/setup.c |   14 +++++++++++++-
>  1 file changed, 13 insertions(+), 1 deletion(-)
> 

I'd like to apply a modified version of this patch (attached.)

Ack/nak, people?

	-hpa

[-- Attachment #2: 0001-x86-kexec-Limit-the-crashkernel-address-to-512-MiB.patch --]
[-- Type: text/x-patch, Size: 1977 bytes --]

>From 3f060a5da7498cd725ef41cb67f8ced362a81729 Mon Sep 17 00:00:00 2001
From: H. Peter Anvin <hpa@linux.intel.com>
Date: Thu, 16 Dec 2010 19:20:41 -0800
Subject: [PATCH] x86, kexec: Limit the crashkernel address to 512 MiB

We used to only map a maximum of 512 MiB of low memory for the kernel
initialization; this was enforced by the bzImage decompressor.  To
make sure we do not run afoul of this limitation, keep the crash
kernel below the 512 MiB mark.

This also adds a comfortable margin in case the user is running with a
nonstandard vmalloc= setting.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: Stanislaw Gruszka <sgruszka@redhat.com>
Cc: Yinghai Lu <yinghai@kernel.org>
LKML-Reference: <4D09958D.2040907@kernel.org>
---
 arch/x86/kernel/setup.c |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 21c6746..7fb9abb 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -501,7 +501,12 @@ static inline unsigned long long get_total_mem(void)
 	return total << PAGE_SHIFT;
 }
 
-#define DEFAULT_BZIMAGE_ADDR_MAX 0x37FFFFFF
+/*
+ * Keep the crash kernel below this limit.  Not all bzImage kernels
+ * can be loaded above this address.
+ */
+#define CRASH_KERNEL_ADDR_MAX	(512 << 20)
+
 static void __init reserve_crashkernel(void)
 {
 	unsigned long long total_mem;
@@ -520,10 +525,10 @@ static void __init reserve_crashkernel(void)
 		const unsigned long long alignment = 16<<20;	/* 16M */
 
 		/*
-		 *  kexec want bzImage is below DEFAULT_BZIMAGE_ADDR_MAX
+		 *  kexec want bzImage is below CRASH_KERNEL_ADDR_MAX
 		 */
 		crash_base = memblock_find_in_range(alignment,
-			       DEFAULT_BZIMAGE_ADDR_MAX, crash_size, alignment);
+			       CRASH_KERNEL_ADDR_MAX, crash_size, alignment);
 
 		if (crash_base == MEMBLOCK_ERROR) {
 			pr_info("crashkernel reservation failed - No suitable area found.\n");
-- 
1.7.2.3