From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932238AbbJUKFC (ORCPT ); Wed, 21 Oct 2015 06:05:02 -0400 Received: from terminus.zytor.com ([198.137.202.10]:42094 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754398AbbJUKE7 (ORCPT ); Wed, 21 Oct 2015 06:04:59 -0400 Date: Wed, 21 Oct 2015 03:04:02 -0700 From: tip-bot for Baoquan He Message-ID: Cc: jroedel@suse.de, akpm@linux-foundation.org, mingo@kernel.org, msalter@redhat.com, jgross@suse.com, peterz@infradead.org, hpa@zytor.com, chaowang@redhat.com, tglx@linutronix.de, dyoung@redhat.com, linux-kernel@vger.kernel.org, luto@amacapital.net, bhe@redhat.com, jkosina@suse.cz, torvalds@linux-foundation.org, bp@suse.de Reply-To: bp@suse.de, jkosina@suse.cz, torvalds@linux-foundation.org, bhe@redhat.com, luto@amacapital.net, linux-kernel@vger.kernel.org, tglx@linutronix.de, dyoung@redhat.com, chaowang@redhat.com, hpa@zytor.com, peterz@infradead.org, jgross@suse.com, msalter@redhat.com, mingo@kernel.org, akpm@linux-foundation.org, jroedel@suse.de In-Reply-To: <1445246268-26285-2-git-send-email-bp@alien8.de> References: <1445246268-26285-2-git-send-email-bp@alien8.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:ras/core] x86/setup: Do not reserve crashkernel high memory if low reservation failed Git-Commit-ID: eb6db83d105914c246ac5875be76fd4b944833d5 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: eb6db83d105914c246ac5875be76fd4b944833d5 Gitweb: http://git.kernel.org/tip/eb6db83d105914c246ac5875be76fd4b944833d5 Author: Baoquan He AuthorDate: Mon, 19 Oct 2015 11:17:41 +0200 Committer: Ingo Molnar CommitDate: Wed, 21 Oct 2015 11:10:55 +0200 x86/setup: Do not reserve crashkernel high memory if low reservation failed People reported that when allocating crashkernel memory using the ",high" and ",low" syntax, there were cases where the reservation of the high portion succeeds but the reservation of the low portion fails. Then kexec can load the kdump kernel successfully, but booting the kdump kernel fails as there's no low memory. The low memory allocation for the kdump kernel can fail on large systems for a couple of reasons. For example, the manually specified crashkernel low memory can be too large and thus no adequate memblock region would be found. Therefore, we try to reserve low memory for the crash kernel *after* the high memory portion has been allocated. If that fails, we free crashkernel high memory too and return. The user can then take measures accordingly. Tested-by: Joerg Roedel Signed-off-by: Baoquan He [ Massage text. ] Signed-off-by: Borislav Petkov Reviewed-by: Joerg Roedel Cc: Andrew Morton Cc: Andy Lutomirski Cc: Dave Young Cc: H. Peter Anvin Cc: Jiri Kosina Cc: Juergen Gross Cc: Linus Torvalds Cc: Mark Salter Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: WANG Chao Cc: jerry_hoemann@hp.com Cc: yinghai@kernel.org Link: http://lkml.kernel.org/r/1445246268-26285-2-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar --- arch/x86/kernel/setup.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index fdb7f2a..1b36839 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -493,7 +493,7 @@ static void __init memblock_x86_reserve_range_setup_data(void) # define CRASH_KERNEL_ADDR_HIGH_MAX MAXMEM #endif -static void __init reserve_crashkernel_low(void) +static int __init reserve_crashkernel_low(void) { #ifdef CONFIG_X86_64 const unsigned long long alignment = 16<<20; /* 16M */ @@ -522,17 +522,16 @@ static void __init reserve_crashkernel_low(void) } else { /* passed with crashkernel=0,low ? */ if (!low_size) - return; + return 0; } low_base = memblock_find_in_range(low_size, (1ULL<<32), low_size, alignment); if (!low_base) { - if (!auto_set) - pr_info("crashkernel low reservation failed - No suitable area found.\n"); - - return; + pr_err("Cannot reserve %ldMB crashkernel low memory, please try smaller size.\n", + (unsigned long)(low_size >> 20)); + return -ENOMEM; } memblock_reserve(low_base, low_size); @@ -544,6 +543,7 @@ static void __init reserve_crashkernel_low(void) crashk_low_res.end = low_base + low_size - 1; insert_resource(&iomem_resource, &crashk_low_res); #endif + return 0; } static void __init reserve_crashkernel(void) @@ -595,6 +595,11 @@ static void __init reserve_crashkernel(void) } memblock_reserve(crash_base, crash_size); + if (crash_base >= (1ULL << 32) && reserve_crashkernel_low()) { + memblock_free(crash_base, crash_size); + return; + } + printk(KERN_INFO "Reserving %ldMB of memory at %ldMB " "for crashkernel (System RAM: %ldMB)\n", (unsigned long)(crash_size >> 20), @@ -604,9 +609,6 @@ static void __init reserve_crashkernel(void) crashk_res.start = crash_base; crashk_res.end = crash_base + crash_size - 1; insert_resource(&iomem_resource, &crashk_res); - - if (crash_base >= (1ULL<<32)) - reserve_crashkernel_low(); } #else static void __init reserve_crashkernel(void)