From: Amerigo Wang <amwang@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: tony.luck@intel.com, linux-ia64@vger.kernel.org,
Neil Horman <nhorman@redhat.com>,
"Eric W. Biederman" <ebiederm@xmission.com>,
kamezawa.hiroyu@jp.fujitsu.com, Andi Kleen <andi@firstfloor.org>,
Michael Ellerman <michael@ellerman.id.au>,
Amerigo Wang <amwang@redhat.com>,
"M. Mohan Kumar" <mohan@in.ibm.com>,
akpm@linux-foundation.org, bernhard.walle@gmx.de,
Fenghua Yu <fenghua.yu@intel.com>, Ingo Molnar <mingo@elte.hu>,
Anton Vorontsov <avorontsov@ru.mvista.com>
Subject: [Patch 6/8] powerpc: implement crashkernel=auto
Date: Fri, 04 Sep 2009 10:09:26 +0000 [thread overview]
Message-ID: <20090904101153.5220.97139.sendpatchset@localhost.localdomain> (raw)
In-Reply-To: <20090904101047.5220.20618.sendpatchset@localhost.localdomain>
Since in patch 2/8 we already implement the generic part, this will
add the rest part for powerpc.
Signed-off-by: WANG Cong <amwang@redhat.com>
Cc: Anton Vorontsov <avorontsov@ru.mvista.com>
Cc: M. Mohan Kumar <mohan@in.ibm.com>
Cc: Michael Ellerman <michael@ellerman.id.au>
---
Index: linux-2.6/arch/powerpc/include/asm/kexec.h
=================================--- linux-2.6.orig/arch/powerpc/include/asm/kexec.h
+++ linux-2.6/arch/powerpc/include/asm/kexec.h
@@ -39,6 +39,28 @@ typedef void (*crash_shutdown_t)(void);
#ifdef CONFIG_KEXEC
+#ifdef CONFIG_KEXEC_AUTO_RESERVE
+
+#ifndef KEXEC_AUTO_THRESHOLD
+#define KEXEC_AUTO_THRESHOLD (1ULL<<31) /* 2G */
+#endif
+
+#ifndef arch_default_crash_base
+extern
+unsigned long long __init arch_default_crash_base(void);
+#define arch_default_crash_base arch_default_crash_base
+#endif
+
+#ifndef arch_default_crash_size
+extern
+unsigned long long __init arch_default_crash_size(unsigned long long);
+#define arch_default_crash_size arch_default_crash_size
+#endif
+
+#endif
+
+#include <asm-generic/kexec.h>
+
/*
* This function is responsible for capturing register states if coming
* via panic or invoking dump using sysrq-trigger.
Index: linux-2.6/arch/powerpc/kernel/machine_kexec.c
=================================--- linux-2.6.orig/arch/powerpc/kernel/machine_kexec.c
+++ linux-2.6/arch/powerpc/kernel/machine_kexec.c
@@ -61,6 +61,30 @@ void machine_kexec(struct kimage *image)
for(;;);
}
+#ifdef CONFIG_KEXEC_AUTO_RESERVE
+unsigned long long __init arch_default_crash_base(void)
+{
+ return KDUMP_KERNELBASE;
+}
+
+unsigned long long __init arch_default_crash_size(unsigned long long total_size)
+{
+ if (total_size < KEXEC_AUTO_THRESHOLD)
+ return 0;
+ if (total_size < (1ULL<<32))
+ return 1ULL<<27;
+ else {
+#ifdef CONFIG_64BIT
+ if (total_size > (1ULL<<37)) /* 128G */
+ return 1ULL<<32; /* 4G */
+ return 1ULL<<ilog2(roundup(total_size/32, 1ULL<<21));
+#else
+ return 1ULL<<28;
+#endif
+ }
+}
+#endif
+
void __init reserve_crashkernel(void)
{
unsigned long long crash_size, crash_base;
WARNING: multiple messages have this Message-ID (diff)
From: Amerigo Wang <amwang@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: tony.luck@intel.com, linux-ia64@vger.kernel.org,
Neil Horman <nhorman@redhat.com>,
"Eric W. Biederman" <ebiederm@xmission.com>,
kamezawa.hiroyu@jp.fujitsu.com, Andi Kleen <andi@firstfloor.org>,
Michael Ellerman <michael@ellerman.id.au>,
Amerigo Wang <amwang@redhat.com>,
"M. Mohan Kumar" <mohan@in.ibm.com>,
akpm@linux-foundation.org, bernhard.walle@gmx.de,
Fenghua Yu <fenghua.yu@intel.com>, Ingo Molnar <mingo@elte.hu>,
Anton Vorontsov <avorontsov@ru.mvista.com>
Subject: [Patch 6/8] powerpc: implement crashkernel=auto
Date: Fri, 4 Sep 2009 06:09:26 -0400 [thread overview]
Message-ID: <20090904101153.5220.97139.sendpatchset@localhost.localdomain> (raw)
In-Reply-To: <20090904101047.5220.20618.sendpatchset@localhost.localdomain>
Since in patch 2/8 we already implement the generic part, this will
add the rest part for powerpc.
Signed-off-by: WANG Cong <amwang@redhat.com>
Cc: Anton Vorontsov <avorontsov@ru.mvista.com>
Cc: M. Mohan Kumar <mohan@in.ibm.com>
Cc: Michael Ellerman <michael@ellerman.id.au>
---
Index: linux-2.6/arch/powerpc/include/asm/kexec.h
===================================================================
--- linux-2.6.orig/arch/powerpc/include/asm/kexec.h
+++ linux-2.6/arch/powerpc/include/asm/kexec.h
@@ -39,6 +39,28 @@ typedef void (*crash_shutdown_t)(void);
#ifdef CONFIG_KEXEC
+#ifdef CONFIG_KEXEC_AUTO_RESERVE
+
+#ifndef KEXEC_AUTO_THRESHOLD
+#define KEXEC_AUTO_THRESHOLD (1ULL<<31) /* 2G */
+#endif
+
+#ifndef arch_default_crash_base
+extern
+unsigned long long __init arch_default_crash_base(void);
+#define arch_default_crash_base arch_default_crash_base
+#endif
+
+#ifndef arch_default_crash_size
+extern
+unsigned long long __init arch_default_crash_size(unsigned long long);
+#define arch_default_crash_size arch_default_crash_size
+#endif
+
+#endif
+
+#include <asm-generic/kexec.h>
+
/*
* This function is responsible for capturing register states if coming
* via panic or invoking dump using sysrq-trigger.
Index: linux-2.6/arch/powerpc/kernel/machine_kexec.c
===================================================================
--- linux-2.6.orig/arch/powerpc/kernel/machine_kexec.c
+++ linux-2.6/arch/powerpc/kernel/machine_kexec.c
@@ -61,6 +61,30 @@ void machine_kexec(struct kimage *image)
for(;;);
}
+#ifdef CONFIG_KEXEC_AUTO_RESERVE
+unsigned long long __init arch_default_crash_base(void)
+{
+ return KDUMP_KERNELBASE;
+}
+
+unsigned long long __init arch_default_crash_size(unsigned long long total_size)
+{
+ if (total_size < KEXEC_AUTO_THRESHOLD)
+ return 0;
+ if (total_size < (1ULL<<32))
+ return 1ULL<<27;
+ else {
+#ifdef CONFIG_64BIT
+ if (total_size > (1ULL<<37)) /* 128G */
+ return 1ULL<<32; /* 4G */
+ return 1ULL<<ilog2(roundup(total_size/32, 1ULL<<21));
+#else
+ return 1ULL<<28;
+#endif
+ }
+}
+#endif
+
void __init reserve_crashkernel(void)
{
unsigned long long crash_size, crash_base;
next prev parent reply other threads:[~2009-09-04 10:09 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-04 10:08 [Patch 0/8] V6 Implement crashkernel=auto Amerigo Wang
2009-09-04 10:08 ` Amerigo Wang
2009-09-04 10:08 ` [Patch 1/8] x86: add CONFIG_KEXEC_AUTO_RESERVE Amerigo Wang
2009-09-04 10:08 ` Amerigo Wang
2009-09-04 10:08 ` [Patch 2/8] x86: implement crashkernel=auto Amerigo Wang
2009-09-04 10:08 ` Amerigo Wang
2009-09-04 10:08 ` [Patch 3/8] ia64: add CONFIG_KEXEC_AUTO_RESERVE Amerigo Wang
2009-09-04 10:08 ` Amerigo Wang
2009-09-04 10:09 ` [Patch 4/8] ia64: implement crashkernel=auto Amerigo Wang
2009-09-04 10:09 ` Amerigo Wang
2009-09-04 10:09 ` [Patch 5/8] powerpc: add CONFIG_KEXEC_AUTO_RESERVE Amerigo Wang
2009-09-04 10:09 ` Amerigo Wang
2009-09-04 10:09 ` Amerigo Wang [this message]
2009-09-04 10:09 ` [Patch 6/8] powerpc: implement crashkernel=auto Amerigo Wang
2009-09-04 10:09 ` [Patch 7/8] doc: update the kdump document Amerigo Wang
2009-09-04 10:09 ` Amerigo Wang
2009-09-04 10:09 ` [Patch 8/8] kexec: allow to shrink reserved memory Amerigo Wang
2009-09-04 10:09 ` Amerigo Wang
-- strict thread matches above, loose matches on Subject: below --
2009-08-27 3:15 [Patch 0/8] V5 Implement crashkernel=auto Amerigo Wang
2009-08-27 3:16 ` [Patch 6/8] powerpc: implement crashkernel=auto Amerigo Wang
2009-08-27 3:16 ` Amerigo Wang
2009-08-27 18:22 ` Yu, Fenghua
2009-08-27 18:22 ` Yu, Fenghua
2009-08-12 8:15 [Patch 0/8] V3 Implement crashkernel=auto Amerigo Wang
2009-08-12 8:16 ` [Patch 6/8] powerpc: implement crashkernel=auto Amerigo Wang
2009-08-12 8:16 ` Amerigo Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090904101153.5220.97139.sendpatchset@localhost.localdomain \
--to=amwang@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=andi@firstfloor.org \
--cc=avorontsov@ru.mvista.com \
--cc=bernhard.walle@gmx.de \
--cc=ebiederm@xmission.com \
--cc=fenghua.yu@intel.com \
--cc=kamezawa.hiroyu@jp.fujitsu.com \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michael@ellerman.id.au \
--cc=mingo@elte.hu \
--cc=mohan@in.ibm.com \
--cc=nhorman@redhat.com \
--cc=tony.luck@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.