Skip to contentSkip to conversation

x86: Remove old nmi_watchdog

PATCH In review Don Zickus 3 participants 9 messages Nov 23, 2010 – Nov 24, 2010

Subsystems (8)
Documentation x86 ACPI perf events +4 more subsystems
lore
Share & tools
lore

Don Zickus

author
#0 lore raw

v2 cover x86: Remove old nmi_watchdog

Ingo asked me to remove the old nmi_watchdog to minimize the amount of code duplication we have to do for recent fixes. All the functionality needed by the old nmi watchdog should be available in perf now.

This is done in two parts. The first part is simply remove the old code and leave stubs for the functions that were removed. This mimics the behaviour of the new nmi watchdog.

The second parts removes all the stub functions, which is probably a little more intrusive, but basically dead code anyway.

The only small piece left is the perf counter reservation code. That can't be removed until oprofile is modified to sit on top of perf (if that is possible).

Compile tested for 32/64 bit with the lockup detector turned on and off. Tested on 32/64 bit machines to make sure they still boot properly.

NOTE: This patch will clash with my nmi rewrite patch series. I don't which patch series will go in first. I can refresh either one once one of them is merged.

Don Zickus (3):
x86, NMI: Remove do_nmi_callback logic
x86, nmi_watchdog: remove the old nmi_watchdog x86, nmi_watchdog: remove all stub function calls from old
nmi_watchdog

 Documentation/kernel-parameters.txt    |   10 +-
 arch/x86/include/asm/nmi.h             |   51 ---
 arch/x86/include/asm/smpboot_hooks.h   |    1 -
 arch/x86/include/asm/timer.h           |    6 -
 arch/x86/kernel/apic/Makefile          |    5 +-
 arch/x86/kernel/apic/apic.c            |   15 +-
 arch/x86/kernel/apic/hw_nmi.c          |   27 +-
 arch/x86/kernel/apic/io_apic.c         |   46 ---
 arch/x86/kernel/apic/nmi.c             |  567 ----------------------------
 arch/x86/kernel/cpu/perf_event.c       |    9 -
 arch/x86/kernel/cpu/perfctr-watchdog.c |  642 --------------------------------
 arch/x86/kernel/smpboot.c              |   11 -
 arch/x86/kernel/time.c                 |   18 -
 arch/x86/kernel/traps.c                |   26 +-
 arch/x86/oprofile/nmi_timer_int.c      |    3 -
 drivers/acpi/acpica/nsinit.c           |    2 -
 drivers/watchdog/hpwdt.c               |    7 +-
 include/linux/nmi.h                    |    4 -
 kernel/sysctl.c                        |    9 +-
 kernel/sysctl_binary.c                 |    1 -
 kernel/watchdog.c                      |    2 +
 21 files changed, 29 insertions(+), 1433 deletions(-)
 delete mode 100644 arch/x86/kernel/apic/nmi.c
Signature · 1 line
1.7.3.2
author
#1 lore raw

PATCH v2 1/3 x86, NMI: Remove do_nmi_callback logic

From: Huang Ying <[email protected]>

do_nmi_callback related logic is removed, because it is useless, just adds code complexity.

unknown_nmi_panic sysctl is reserved to keep kernel ABI unchanged.

[ I made a bunch of tweaks to deal with the this being a standalone
patch instead of later in a series -dcz ]

---
 arch/x86/kernel/apic/hw_nmi.c |    1 -
 arch/x86/kernel/apic/nmi.c    |   27 ---------------------------
 arch/x86/kernel/traps.c       |   16 +++++++++++-----
 3 files changed, 11 insertions(+), 33 deletions(-)
arch/x86/kernel/apic/hw_nmi.c +0 -1
index cefd694..e66b16d 100644
@@ -100,7 +100,6 @@ void acpi_nmi_disable(void) { return; }
 #endif
 atomic_t nmi_active = ATOMIC_INIT(0);           /* oprofile uses this */
 EXPORT_SYMBOL(nmi_active);
-int unknown_nmi_panic;
 void cpu_nmi_set_wd_enabled(void) { return; }
 void stop_apic_nmi_watchdog(void *unused) { return; }
 void setup_apic_nmi_watchdog(void *unused) { return; }
arch/x86/kernel/apic/nmi.c +0 -27
index c90041c..7bab143 100644
@@ -37,7 +37,6 @@
 
 #include <asm/mach_traps.h>
 
-int unknown_nmi_panic;
 int nmi_watchdog_enabled;
 
 /* For reliability, we're prepared to waste bits here. */
@@ -483,23 +482,6 @@ static void disable_ioapic_nmi_watchdog(void)
 	on_each_cpu(stop_apic_nmi_watchdog, NULL, 1);
 }
 
-static int __init setup_unknown_nmi_panic(char *str)
-{
-	unknown_nmi_panic = 1;
-	return 1;
-}
-__setup("unknown_nmi_panic", setup_unknown_nmi_panic);
-
-static int unknown_nmi_panic_callback(struct pt_regs *regs, int cpu)
-{
-	unsigned char reason = get_nmi_reason();
-	char buf[64];
-
-	sprintf(buf, "NMI received for unknown reason %02x\n", reason);
-	die_nmi(buf, regs, 1); /* Always panic here */
-	return 0;
-}
-
 /*
  * proc handler for /proc/sys/kernel/nmi
  */
