This patch is the same as one sent Jun18 2010. It doesn't seem to
have been noticed.
UV NMI callback's should not write stack dumps when a kdump is to be written.
When invoking the crash kernel to write a dump, kdump_nmi_shootdown_cpus()
uses NMI's to get all the cpu's to save their register context and halt.
But the NMI interrupt handler runs a callback list. This patch sets a flag
to prevent any of those callbacks from interfering with the halt of the cpu.
For UV, which currently has the only callback to which this is relevant, the
uv_handle_nmi() callback should not do dumping of stacks.
The 'in_crash_kexec' flag is defined as an extern in kdebug.h firstly
because x2apic_uv_x.c includes it. Secondly because some future callback
might need the flag to know that it should not enter the debugger.
(Such a scenario was in fact present in the 2.6.32 kernel, SuSE distribution,
where a call to kdb needed to be avoided.)
Diffed against 2.6.35
Signed-off-by: Cliff Wickman <[email protected]>
---
arch/x86/include/asm/kdebug.h | 1 +
arch/x86/kernel/apic/x2apic_uv_x.c | 4 ++++
arch/x86/kernel/crash.c | 3 +++
3 files changed, 8 insertions(+)
Index: linux-2.6.35-rc3/arch/x86/kernel/apic/x2apic_uv_x.c
===================================================================
--- linux-2.6.35-rc3.orig/arch/x86/kernel/apic/x2apic_uv_x.c
+++ linux-2.6.35-rc3/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -604,6 +604,10 @@ int uv_handle_nmi(struct notifier_block
{
if (reason != DIE_NMI_IPI)
return NOTIFY_OK;
+
+ if (in_crash_kexec)
+ /* do nothing if entering the crash kernel */
+ return NOTIFY_OK;
/*
* Use a lock so only one cpu prints at a time
* to prevent intermixed output.
Index: linux-2.6.35-rc3/arch/x86/kernel/crash.c
===================================================================
--- linux-2.6.35-rc3.orig/arch/x86/kernel/crash.c
+++ linux-2.6.35-rc3/arch/x86/kernel/crash.c
@@ -28,6 +28,8 @@
#include <asm/reboot.h>
#include <asm/virtext.h>
+int in_crash_kexec;
+
#if defined(CONFIG_SMP) && defined(CONFIG_X86_LOCAL_APIC)
static void kdump_nmi_callback(int cpu, struct die_args *args)
@@ -61,6 +63,7 @@ static void kdump_nmi_callback(int cpu,
static void kdump_nmi_shootdown_cpus(void)
{
+ in_crash_kexec = 1;
nmi_shootdown_cpus(kdump_nmi_callback);
disable_local_APIC();
Index: linux-2.6.35-rc3/arch/x86/include/asm/kdebug.h
===================================================================
--- linux-2.6.35-rc3.orig/arch/x86/include/asm/kdebug.h
+++ linux-2.6.35-rc3/arch/x86/include/asm/kdebug.h
@@ -33,5 +33,6 @@ extern void __show_regs(struct pt_regs *
extern void show_regs(struct pt_regs *regs);
extern unsigned long oops_begin(void);
extern void oops_end(unsigned long, struct pt_regs *, int signr);
+extern int in_crash_kexec;
#endif /* _ASM_X86_KDEBUG_H */
Commit-ID: 5edd19af18a36a4e22c570b1b969179e0ca1fe4c
Gitweb: http://git.kernel.org/tip/5edd19af18a36a4e22c570b1b969179e0ca1fe4c
Author: Cliff Wickman <[email protected]>
AuthorDate: Tue, 20 Jul 2010 18:09:05 -0500
Committer: H. Peter Anvin <[email protected]>
CommitDate: Wed, 21 Jul 2010 11:33:27 -0700
x86, UV: Make kdump avoid stack dumps
UV NMI callback's should not write stack dumps when a kdump is to be written.
When invoking the crash kernel to write a dump, kdump_nmi_shootdown_cpus()
uses NMI's to get all the cpu's to save their register context and halt.
But the NMI interrupt handler runs a callback list. This patch sets a flag
to prevent any of those callbacks from interfering with the halt of the cpu.
For UV, which currently has the only callback to which this is relevant, the
uv_handle_nmi() callback should not do dumping of stacks.
The 'in_crash_kexec' flag is defined as an extern in kdebug.h firstly
because x2apic_uv_x.c includes it. Secondly because some future callback
might need the flag to know that it should not enter the debugger.
(Such a scenario was in fact present in the 2.6.32 kernel, SuSE distribution,
where a call to kdb needed to be avoided.)
Signed-off-by: Cliff Wickman <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: H. Peter Anvin <[email protected]>
---
arch/x86/include/asm/kdebug.h | 1 +
arch/x86/kernel/apic/x2apic_uv_x.c | 4 ++++
arch/x86/kernel/crash.c | 3 +++
3 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/arch/x86/include/asm/kdebug.h b/arch/x86/include/asm/kdebug.h
index fa7c0b9..7a2910b 100644
--- a/arch/x86/include/asm/kdebug.h
+++ b/arch/x86/include/asm/kdebug.h
@@ -33,5 +33,6 @@ extern void __show_regs(struct pt_regs *regs, int all);
extern void show_regs(struct pt_regs *regs);
extern unsigned long oops_begin(void);
extern void oops_end(unsigned long, struct pt_regs *, int signr);
+extern int in_crash_kexec;
#endif /* _ASM_X86_KDEBUG_H */
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index e46f98f..7b598b8 100644
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -604,6 +604,10 @@ int uv_handle_nmi(struct notifier_block *self, unsigned long reason, void *data)
{
if (reason != DIE_NMI_IPI)
return NOTIFY_OK;
+
+ if (in_crash_kexec)
+ /* do nothing if entering the crash kernel */
+ return NOTIFY_OK;
/*
* Use a lock so only one cpu prints at a time
* to prevent intermixed output.
diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
index ebd4c51..764c7c2 100644
--- a/arch/x86/kernel/crash.c
+++ b/arch/x86/kernel/crash.c
@@ -28,6 +28,8 @@
#include <asm/reboot.h>
#include <asm/virtext.h>
+int in_crash_kexec;
+
#if defined(CONFIG_SMP) && defined(CONFIG_X86_LOCAL_APIC)
static void kdump_nmi_callback(int cpu, struct die_args *args)
@@ -61,6 +63,7 @@ static void kdump_nmi_callback(int cpu, struct die_args *args)
static void kdump_nmi_shootdown_cpus(void)
{
+ in_crash_kexec = 1;
nmi_shootdown_cpus(kdump_nmi_callback);
disable_local_APIC();
* tip-bot for Cliff Wickman <[email protected]> wrote:
> Commit-ID: 5edd19af18a36a4e22c570b1b969179e0ca1fe4c
> Gitweb: http://git.kernel.org/tip/5edd19af18a36a4e22c570b1b969179e0ca1fe4c
> Author: Cliff Wickman <[email protected]>
> AuthorDate: Tue, 20 Jul 2010 18:09:05 -0500
> Committer: H. Peter Anvin <[email protected]>
> CommitDate: Wed, 21 Jul 2010 11:33:27 -0700
>
> x86, UV: Make kdump avoid stack dumps
FYI, this triggers the following build failure in -tip:
arch/x86/built-in.o: In function `uv_handle_nmi':
(.text+0x27ce5): undefined reference to `in_crash_kexec'
Ingo