From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754864AbZHUGz1 (ORCPT ); Fri, 21 Aug 2009 02:55:27 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754828AbZHUGzZ (ORCPT ); Fri, 21 Aug 2009 02:55:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49837 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754778AbZHUGzX (ORCPT ); Fri, 21 Aug 2009 02:55:23 -0400 Date: Fri, 21 Aug 2009 02:54:44 -0400 From: Amerigo Wang To: linux-kernel@vger.kernel.org Cc: tony.luck@intel.com, linux-ia64@vger.kernel.org, Neil Horman , "Eric W. Biederman" , Andi Kleen , Ingo Molnar , Amerigo Wang , akpm@linux-foundation.org, bernhard.walle@gmx.de, Fenghua Yu , kamezawa.hiroyu@jp.fujitsu.com, Anton Vorontsov Message-Id: <20090821065709.4855.54182.sendpatchset@localhost.localdomain> In-Reply-To: <20090821065637.4855.32234.sendpatchset@localhost.localdomain> References: <20090821065637.4855.32234.sendpatchset@localhost.localdomain> Subject: [Patch 3/8] x86: implement crashkernel=auto Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Implement "crashkernel=auto" for x86 first, other arch will be added in the following patches. The kernel will modify this command line with the actually reserved size, in case of breaking any user-space programs. Signed-off-by: WANG Cong Cc: Eric W. Biederman Cc: Ingo Molnar --- Index: linux-2.6/kernel/kexec.c =================================================================== --- linux-2.6.orig/kernel/kexec.c +++ linux-2.6/kernel/kexec.c @@ -37,6 +37,7 @@ #include #include #include +#include /* Per cpu memory for storing cpu states in case of system crash. */ note_buf_t* crash_notes; @@ -1297,6 +1298,39 @@ int __init parse_crashkernel(char *cm ck_cmdline += 12; /* strlen("crashkernel=") */ +#ifdef CONFIG_KEXEC_AUTO_RESERVE + if (strncmp(ck_cmdline, "auto", 4) == 0) { + unsigned long long size; + int len; + char tmp[32]; + + size = arch_default_crash_size(system_ram); + if (size != 0) { + *crash_size = size; + *crash_base = arch_default_crash_base(); + len = scnprintf(tmp, sizeof(tmp), "%luM@%luM", + (unsigned long)(*crash_size)>>20, + (unsigned long)(*crash_base)>>20); + /* 'len' can't be <= 4. */ + if (likely((len - 4 + strlen(cmdline)) + < COMMAND_LINE_SIZE - 1)) { + memmove(ck_cmdline + len, ck_cmdline + 4, + strlen(cmdline) - (ck_cmdline + 4 - cmdline) + 1); + memcpy(ck_cmdline, tmp, len); + } + return 0; + } else { + /* + * We can't reserve memory auotmatcally, + * remove "crashkernel=auto" from cmdline. + */ + ck_cmdline += 4; /* strlen("auto") */ + memmove(ck_cmdline - 16, ck_cmdline, + strlen(cmdline) - (ck_cmdline - cmdline) + 1); + return -ENOMEM; + } + } +#endif /* * if the commandline contains a ':', then that's the extended * syntax -- if not, it must be the classic syntax Index: linux-2.6/arch/x86/include/asm/kexec.h =================================================================== --- linux-2.6.orig/arch/x86/include/asm/kexec.h +++ linux-2.6/arch/x86/include/asm/kexec.h @@ -23,6 +23,7 @@ #include #include +#include /* * KEXEC_SOURCE_MEMORY_LIMIT maximum page get_free_page can return. Index: linux-2.6/include/asm-generic/kexec.h =================================================================== --- /dev/null +++ linux-2.6/include/asm-generic/kexec.h @@ -0,0 +1,42 @@ +#ifndef _ASM_GENERIC_KEXEC_H +#define _ASM_GENERIC_KEXEC_H + +#ifdef CONFIG_KEXEC_AUTO_RESERVE + +#ifndef KEXEC_AUTO_RESERVED_SIZE +#define KEXEC_AUTO_RESERVED_SIZE (1ULL<<27) /* 128M */ +#endif +#ifndef KEXEC_AUTO_THRESHOLD +#define KEXEC_AUTO_THRESHOLD (1ULL<<32) /* 4G */ +#endif + +#ifndef ARCH_HAS_DEFAULT_CRASH_SIZE +static inline +unsigned long long arch_default_crash_size(unsigned long long total_size) +{ + if (total_size < KEXEC_AUTO_THRESHOLD) + return 0; + else { +#ifdef CONFIG_64BIT + if (total_size > 1ULL<<40) /* 1TB */ + return KEXEC_AUTO_RESERVED_SIZE + * (1ULL<<40 / KEXEC_AUTO_THRESHOLD); + return 1ULL<