| From 8c31902cffc4d716450be549c66a67a8a3dd479c Mon Sep 17 00:00:00 2001 |
| From: "H.J. Lu" <hjl.tools@gmail.com> |
| Date: Mon, 4 Jan 2016 10:17:09 -0800 |
| Subject: x86/boot: Double BOOT_HEAP_SIZE to 64KB |
| |
| From: "H.J. Lu" <hjl.tools@gmail.com> |
| |
| commit 8c31902cffc4d716450be549c66a67a8a3dd479c upstream. |
| |
| When decompressing kernel image during x86 bootup, malloc memory |
| for ELF program headers may run out of heap space, which leads |
| to system halt. This patch doubles BOOT_HEAP_SIZE to 64KB. |
| |
| Tested with 32-bit kernel which failed to boot without this patch. |
| |
| Signed-off-by: H.J. Lu <hjl.tools@gmail.com> |
| Acked-by: H. Peter Anvin <hpa@zytor.com> |
| Cc: Andy Lutomirski <luto@amacapital.net> |
| Cc: Borislav Petkov <bp@alien8.de> |
| Cc: Brian Gerst <brgerst@gmail.com> |
| Cc: Denys Vlasenko <dvlasenk@redhat.com> |
| Cc: Linus Torvalds <torvalds@linux-foundation.org> |
| Cc: Peter Zijlstra <peterz@infradead.org> |
| Cc: Thomas Gleixner <tglx@linutronix.de> |
| Cc: linux-kernel@vger.kernel.org |
| Signed-off-by: Ingo Molnar <mingo@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/x86/include/asm/boot.h | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/arch/x86/include/asm/boot.h |
| +++ b/arch/x86/include/asm/boot.h |
| @@ -27,7 +27,7 @@ |
| #define BOOT_HEAP_SIZE 0x400000 |
| #else /* !CONFIG_KERNEL_BZIP2 */ |
| |
| -#define BOOT_HEAP_SIZE 0x8000 |
| +#define BOOT_HEAP_SIZE 0x10000 |
| |
| #endif /* !CONFIG_KERNEL_BZIP2 */ |
| |