@@ -540,15 +522,6 @@ int proc_nmi_enabled(struct ctl_table *table, int write,
 
 #endif /* CONFIG_SYSCTL */
 
-int do_nmi_callback(struct pt_regs *regs, int cpu)
-{
-#ifdef CONFIG_SYSCTL
-	if (unknown_nmi_panic)
-		return unknown_nmi_panic_callback(regs, cpu);
-#endif
-	return 0;
-}
-
 void arch_trigger_all_cpu_backtrace(void)
 {
 	int i;
arch/x86/kernel/traps.c +11 -5
index cb838ca..53ea71f 100644
@@ -83,6 +83,8 @@ EXPORT_SYMBOL_GPL(used_vectors);
 
 static int ignore_nmis;
 
+int unknown_nmi_panic;
+
 static inline void conditional_sti(struct pt_regs *regs)
 {
 	if (regs->flags & X86_EFLAGS_IF)
@@ -300,6 +302,13 @@ gp_in_kernel:
 	die("general protection fault", regs, error_code);
 }
 
+static int __init setup_unknown_nmi_panic(char *str)
+{
+	unknown_nmi_panic = 1;
+	return 1;
+}
+__setup("unknown_nmi_panic", setup_unknown_nmi_panic);
+
 static notrace __kprobes void
 mem_parity_error(unsigned char reason, struct pt_regs *regs)
 {
@@ -371,7 +380,7 @@ unknown_nmi_error(unsigned char reason, struct pt_regs *regs)
 			reason, smp_processor_id());
 
 	printk(KERN_EMERG "Do you have a strange power saving mode enabled?\n");
-	if (panic_on_unrecovered_nmi)
+	if (unknown_nmi_panic || panic_on_unrecovered_nmi)
 		panic("NMI: Not continuing");
 
 	printk(KERN_EMERG "Dazed and confused, but trying to continue\n");
@@ -405,12 +414,9 @@ static notrace __kprobes void default_do_nmi(struct pt_regs *regs)
 		 */
 		if (nmi_watchdog_tick(regs, reason))
 			return;
-		if (!do_nmi_callback(regs, cpu))
 #endif /* !CONFIG_LOCKUP_DETECTOR */
-			unknown_nmi_error(reason, regs);
-#else
-		unknown_nmi_error(reason, regs);
 #endif
+		unknown_nmi_error(reason, regs);
 
 		return;
 	}
Signature · 1 line
1.7.3.2
author
#2 lore raw

PATCH v2 2/3 x86, nmi_watchdog: remove the old nmi_watchdog

In reply to Don Zickus

Now that we have a new nmi_watchdog that is more generic and sits on top of the perf subsystem, we really do not need the old nmi_watchdog any more.

In addition, the old nmi_watchdog doesn't really work if you are using the default clocksource, hpet. The old nmi_watchdog code relied on local apic interrupts to determine if the cpu is still alive. With hpet as the clocksource, these interrupts don't increment any more and the old nmi_watchdog triggers false postives.

This piece removes the old nmi_watchdog code and stubs out any variables and functions calls. The stubs are the same ones used by the new nmi_watchdog code, so it should be well tested.

v2: fix sparc breakage by undoing linux/nmi.h changes
clean up documentation and sysctl stuff

---
 Documentation/kernel-parameters.txt |   10 +-
 arch/x86/include/asm/nmi.h          |    4 -
 arch/x86/kernel/apic/Makefile       |    5 +-
 arch/x86/kernel/apic/hw_nmi.c       |   14 +-
 arch/x86/kernel/apic/nmi.c          |  540 -----------------------------------
 arch/x86/kernel/traps.c             |    8 -
 kernel/sysctl.c                     |    9 +-
 kernel/sysctl_binary.c              |    1 -
 kernel/watchdog.c                   |    2 +
 9 files changed, 16 insertions(+), 577 deletions(-)
 delete mode 100644 arch/x86/kernel/apic/nmi.c
Documentation/kernel-parameters.txt +1 -9
index ed45e98..e48b93f 100644
@@ -1579,20 +1579,12 @@ and is between 256 and 4096 characters. It is defined in the file
 
 	nmi_watchdog=	[KNL,BUGS=X86] Debugging features for SMP kernels
 			Format: [panic,][num]
-			Valid num: 0,1,2
+			Valid num: 0
 			0 - turn nmi_watchdog off
-			1 - use the IO-APIC timer for the NMI watchdog
-			2 - use the local APIC for the NMI watchdog using
-			a performance counter. Note: This will use one
-			performance counter and the local APIC's performance
-			vector.
 			When panic is specified, panic when an NMI watchdog
 			timeout occurs.
 			This is useful when you use a panic=... timeout and
 			need the box quickly up again.
-			Instead of 1 and 2 it is possible to use the following
-			symbolic names: lapic and ioapic
-			Example: nmi_watchdog=2 or nmi_watchdog=panic,lapic
 
 	netpoll.carrier_timeout=
 			[NET] Specifies amount of time (in seconds) that
arch/x86/include/asm/nmi.h +0 -4
index 932f0f8..33292ec 100644
@@ -17,9 +17,6 @@ int do_nmi_callback(struct pt_regs *regs, int cpu);
 
 extern void die_nmi(char *str, struct pt_regs *regs, int do_panic);
 extern int check_nmi_watchdog(void);
-#if !defined(CONFIG_LOCKUP_DETECTOR)
-extern int nmi_watchdog_enabled;
-#endif
 extern int avail_to_resrv_perfctr_nmi_bit(unsigned int);
 extern int reserve_perfctr_nmi(unsigned int);
 extern void release_perfctr_nmi(unsigned int);
@@ -30,7 +27,6 @@ extern void setup_apic_nmi_watchdog(void *);
 extern void stop_apic_nmi_watchdog(void *);
 extern void disable_timer_nmi_watchdog(void);
 extern void enable_timer_nmi_watchdog(void);
-extern int nmi_watchdog_tick(struct pt_regs *regs, unsigned reason);
 extern void cpu_nmi_set_wd_enabled(void);
 
 extern atomic_t nmi_active;
arch/x86/kernel/apic/Makefile +1 -4
index 910f20b..3966b56 100644
@@ -3,10 +3,7 @@
 #
 
 obj-$(CONFIG_X86_LOCAL_APIC)	+= apic.o apic_noop.o probe_$(BITS).o ipi.o
-ifneq ($(CONFIG_HARDLOCKUP_DETECTOR),y)
-obj-$(CONFIG_X86_LOCAL_APIC)	+= nmi.o
-endif
-obj-$(CONFIG_HARDLOCKUP_DETECTOR)	+= hw_nmi.o
+obj-y				+= hw_nmi.o
 
 obj-$(CONFIG_X86_IO_APIC)	+= io_apic.o
 obj-$(CONFIG_SMP)		+= ipi.o
arch/x86/kernel/apic/hw_nmi.c +11 -3
index e66b16d..4a57e60 100644
@@ -20,12 +20,22 @@
 /* For reliability, we're prepared to waste bits here. */
 static DECLARE_BITMAP(backtrace_mask, NR_CPUS) __read_mostly;
 
+#ifdef CONFIG_HARDLOCKUP_DETECTOR
 u64 hw_nmi_get_sample_period(void)
 {
 	return (u64)(cpu_khz) * 1000 * 60;
 }
+#endif
+
+#ifndef CONFIG_HARDLOCKUP_DETECTOR
+void touch_nmi_watchdog(void)
+{
+	touch_softlockup_watchdog();
+}
+EXPORT_SYMBOL(touch_nmi_watchdog);
+#endif
 
-#ifdef ARCH_HAS_NMI_WATCHDOG
+#ifdef arch_trigger_all_cpu_backtrace
 void arch_trigger_all_cpu_backtrace(void)
 {
 	int i;
@@ -95,8 +105,6 @@ early_initcall(register_trigger_all_cpu_backtrace);
 #if defined(CONFIG_X86_LOCAL_APIC)
 unsigned int nmi_watchdog = NMI_NONE;
 EXPORT_SYMBOL(nmi_watchdog);
-void acpi_nmi_enable(void) { return; }
-void acpi_nmi_disable(void) { return; }
 #endif
 atomic_t nmi_active = ATOMIC_INIT(0);           /* oprofile uses this */
 EXPORT_SYMBOL(nmi_active);
arch/x86/kernel/apic/nmi.c deleted +0 -540

540 lines not on this page · raw message

arch/x86/kernel/traps.c +0 -8
index 53ea71f..4b331ce 100644
@@ -407,14 +407,6 @@ static notrace __kprobes void default_do_nmi(struct pt_regs *regs)
 							== NOTIFY_STOP)
 			return;
 
-#ifndef CONFIG_LOCKUP_DETECTOR
-		/*
-		 * Ok, so this is none of the documented NMI sources,
-		 * so it must be the NMI watchdog.
-		 */
-		if (nmi_watchdog_tick(regs, reason))
-			return;
-#endif /* !CONFIG_LOCKUP_DETECTOR */
 #endif
 		unknown_nmi_error(reason, regs);
 
kernel/sysctl.c +1 -8
index c33a1ed..0daad4e 100644
@@ -737,7 +737,7 @@ static struct ctl_table kern_table[] = {
 		.extra2		= &one,
 	},
 #endif
-#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86) && !defined(CONFIG_LOCKUP_DETECTOR)
+#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86)
 	{
 		.procname       = "unknown_nmi_panic",
 		.data           = &unknown_nmi_panic,
@@ -745,13 +745,6 @@ static struct ctl_table kern_table[] = {
 		.mode           = 0644,
 		.proc_handler   = proc_dointvec,
 	},
-	{
-		.procname       = "nmi_watchdog",
-		.data           = &nmi_watchdog_enabled,
-		.maxlen         = sizeof (int),
-		.mode           = 0644,
-		.proc_handler   = proc_nmi_enabled,
-	},
 #endif
 #if defined(CONFIG_X86)
 	{
kernel/sysctl_binary.c +0 -1
index 1357c57..4b2545a 100644
@@ -136,7 +136,6 @@ static const struct bin_table bin_kern_table[] = {
 	{ CTL_INT,	KERN_IA64_UNALIGNED,		"ignore-unaligned-usertrap" },
 	{ CTL_INT,	KERN_COMPAT_LOG,		"compat-log" },
 	{ CTL_INT,	KERN_MAX_LOCK_DEPTH,		"max_lock_depth" },
-	{ CTL_INT,	KERN_NMI_WATCHDOG,		"nmi_watchdog" },
 	{ CTL_INT,	KERN_PANIC_ON_NMI,		"panic_on_unrecovered_nmi" },
 	{}
 };
kernel/watchdog.c +2 -0
index bafba68..3c5441f 100644
@@ -57,6 +57,8 @@ static int __init hardlockup_panic_setup(char *str)
 {
 	if (!strncmp(str, "panic", 5))
 		hardlockup_panic = 1;
+	else if (!strncmp(str, "0", 1))
+		no_watchdog = 1;
 	return 1;
 }
 __setup("nmi_watchdog=", hardlockup_panic_setup);
Signature · 1 line
1.7.3.2
#3 lore raw

Re: [PATCH 2/3] x86, nmi_watchdog: remove the old nmi_watchdog

Quoted 36 lines · Don Zickus

Now that we have a new nmi_watchdog that is more generic and sits on top of the perf subsystem, we really do not need the old nmi_watchdog any more.

In addition, the old nmi_watchdog doesn't really work if you are using the default clocksource, hpet. The old nmi_watchdog code relied on local apic interrupts to determine if the cpu is still alive. With hpet as the clocksource, these interrupts don't increment any more and the old nmi_watchdog triggers false postives.

This piece removes the old nmi_watchdog code and stubs out any variables and functions calls. The stubs are the same ones used by the new nmi_watchdog code, so it should be well tested.

v2: fix sparc breakage by undoing linux/nmi.h changes
clean up documentation and sysctl stuff

---
 Documentation/kernel-parameters.txt |   10 +-
 arch/x86/include/asm/nmi.h          |    4 -
 arch/x86/kernel/apic/Makefile       |    5 +-
 arch/x86/kernel/apic/hw_nmi.c       |   14 +-
 arch/x86/kernel/apic/nmi.c          |  540 -----------------------------------
 arch/x86/kernel/traps.c             |    8 -
 kernel/sysctl.c                     |    9 +-
 kernel/sysctl_binary.c              |    1 -
 kernel/watchdog.c                   |    2 +
 9 files changed, 16 insertions(+), 577 deletions(-)
 delete mode 100644 arch/x86/kernel/apic/nmi.c
Documentation/kernel-parameters.txt +0 -0
index ed45e98..e48b93f 100644

Documentation/kernel-parameters.txt and is between 256 and 4096 characters. It is defined in the file · line 1583

Quoted 6 lines
Documentation/kernel-parameters.txt +1 -1
@@ -1579,20 +1579,12 @@ and is between 256 and 4096 characters. It is defined in the file
 
 	nmi_watchdog=	[KNL,BUGS=X86] Debugging features for SMP kernels
 			Format: [panic,][num]
-			Valid num: 0,1,2
+			Valid num: 0
 			0 - turn nmi_watchdog off

thanks for keeping nmi_watchdog=0

Quoted 15 lines
Documentation/kernel-parameters.txt +0 -8
-			1 - use the IO-APIC timer for the NMI watchdog
-			2 - use the local APIC for the NMI watchdog using
-			a performance counter. Note: This will use one
-			performance counter and the local APIC's performance
-			vector.
 			When panic is specified, panic when an NMI watchdog
 			timeout occurs.
 			This is useful when you use a panic=... timeout and
 			need the box quickly up again.
-			Instead of 1 and 2 it is possible to use the following
-			symbolic names: lapic and ioapic
-			Example: nmi_watchdog=2 or nmi_watchdog=panic,lapic
 
 	netpoll.carrier_timeout=
 			[NET] Specifies amount of time (in seconds) that

...

Quoted 14 lines
kernel/sysctl.c +1 -1
index c33a1ed..0daad4e 100644
@@ -737,7 +737,7 @@ static struct ctl_table kern_table[] = {
 		.extra2		= &one,
 	},
 #endif
-#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86) && !defined(CONFIG_LOCKUP_DETECTOR)
+#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86)
 	{
 		.procname       = "unknown_nmi_panic",
 		.data           = &unknown_nmi_panic,

kernel/sysctl.c static struct ctl_table kern_table[] = { · line 754

Quoted 10 lines
kernel/sysctl.c +0 -7
@@ -745,13 +745,6 @@ static struct ctl_table kern_table[] = {
 		.mode           = 0644,
 		.proc_handler   = proc_dointvec,
 	},
-	{
-		.procname       = "nmi_watchdog",
-		.data           = &nmi_watchdog_enabled,
-		.maxlen         = sizeof (int),
-		.mode           = 0644,
-		.proc_handler   = proc_nmi_enabled,
-	},

wonder if you can keep nmi_watchdog in sysctl? So in run-time it could be disabled after it booted up.

Quoted 20 lines
kernel/sysctl.c +0 -0
 #endif
 #if defined(CONFIG_X86)
 	{
kernel/sysctl_binary.c +0 -1
index 1357c57..4b2545a 100644
@@ -136,7 +136,6 @@ static const struct bin_table bin_kern_table[] = {
 	{ CTL_INT,	KERN_IA64_UNALIGNED,		"ignore-unaligned-usertrap" },
 	{ CTL_INT,	KERN_COMPAT_LOG,		"compat-log" },
 	{ CTL_INT,	KERN_MAX_LOCK_DEPTH,		"max_lock_depth" },
-	{ CTL_INT,	KERN_NMI_WATCHDOG,		"nmi_watchdog" },
 	{ CTL_INT,	KERN_PANIC_ON_NMI,		"panic_on_unrecovered_nmi" },
 	{}
 };
kernel/watchdog.c +0 -0
index bafba68..3c5441f 100644

kernel/watchdog.c static int __init hardlockup_panic_setup(char *str) · line 64

Quoted 8 lines
kernel/watchdog.c +2 -0
@@ -57,6 +57,8 @@ static int __init hardlockup_panic_setup(char *str)
 {
 	if (!strncmp(str, "panic", 5))
 		hardlockup_panic = 1;
+	else if (!strncmp(str, "0", 1))
+		no_watchdog = 1;
 	return 1;
 }
 __setup("nmi_watchdog=", hardlockup_panic_setup);

Thanks

Yinghai

author
#4 lore raw

Re: [PATCH 2/3] x86, nmi_watchdog: remove the old nmi_watchdog

Quoted 9 lines · Yinghai Lu

kernel/sysctl.c static struct ctl_table kern_table[] = { · line 754

Quoted 7 lines
kernel/sysctl.c +0 -7
-	{
-		.procname       = "nmi_watchdog",
-		.data           = &nmi_watchdog_enabled,
-		.maxlen         = sizeof (int),
-		.mode           = 0644,
-		.proc_handler   = proc_nmi_enabled,
-	},

wonder if you can keep nmi_watchdog in sysctl? So in run-time it could be disabled after it booted up.

Well, with the new code I have watchdog_enabled which does the same thing. With the nmi watchdog moving to generic code, the idea was to call it a hardlockup detector. I guess I was trying to rename things to avoid using nmi all over the place to reflect the idea that a hardlockup might be able to be used by something other than an nmi.

I can probably wrap this around watchdog_enabled to preserve it I suppose. Let me know.

Cheers,
Don

#5 lore raw

Re: [PATCH 2/3] x86, nmi_watchdog: remove the old nmi_watchdog

Quoted 11 lines · Don Zickus
Quoted 9 lines · Yinghai Lu

kernel/sysctl.c static struct ctl_table kern_table[] = { · line 754

Quoted 7 lines
kernel/sysctl.c +0 -7
-    {
-        .procname       = "nmi_watchdog",
-        .data           = &nmi_watchdog_enabled,
-        .maxlen         = sizeof (int),
-        .mode           = 0644,
-        .proc_handler   = proc_nmi_enabled,
-    },

wonder if you can keep nmi_watchdog in sysctl? So in run-time it could be disabled after it booted up.

Quoted 8 lines

Well, with the new code I have watchdog_enabled which does the same thing. With the nmi watchdog moving to generic code, the idea was to call it a hardlockup detector. I guess I was trying to rename things to avoid using nmi all over the place to reflect the idea that a hardlockup might be able to be used by something other than an nmi.

I can probably wrap this around watchdog_enabled to preserve it I suppose. Let me know.

Yes that will be good

Thanks

author
#6 lore raw

PATCH v2 3/3 x86, nmi_watchdog: remove all stub function calls from old nmi_watchdog

In reply to Don Zickus

Now that the bulk of the old nmi_watchdog is gone, remove all the stub variables and hooks associated with it.

This touches lots of files mainly because of how the io_apic nmi_watchdog was implemented. Now that the io_apic nmi_watchdog is forever gone, remove all its fingers.

Most of this code was not being exercised by virtue of nmi_watchdog != NMI_IO_APIC, so there shouldn't be anything to risky here.

---
 arch/x86/include/asm/nmi.h             |   47 ---
 arch/x86/include/asm/smpboot_hooks.h   |    1 -
 arch/x86/include/asm/timer.h           |    6 -
 arch/x86/kernel/apic/apic.c            |   15 +-
 arch/x86/kernel/apic/hw_nmi.c          |   12 -
 arch/x86/kernel/apic/io_apic.c         |   46 ---
 arch/x86/kernel/cpu/perf_event.c       |    9 -
 arch/x86/kernel/cpu/perfctr-watchdog.c |  642 --------------------------------
 arch/x86/kernel/smpboot.c              |   11 -
 arch/x86/kernel/time.c                 |   18 -
 arch/x86/kernel/traps.c                |    2 -
 arch/x86/oprofile/nmi_timer_int.c      |    3 -
 drivers/acpi/acpica/nsinit.c           |    2 -
 drivers/watchdog/hpwdt.c               |    7 +-
 include/linux/nmi.h                    |    4 -
 15 files changed, 2 insertions(+), 823 deletions(-)
arch/x86/include/asm/nmi.h +0 -47
index 33292ec..3545838 100644
@@ -7,35 +7,13 @@
 
 #ifdef ARCH_HAS_NMI_WATCHDOG
 
-/**
- * do_nmi_callback
- *
- * Check to see if a callback exists and execute it.  Return 1
- * if the handler exists and was handled successfully.
- */
-int do_nmi_callback(struct pt_regs *regs, int cpu);
-
 extern void die_nmi(char *str, struct pt_regs *regs, int do_panic);
-extern int check_nmi_watchdog(void);
 extern int avail_to_resrv_perfctr_nmi_bit(unsigned int);
 extern int reserve_perfctr_nmi(unsigned int);
 extern void release_perfctr_nmi(unsigned int);
 extern int reserve_evntsel_nmi(unsigned int);
 extern void release_evntsel_nmi(unsigned int);
 
-extern void setup_apic_nmi_watchdog(void *);
-extern void stop_apic_nmi_watchdog(void *);
-extern void disable_timer_nmi_watchdog(void);
-extern void enable_timer_nmi_watchdog(void);
-extern void cpu_nmi_set_wd_enabled(void);
-
-extern atomic_t nmi_active;
-extern unsigned int nmi_watchdog;
-#define NMI_NONE	0
-#define NMI_IO_APIC	1
-#define NMI_LOCAL_APIC	2
-#define NMI_INVALID	3
-
 struct ctl_table;
 extern int proc_nmi_enabled(struct ctl_table *, int ,
 			void __user *, size_t *, loff_t *);
@@ -43,33 +21,8 @@ extern int unknown_nmi_panic;
 
 void arch_trigger_all_cpu_backtrace(void);
 #define arch_trigger_all_cpu_backtrace arch_trigger_all_cpu_backtrace
-
-static inline void localise_nmi_watchdog(void)
-{
-	if (nmi_watchdog == NMI_IO_APIC)
-		nmi_watchdog = NMI_LOCAL_APIC;
-}
-
-/* check if nmi_watchdog is active (ie was specified at boot) */
-static inline int nmi_watchdog_active(void)
-{
-	/*
-	 * actually it should be:
-	 * 	return (nmi_watchdog == NMI_LOCAL_APIC ||
-	 * 		nmi_watchdog == NMI_IO_APIC)
-	 * but since they are power of two we could use a
-	 * cheaper way --cvg
-	 */
-	return nmi_watchdog & (NMI_LOCAL_APIC | NMI_IO_APIC);
-}
 #endif
 
-void lapic_watchdog_stop(void);
-int lapic_watchdog_init(unsigned nmi_hz);
-int lapic_wd_event(unsigned nmi_hz);
-unsigned lapic_adjust_nmi_hz(unsigned hz);
-void disable_lapic_nmi_watchdog(void);
-void enable_lapic_nmi_watchdog(void);
 void stop_nmi(void);
 void restart_nmi(void);
 
arch/x86/include/asm/smpboot_hooks.h +0 -1
index 1def601..6c22bf3 100644
@@ -48,7 +48,6 @@ static inline void __init smpboot_setup_io_apic(void)
 		setup_IO_APIC();
 	else {
 		nr_ioapics = 0;
-		localise_nmi_watchdog();
 	}
 #endif
 }
arch/x86/include/asm/timer.h +0 -6
index 5469630..fa7b917 100644
@@ -10,12 +10,6 @@
 unsigned long long native_sched_clock(void);
 extern int recalibrate_cpu_khz(void);
 
-#if defined(CONFIG_X86_32) && defined(CONFIG_X86_IO_APIC)
-extern int timer_ack;
-#else
-# define timer_ack (0)
-#endif
-
 extern int no_timer_check;
 
 /* Accelerators for sched_clock()
arch/x86/kernel/apic/apic.c +1 -14
index 850657d..c4dafc0 100644
@@ -31,7 +31,6 @@
 #include <linux/init.h>
 #include <linux/cpu.h>
 #include <linux/dmi.h>
-#include <linux/nmi.h>
 #include <linux/smp.h>
 #include <linux/mm.h>
 
@@ -800,11 +799,7 @@ void __init setup_boot_APIC_clock(void)
 	 * PIT/HPET going.  Otherwise register lapic as a dummy
 	 * device.
 	 */
-	if (nmi_watchdog != NMI_IO_APIC)
-		lapic_clockevent.features &= ~CLOCK_EVT_FEAT_DUMMY;
-	else
-		pr_warning("APIC timer registered as dummy,"
-			" due to nmi_watchdog=%d!\n", nmi_watchdog);
+	lapic_clockevent.features &= ~CLOCK_EVT_FEAT_DUMMY;
 
 	/* Setup the lapic or request the broadcast */
 	setup_APIC_timer();
@@ -1388,7 +1383,6 @@ void __cpuinit end_local_APIC_setup(void)
 	}
 #endif
 
-	setup_apic_nmi_watchdog(NULL);
 	apic_pm_activate();
 }
 
@@ -1751,17 +1745,10 @@ int __init APIC_init_uniprocessor(void)
 		setup_IO_APIC();
 	else {
 		nr_ioapics = 0;
-		localise_nmi_watchdog();
 	}
-#else
-	localise_nmi_watchdog();
 #endif
 
 	x86_init.timers.setup_percpu_clockev();
-#ifdef CONFIG_X86_64
-	check_nmi_watchdog();
-#endif
-
 	return 0;
 }
 
arch/x86/kernel/apic/hw_nmi.c +0 -12
index 4a57e60..b0eb24c 100644
@@ -100,15 +100,3 @@ static int __init register_trigger_all_cpu_backtrace(void)
 }
 early_initcall(register_trigger_all_cpu_backtrace);
 #endif
-
-/* STUB calls to mimic old nmi_watchdog behaviour */
-#if defined(CONFIG_X86_LOCAL_APIC)
-unsigned int nmi_watchdog = NMI_NONE;
-EXPORT_SYMBOL(nmi_watchdog);
-#endif
-atomic_t nmi_active = ATOMIC_INIT(0);           /* oprofile uses this */
-EXPORT_SYMBOL(nmi_active);
-void cpu_nmi_set_wd_enabled(void) { return; }
-void stop_apic_nmi_watchdog(void *unused) { return; }
-void setup_apic_nmi_watchdog(void *unused) { return; }
-int __init check_nmi_watchdog(void) { return 0; }
arch/x86/kernel/apic/io_apic.c +0 -46

82 lines not on this page · raw message

arch/x86/kernel/cpu/perf_event.c +0 -9
index ed63101..1f129a1 100644
@@ -330,9 +330,6 @@ static bool reserve_pmc_hardware(void)
 {
 	int i;
 
-	if (nmi_watchdog == NMI_LOCAL_APIC)
-		disable_lapic_nmi_watchdog();
-
 	for (i = 0; i < x86_pmu.num_counters; i++) {
 		if (!reserve_perfctr_nmi(x86_pmu.perfctr + i))
 			goto perfctr_fail;
@@ -355,9 +352,6 @@ perfctr_fail:
 	for (i--; i >= 0; i--)
 		release_perfctr_nmi(x86_pmu.perfctr + i);
 
-	if (nmi_watchdog == NMI_LOCAL_APIC)
-		enable_lapic_nmi_watchdog();
-
 	return false;
 }
 
@@ -369,9 +363,6 @@ static void release_pmc_hardware(void)
 		release_perfctr_nmi(x86_pmu.perfctr + i);
 		release_evntsel_nmi(x86_pmu.eventsel + i);
 	}
-
-	if (nmi_watchdog == NMI_LOCAL_APIC)
-		enable_lapic_nmi_watchdog();
 }
 
 #else
arch/x86/kernel/cpu/perfctr-watchdog.c +0 -642

657 lines not on this page · raw message

arch/x86/kernel/smpboot.c +0 -11
index 083e99d..f0a0624 100644
@@ -316,12 +316,6 @@ notrace static void __cpuinit start_secondary(void *unused)
 	 */
 	check_tsc_sync_target();
 
-	if (nmi_watchdog == NMI_IO_APIC) {
-		legacy_pic->mask(0);
-		enable_NMI_through_LVT0();
-		legacy_pic->unmask(0);
-	}
-
 	/* This must be done before setting cpu_online_mask */
 	set_cpu_sibling_map(raw_smp_processor_id());
 	wmb();
@@ -1061,8 +1055,6 @@ static int __init smp_sanity_check(unsigned max_cpus)
 		printk(KERN_INFO "SMP mode deactivated.\n");
 		smpboot_clear_io_apic();
 
-		localise_nmi_watchdog();
-
 		connect_bsp_APIC();
 		setup_local_APIC();
 		end_local_APIC_setup();
@@ -1196,7 +1188,6 @@ void __init native_smp_cpus_done(unsigned int max_cpus)
 #ifdef CONFIG_X86_IO_APIC
 	setup_ioapic_dest();
 #endif
-	check_nmi_watchdog();
 	mtrr_aps_init();
 }
 
@@ -1341,8 +1332,6 @@ int native_cpu_disable(void)
 	if (cpu == 0)
 		return -EBUSY;
 
-	if (nmi_watchdog == NMI_LOCAL_APIC)
-		stop_apic_nmi_watchdog(NULL);
 	clear_local_APIC();
 
 	cpu_disable_common();
arch/x86/kernel/time.c +0 -18
index fb5cc5e1..25a28a2 100644
@@ -22,10 +22,6 @@
 #include <asm/hpet.h>
 #include <asm/time.h>
 
-#if defined(CONFIG_X86_32) && defined(CONFIG_X86_IO_APIC)
-int timer_ack;
-#endif
-
 #ifdef CONFIG_X86_64
 volatile unsigned long __jiffies __section_jiffies = INITIAL_JIFFIES;
 #endif
@@ -63,20 +59,6 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id)
 	/* Keep nmi watchdog up to date */
 	inc_irq_stat(irq0_irqs);
 
