Commit 673a6092 authored Jan 06, 2011 by Don Zickus Committed by Ingo Molnar Jan 07, 2011

x86: Convert some devices to use DIE_NMIUNKNOWN



They are a handful of places in the code that register a die_notifier
as a catch all in case no claims the NMI.  Unfortunately, they trigger
on events like DIE_NMI and DIE_NMI_IPI, which depending on when they
registered may collide with other handlers that have the ability to
determine if the NMI is theirs or not.

The function unknown_nmi_error() makes one last effort to walk the
die_chain when no one else has claimed the NMI before spitting out
messages that the NMI is unknown.

This is a better spot for these devices to execute any code without
colliding with the other handlers.

The two drivers modified are only compiled on x86 arches I believe, so
they shouldn't be affected by other arches that may not have
DIE_NMIUNKNOWN defined.

Signed-off-by: Don Zickus <dzickus@redhat.com>
Cc: Russ Anderson <rja@sgi.com>
Cc: Corey Minyard <minyard@acm.org>
Cc: openipmi-developer@lists.sourceforge.net
Cc: dann frazier <dannf@hp.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1294348732-15030-3-git-send-email-dzickus@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent 1c7b74d4

arch/x86/kernel/apic/x2apic_uv_x.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -639,7 +639,7 @@ void __cpuinit uv_cpu_init(void)
		*/
		int uv_handle_nmi(struct notifier_block self, unsigned long reason, void data)
		{
		if (reason != DIE_NMI_IPI)
		if (reason != DIE_NMIUNKNOWN)
		return NOTIFY_OK;

		if (in_crash_kexec)

drivers/char/ipmi/ipmi_watchdog.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1081,7 +1081,7 @@ ipmi_nmi(struct notifier_block self, unsigned long val, void data)
		{
		struct die_args *args = data;

		if (val != DIE_NMI)
		if (val != DIE_NMIUNKNOWN)
		return NOTIFY_OK;

		/* Hack, if it's a memory or I/O error, ignore it. */

drivers/watchdog/hpwdt.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -469,7 +469,7 @@ static int hpwdt_pretimeout(struct notifier_block *nb, unsigned long ulReason,
		unsigned long rom_pl;
		static int die_nmi_called;

		if (ulReason != DIE_NMI && ulReason != DIE_NMI_IPI)
		if (ulReason != DIE_NMIUNKNOWN)
		goto out;

		if (!hpwdt_nmi_decoding)

Admin message