NMI watchdog: setup before enabling NMI watchdog
PATCH 1/1 NMI watchdog: setup before enabling NMI watchdog
There's a small window when NMI watchdog is being set up that if any NMIs are triggered, the NMI code will make make use of not initalized wd_ops elements:
void setup_apic_nmi_watchdog(void *unused)
{
if (__get_cpu_var(wd_enabled))
return;
/* cheap hack to support suspend/resume */
/* if cpu0 is not active neither should the other cpus */
if (smp_processor_id() != 0 && atomic_read(&nmi_active) <= 0)
return;
switch (nmi_watchdog) {
case NMI_LOCAL_APIC:
/* enable it before to avoid race with handler */
--> __get_cpu_var(wd_enabled) = 1;
--> if (lapic_watchdog_init(nmi_hz) < 0) {
(...)
asmlinkage notrace __kprobes void default_do_nmi(struct pt_regs *regs)
{
(...)
if (nmi_watchdog_tick(regs, reason))
return;
(...)
notrace __kprobes int
nmi_watchdog_tick(struct pt_regs *regs, unsigned reason)
{
(...)
if (!__get_cpu_var(wd_enabled))
return rc;
switch (nmi_watchdog) {
case NMI_LOCAL_APIC:
rc |= lapic_wd_event(nmi_hz);
(...)
int lapic_wd_event(unsigned nmi_hz)
{
struct nmi_watchdog_ctlblk *wd = &__get_cpu_var(nmi_watchdog_ctlblk);
u64 ctr;--> rdmsrl(wd->perfctr_msr, ctr);
and wd->*_msr will be initialized on each processor type specific setup, after enabling NMIs for PMIs. Since the counter was just set, the chances of an performance counter generated NMI is minimal, but any other unknown NMI would trigger the problem. This patch fixes the problem by setting everything up before enabling performance counter generated NMIs and will set wd_enabled using a callback function.
--- arch/x86/kernel/cpu/perfctr-watchdog.c | 45 ++++++++++++++++++++++++--------- arch/x86/kernel/nmi.c | 11 ++++++-- include/asm-x86/nmi.h | 1 3 files changed, 43 insertions(+), 14 deletions(-)
arch/x86/kernel/cpu/perfctr-watchdog.c +33 -12
@@ -295,13 +295,19 @@ static int setup_k7_watchdog(unsigned nm/* setup the timer */ wrmsr (evntsel_msr, evntsel,0 );write_watchdog_counter (perfctr_msr,"K7_PERFCTR0" ,nmi_hz); -apic_write (APIC_LVTPC ,APIC_DM_NMI ); - evntsel |=K7_EVNTSEL_ENABLE ; -wrmsr (evntsel_msr, evntsel,0 ); +/* initialize the wd struct before enabling */ wd->perfctr_msr = perfctr_msr; wd->evntsel_msr = evntsel_msr; wd->cccr_msr =0 ;/* unused */ + +/* ok, everything is initialized, announce that we're set */ +cpu_nmi_set_wd_enabled (); + +apic_write (APIC_LVTPC ,APIC_DM_NMI ); + evntsel |=K7_EVNTSEL_ENABLE ; +wrmsr (evntsel_msr, evntsel,0 ); +return 1 ; }
@@ -379,13 +385,19 @@ static int setup_p6_watchdog(unsigned nmwrmsr (evntsel_msr, evntsel,0 ); nmi_hz =adjust_for_32bit_ctr (nmi_hz);write_watchdog_counter32 (perfctr_msr,"P6_PERFCTR0" ,nmi_hz); -apic_write (APIC_LVTPC ,APIC_DM_NMI ); - evntsel |=P6_EVNTSEL0_ENABLE ; -wrmsr (evntsel_msr, evntsel,0 ); +/* initialize the wd struct before enabling */ wd->perfctr_msr = perfctr_msr; wd->evntsel_msr = evntsel_msr; wd->cccr_msr =0 ;/* unused */ + +/* ok, everything is initialized, announce that we're set */ +cpu_nmi_set_wd_enabled (); + +apic_write (APIC_LVTPC ,APIC_DM_NMI ); + evntsel |=P6_EVNTSEL0_ENABLE ; +wrmsr (evntsel_msr, evntsel,0 ); +return 1 ; }
@@ -499,12 +511,17 @@ static int setup_p4_watchdog(unsigned nmwrmsr (evntsel_msr, evntsel,0 );wrmsr (cccr_msr, cccr_val,0 );write_watchdog_counter (perfctr_msr,"P4_IQ_COUNTER0" , nmi_hz); -apic_write (APIC_LVTPC ,APIC_DM_NMI ); - cccr_val |=P4_CCCR_ENABLE ; -wrmsr (cccr_msr, cccr_val,0 ); + wd->perfctr_msr = perfctr_msr; wd->evntsel_msr = evntsel_msr; wd->cccr_msr = cccr_msr; + +/* ok, everything is initialized, announce that we're set */ +cpu_nmi_set_wd_enabled (); + +apic_write (APIC_LVTPC ,APIC_DM_NMI ); + cccr_val |=P4_CCCR_ENABLE ; +wrmsr (cccr_msr, cccr_val,0 );return 1 ; }
@@ -620,13 +637,17 @@ static int setup_intel_arch_watchdog(unswrmsr (evntsel_msr, evntsel,0 ); nmi_hz =adjust_for_32bit_ctr (nmi_hz);write_watchdog_counter32 (perfctr_msr,"INTEL_ARCH_PERFCTR0" , nmi_hz); -apic_write (APIC_LVTPC ,APIC_DM_NMI ); - evntsel |=ARCH_PERFMON_EVENTSEL0_ENABLE ; -wrmsr (evntsel_msr, evntsel,0 ); wd->perfctr_msr = perfctr_msr; wd->evntsel_msr = evntsel_msr; wd->cccr_msr =0 ;/* unused */ + +/* ok, everything is initialized, announce that we're set */ +cpu_nmi_set_wd_enabled (); + +apic_write (APIC_LVTPC ,APIC_DM_NMI ); + evntsel |=ARCH_PERFMON_EVENTSEL0_ENABLE ; +wrmsr (evntsel_msr, evntsel,0 ); intel_arch_wd_ops.checkbit =1ULL << (eax.split.bit_width -1 );return 1 ; }
arch/x86/kernel/nmi.c +9 -2
@@ -299,6 +299,15 @@ void acpi_nmi_disable(void)on_each_cpu (__acpi_nmi_disable,NULL ,1 ); } +/* +* This function is called as soon the LAPIC NMI watchdog driver has everything +* in place and it's ready to check if the NMIs belong to the NMI watchdog +*/ +void cpu_nmi_set_wd_enabled (void ) +{ +__get_cpu_var (wd_enabled) =1 ; +} +void setup_apic_nmi_watchdog (void *unused) {if (__get_cpu_var (wd_enabled))
@@ -311,8 +320,6 @@ void setup_apic_nmi_watchdog(void *unuseswitch (nmi_watchdog) {case NMI_LOCAL_APIC : -/* enable it before to avoid race with handler */ -__get_cpu_var (wd_enabled) =1 ;if (lapic_watchdog_init (nmi_hz) <0 ) {__get_cpu_var (wd_enabled) =0 ;return ;
include/asm-x86/nmi.h +1 -0
@@ -34,6 +34,7 @@ extern void stop_apic_nmi_watchdog(voidextern 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;extern unsigned int nmi_watchdog;
Ingo Molnar
AppliedQuoted 49 lines · Aristeu Rozanski
There's a small window when NMI watchdog is being set up that if any NMIs are triggered, the NMI code will make make use of not initalized
wd_opselements:void setup_apic_nmi_watchdog(void *unused) { if (__get_cpu_var(wd_enabled)) return; /* cheap hack to support suspend/resume */ /* if cpu0 is not active neither should the other cpus */ if (smp_processor_id() != 0 && atomic_read(&nmi_active) <= 0) return; switch (nmi_watchdog) { case NMI_LOCAL_APIC: /* enable it before to avoid race with handler */ --> __get_cpu_var(wd_enabled) = 1; --> if (lapic_watchdog_init(nmi_hz) < 0) { (...) asmlinkage notrace __kprobes void default_do_nmi(struct pt_regs *regs) { (...) if (nmi_watchdog_tick(regs, reason)) return; (...) notrace __kprobes int nmi_watchdog_tick(struct pt_regs *regs, unsigned reason) { (...) if (!__get_cpu_var(wd_enabled)) return rc; switch (nmi_watchdog) { case NMI_LOCAL_APIC: rc |= lapic_wd_event(nmi_hz); (...) int lapic_wd_event(unsigned nmi_hz) { struct nmi_watchdog_ctlblk *wd = &__get_cpu_var(nmi_watchdog_ctlblk); u64 ctr;-->
rdmsrl(wd->perfctr_msr, ctr);and wd->*_msr will be initialized on each processor type specific setup, after enabling NMIs for PMIs. Since the counter was just set, the chances of an performance counter generated NMI is minimal, but any other unknown NMI would trigger the problem. This patch fixes the problem by setting everything up before enabling performance counter generated NMIs and will set
wd_enabledusing a callback function.
Quoted 4 lines
Signed-off-by Aristeu Rozanski <[email protected]>Acked-by Don Zickus <[email protected]>Acked-by Prarit Bhargava <[email protected]>Acked-by Vivek Goyal <[email protected]>
applied to tip/x86/nmi-watchdog, thanks Aristeu!
Ingo
Quoted 3 lines · Aristeu Rozanski
There's a small window when NMI watchdog is being set up that if any NMIs are triggered, the NMI code will make make use of not initalized
wd_opselements:
btw, this looks a bit large and not that easy to trigger, so i think it's v2.6.28 material - agreed?
Ingo
[Aristeu Rozanski - Mon, Sep 22, 2008 at 01:13:59PM -0400]
| There's a small window when NMI watchdog is being set up that if any NMIs | are triggered, the NMI code will make make use of not initalized wd_ops | elements:
Hi Aristeu,
thanks for the patch! I may be _absolutely_ wrong but could you explain me how we reach this site in traps
---
if (!(reason & 0xc0)) {
if (notify_die(DIE_NMI_IPI, "nmi_ipi", regs, reason,
2, SIGINT) == NOTIFY_STOP)
return;
/*
* Ok, so this is none of the documented NMI sources,
* so it must be the NMI watchdog.
^^^^
*/
if (nmi_watchdog_tick(regs, reason))
return;
if (!do_nmi_callback(regs, cpu))
unknown_nmi_error(reason, regs);
return;
}---
not having masked APIC registers as NMI entry yet (which is done during perfctl initialization)?
- Cyrill -
Quoted 6 lines
Quoted 3 lines
There's a small window when NMI watchdog is being set up that if any NMIs are triggered, the NMI code will make make use of not initalized
wd_opselements:btw, this looks a bit large and not that easy to trigger, so i think it's v2.6.28 material - agreed?
Yep, this can wait.
Thanks Ingo
Signature · 1 line
Aristeu
Quoted 22 lines
Hi Aristeu,
thanks for the patch! I may be _absolutely_ wrong but could you explain me how we reach this site in traps
---
if (!(reason & 0xc0)) { if (notify_die(DIE_NMI_IPI, "nmi_ipi", regs, reason, 2, SIGINT) == NOTIFY_STOP) return; /* * Ok, so this is none of the documented NMI sources, * so it must be the NMI watchdog. ^^^^ */ if (nmi_watchdog_tick(regs, reason)) return; if (!do_nmi_callback(regs, cpu)) unknown_nmi_error(reason, regs); return; }
Quoted 4 lines
---
not having masked APIC registers as NMI entry yet (which is done during perfctl initialization)?
actually the comment is a bit misleading. we can get other "undocumented" NMIs from different sources. Notice that if the nmi_watchdog_tick() doesn't identifies it as a performance counter generated NMI (if LAPIC based, IOAPIC always assume that the NMI is for the NMI watchdog), a default NMI callback will be tried and if it fails, unknown_nmi_error() will be called. The first case comes to my head is those NMI buttons present on development machines.
Signature · 1 line
Aristeu
[Aristeu Rozanski - Mon, Sep 22, 2008 at 02:35:05PM -0400]
| > Hi Aristeu,
| >
| > thanks for the patch! I may be _absolutely_ wrong but could you
| > explain me how we reach this site in traps
| >
| > ---
| > if (!(reason & 0xc0)) {
| > if (notify_die(DIE_NMI_IPI, "nmi_ipi", regs, reason,
| > 2, SIGINT) == NOTIFY_STOP)
| > return;
| > /*
| > * Ok, so this is none of the documented NMI sources,
| > * so it must be the NMI watchdog.
| > ^^^^
| > */
| > if (nmi_watchdog_tick(regs, reason))
| > return;
| > if (!do_nmi_callback(regs, cpu))
| > unknown_nmi_error(reason, regs);
| >
| > return;
| > }
| > ---
| >
| > not having masked APIC registers as NMI entry yet (which is done during
| > perfctl initialization)?
| actually the comment is a bit misleading. we can get other "undocumented"
| NMIs from different sources. Notice that if the nmi_watchdog_tick() doesn't
| identifies it as a performance counter generated NMI (if LAPIC based, IOAPIC
| always assume that the NMI is for the NMI watchdog), a default NMI callback
| will be tried and if it fails, unknown_nmi_error() will be called. The first
| case comes to my head is those NMI buttons present on development machines.
|
| --
| Aristeu
| Thanks Aristeu!
- Cyrill -