-	/* Optimized out for !IO_APIC and x86_64 */
-	if (timer_ack) {
-		/*
-		 * Subtle, when I/O APICs are used we have to ack timer IRQ
-		 * manually to deassert NMI lines for the watchdog if run
-		 * on an 82489DX-based system.
-		 */
-		raw_spin_lock(&i8259A_lock);
-		outb(0x0c, PIC_MASTER_OCW3);
-		/* Ack the IRQ; AEOI will end it automatically. */
-		inb(PIC_MASTER_POLL);
-		raw_spin_unlock(&i8259A_lock);
-	}
-
 	global_clock_event->event_handler(global_clock_event);
 
 	/* MCA bus quirk: Acknowledge irq0 by setting bit 7 in port 0x61 */
arch/x86/kernel/traps.c +0 -2
index 4b331ce..c40e9a0 100644
@@ -444,14 +444,12 @@ do_nmi(struct pt_regs *regs, long error_code)
 
 void stop_nmi(void)
 {
-	acpi_nmi_disable();
 	ignore_nmis++;
 }
 
 void restart_nmi(void)
 {
 	ignore_nmis--;
-	acpi_nmi_enable();
 }
 
 /* May run on IST stack. */
arch/x86/oprofile/nmi_timer_int.c +0 -3
index e3ecb71..0636dd9 100644
@@ -58,9 +58,6 @@ static void timer_stop(void)
 
 int __init op_nmi_timer_init(struct oprofile_operations *ops)
 {
-	if ((nmi_watchdog != NMI_IO_APIC) || (atomic_read(&nmi_active) <= 0))
-		return -ENODEV;
-
 	ops->start = timer_start;
 	ops->stop = timer_stop;
 	ops->cpu_type = "timer";
drivers/acpi/acpica/nsinit.c +0 -2
index 660a272..0cac7ec 100644
@@ -577,9 +577,7 @@ acpi_ns_init_one_device(acpi_handle obj_handle,
 	 * as possible (without an NMI being received in the middle of
 	 * this) - so disable NMIs and initialize the device:
 	 */
-	acpi_nmi_disable();
 	status = acpi_ns_evaluate(info);
-	acpi_nmi_enable();
 
 	if (ACPI_SUCCESS(status)) {
 		walk_info->num_INI++;
drivers/watchdog/hpwdt.c +1 -6
index 3d77116..c19f4a2 100644
@@ -649,12 +649,7 @@ static void __devinit hpwdt_check_nmi_decoding(struct pci_dev *dev)
 	 * If nmi_watchdog is turned off then we can turn on
 	 * our nmi decoding capability.
 	 */
-	if (!nmi_watchdog_active())
-		hpwdt_nmi_decoding = 1;
-	else
-		dev_warn(&dev->dev, "NMI decoding is disabled. To enable this "
-			"functionality you must reboot with nmi_watchdog=0 "
-			"and load the hpwdt driver with priority=1.\n");
+	hpwdt_nmi_decoding = 1;
 }
 #else
 static void __devinit hpwdt_check_nmi_decoding(struct pci_dev *dev)
include/linux/nmi.h +0 -4
index 06aab5e..17ccf44 100644
@@ -17,8 +17,6 @@
 #ifdef ARCH_HAS_NMI_WATCHDOG
 #include <asm/nmi.h>
 extern void touch_nmi_watchdog(void);
-extern void acpi_nmi_disable(void);
-extern void acpi_nmi_enable(void);
 #else
 #ifndef CONFIG_HARDLOCKUP_DETECTOR
 static inline void touch_nmi_watchdog(void)
@@ -28,8 +26,6 @@ static inline void touch_nmi_watchdog(void)
 #else
 extern void touch_nmi_watchdog(void);
 #endif
-static inline void acpi_nmi_disable(void) { }
-static inline void acpi_nmi_enable(void) { }
 #endif
 
 /*
Signature · 1 line
1.7.3.2
#7 lore raw
In reply to Don Zickus
Quoted 4 lines · Don Zickus

Ingo asked me to remove the old nmi_watchdog to minimize the amount of code duplication we have to do for recent fixes. All the functionality needed by the old nmi watchdog should be available in perf now.

Hi Don, if I understand correctly not many things are changed from previous
time, some tune ups here and there, right?

Cyrill

author
#8 lore raw
Quoted 8 lines · Cyrill Gorcunov
Quoted 4 lines · Don Zickus

Ingo asked me to remove the old nmi_watchdog to minimize the amount of code duplication we have to do for recent fixes. All the functionality needed by the old nmi watchdog should be available in perf now.

Hi Don, if I understand correctly not many things are changed from previous
time, some tune ups here and there, right?

Right. Just the addition of the first patch to preserve unknown_nmi_panic, some compiler breakage fix, and documentation stuff.

Cheers,
Don