2006-05-15 17:48:51

by Vivek Goyal

Subject: [PATCH] Kdump i386 nmi event notification fix

o After a crash we should wait for NMI IPI event and not for external NMI
or NMI watchdog tick.

Signed-off-by: Vivek Goyal <[email protected]>
---

linux-2.6.17-rc4-1M-vivek/arch/i386/kernel/crash.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff -puN arch/i386/kernel/crash.c~kdump-i386-nmi-event-notification-fix arch/i386/kernel/crash.c
--- linux-2.6.17-rc4-1M/arch/i386/kernel/crash.c~kdump-i386-nmi-event-notification-fix 2006-05-15 12:08:21.000000000 -0400
+++ linux-2.6.17-rc4-1M-vivek/arch/i386/kernel/crash.c 2006-05-15 13:25:09.000000000 -0400
@@ -102,7 +102,7 @@ static int crash_nmi_callback(struct not
struct pt_regs fixed_regs;
int cpu;

- if (val != DIE_NMI)
+ if (val != DIE_NMI_IPI)
return NOTIFY_OK;

regs = ((struct die_args *)data)->regs;
@@ -113,7 +113,7 @@ static int crash_nmi_callback(struct not
* an NMI if system was initially booted with nmi_watchdog parameter.
*/
if (cpu == crashing_cpu)
- return 1;
+ return NOTIFY_STOP;
local_irq_disable();

if (!user_mode_vm(regs)) {
_

2006-05-16 18:16:03

by Andi Kleen

Subject: Re: [PATCH] Kdump i386 nmi event notification fix

On Mon, May 15, 2006 at 01:48:35PM -0400, Vivek Goyal wrote:
>
>
> o After a crash we should wait for NMI IPI event and not for external NMI
> or NMI watchdog tick.

The two patches don't apply anymore after Don's big NMI rework.
Can you forward port and retest/resend please?
-Andi

2006-05-16 18:32:56

by Andrew Morton

Subject: Re: [PATCH] Kdump i386 nmi event notification fix

Andi Kleen <[email protected]> wrote:
>
> On Mon, May 15, 2006 at 01:48:35PM -0400, Vivek Goyal wrote:
> >
> >
> > o After a crash we should wait for NMI IPI event and not for external NMI
> > or NMI watchdog tick.
>
> The two patches don't apply anymore after Don's big NMI rework.
> Can you forward port and retest/resend please?

I have all this stuff queued up against your tree - I'll send it over.