mce, edac: use an atomic notifier for MCEs decoding
PATCH RESEND 1/1 mce, edac: use an atomic notifier for MCEs decoding
Add an atomic notifier which ensures proper locking when conveying MCE info to EDAC for decoding. The actual notifier call overrides a default, negative priority notifier.
Note: make sure we register the default decoder only once since mcheck_init() runs on each CPU.
LKML-Reference: <[email protected]>
--- arch/x86/include/asm/mce.h | 3 ++- arch/x86/kernel/cpu/mcheck/mce.c | 30 +++++++++++++++++++++--------- drivers/edac/edac_mce_amd.c | 23 ++++++++++++++--------- 3 files changed, 37 insertions(+), 19 deletions(-)
arch/x86/include/asm/mce.h +2 -1
@@ -108,6 +108,8 @@ struct mce_log {#define K8_MCE_THRESHOLD_BANK_5 (MCE_THRESHOLD_BASE + 5 * 9)#define K8_MCE_THRESHOLD_DRAM_ECC (MCE_THRESHOLD_BANK_4 + 0) +extern struct atomic_notifier_head x86_mce_decoder_chain; +#ifdef __KERNEL__#include <linux/percpu.h>
@@ -213,6 +215,5 @@ extern void (*threshold_cpu_callback)(unsigned long action, unsigned int cpu);void intel_init_thermal (struct cpuinfo_x86 *c);void mce_log_therm_throt_event (__u64 status); -#endif /* __KERNEL__ */ #endif /* _ASM_X86_MCE_H */
arch/x86/kernel/cpu/mcheck/mce.c +21 -9
@@ -85,18 +85,26 @@ static DECLARE_WAIT_QUEUE_HEAD(mce_wait); static DEFINE_PER_CPU(struct mce, mces_seen);static int cpu_missing; -static void default_decode_mce (struct mce *m) +/* +* CPU/chipset specific EDAC code can register a notifier call here to print +* MCE errors in a human-readable form. +*/ +ATOMIC_NOTIFIER_HEAD (x86_mce_decoder_chain); +EXPORT_SYMBOL_GPL (x86_mce_decoder_chain); + +static int default_decode_mce (struct notifier_block *nb,unsigned long val, +void *data) {pr_emerg ("No human readable MCE decoding support on this CPU type.\n" );pr_emerg ("Run the message through 'mcelog --ascii' to decode.\n" ); + +return NOTIFY_STOP ; } -/* -* CPU/chipset specific EDAC code can register a callback here to print -* MCE errors in a human-readable form: -*/ -void (*x86_mce_decode_callback)(struct mce *m) = default_decode_mce; -EXPORT_SYMBOL (x86_mce_decode_callback); +static struct notifier_block mce_dec_nb = { + .notifier_call = default_decode_mce, + .priority =-1 , +};/* MCA banks polled by the period polling timer for corrected events */ DEFINE_PER_CPU(mce_banks_t, mce_poll_banks) = {
@@ -204,9 +212,9 @@ static void print_mce(struct mce *m)/* * Print out human-readable details about the MCE error, -* (if the CPU has an implementation for that): +* (if the CPU has an implementation for that) */ -x86_mce_decode_callback (m); +atomic_notifier_call_chain (&x86_mce_decoder_chain,0 , m); }static void print_mce_head (void )
@@ -1420,6 +1428,10 @@ void __cpuinit mcheck_init(struct cpuinfo_x86 *c)mce_cpu_features (c);mce_init_timer ();INIT_WORK (&__get_cpu_var (mce_work), mce_process_work); + +if (raw_smp_processor_id () ==0 ) +atomic_notifier_chain_register (&x86_mce_decoder_chain, + &mce_dec_nb); }/*
drivers/edac/edac_mce_amd.c +14 -9
@@ -3,7 +3,6 @@static bool report_gart_errors;static void (*nb_bus_decoder)(int node_id,struct err_regs *regs); -static void (*orig_mce_callback)(struct mce *m);void amd_report_gart_errors (bool v) {
@@ -363,8 +362,10 @@ static inline void amd_decode_err_code(unsigned int ec)pr_warning ("Huh? Unknown MCE error 0x%x\n" , ec); } -static void amd_decode_mce (struct mce *m) +static int amd_decode_mce (struct notifier_block *nb,unsigned long val, +void *data) { +struct mce *m = (struct mce *)data;struct err_regs regs;int node, ecc;
@@ -420,20 +421,23 @@ static void amd_decode_mce(struct mce *m) }amd_decode_err_code (m->status &0xffff ); + +return NOTIFY_STOP ; } +static struct notifier_block amd_mce_dec_nb = { + .notifier_call = amd_decode_mce, +}; +static int __init mce_amd_init (void ) {/* * We can decode MCEs for Opteron and later CPUs: */ if ((boot_cpu_data.x86_vendor ==X86_VENDOR_AMD ) && - (boot_cpu_data.x86 >=0xf )) { -/* safe the default decode mce callback */ - orig_mce_callback = x86_mce_decode_callback; - - x86_mce_decode_callback = amd_decode_mce; - } + (boot_cpu_data.x86 >=0xf )) +atomic_notifier_chain_register (&x86_mce_decoder_chain, + &amd_mce_dec_nb);return 0 ; }
@@ -442,7 +446,8 @@ early_initcall(mce_amd_init);#ifdef MODULE static void __exit mce_amd_exit(void) { - x86_mce_decode_callback = orig_mce_callback; +atomic_notifier_chain_unregister (&x86_mce_decoder_chain, + &amd_mce_dec_nb); }MODULE_DESCRIPTION ("AMD MCE decoder" );
Signature · 12 lines
1.6.4.3 -- Regards/Gruss, Boris. Operating | Advanced Micro Devices GmbH System | Karl-Hammerschmidt-Str. 34, 85609 Dornach b. München, Germany Research | Geschäftsführer: Andrew Bowd, Thomas M. McCoy, Giuliano Meroni Center | Sitz: Dornach, Gemeinde Aschheim, Landkreis München (OSRC) | Registergericht München, HRB Nr. 43632
Ingo Molnar
Appliedarch/x86/kernel/cpu/mcheck/mce.c void __cpuinit mcheck_init(struct cpuinfo_x86 *c) · line 1435
Quoted 9 lines · Borislav Petkov
arch/x86/kernel/cpu/mcheck/mce.c +4
-0@@ -1420,6 +1428,10 @@ void __cpuinit mcheck_init(struct cpuinfo_x86 *c)mce_cpu_features (c);mce_init_timer ();INIT_WORK (&__get_cpu_var (mce_work), mce_process_work); + +if (raw_smp_processor_id () ==0 ) +atomic_notifier_chain_register (&x86_mce_decoder_chain, + &mce_dec_nb); }
this bit should be done in a cleaner way, by introducing a boot init function for MCE functionality.
(It's also broken if we boot on non-0 CPUs. Doesnt happen currently but still.)
Also, the function names there are pretty messy - please do another, rename patch that does something like:
mcheck_init() => mcheck_cpu_init() mce_init() => __mcheck_cpu_init_generict() mce_cpu_features() => __mcheck_cpu_init_vendor() mce_init_timer() => __mcheck_cpu_init_timer()
etc.
I've applied your patch to x86/mce - please send delta patches to clean up the other aspects of it.
Thanks,
Ingo
PATCH 1/2 x86, mce: fixup mce naming nomenclature
Quoted 1 line
From
9459278f4cb5b108a4b648d4f079057be203ffeeMon Sep 17 00:00:00 2001
From: Borislav Petkov <[email protected]>
Date: Tue, 13 Oct 2009 15:40:17 +0200
Subject: [PATCH 1/2] x86, mce: fixup mce naming nomenclature
Prefix global/setup routines called from outside with "mcheck_" thus differentiating from the internal/facilities-related "mce_" prefixed counterparts. Also, prefix the per-cpu calls with mcheck_cpu along with changing their names to reflect the setup hierarchy of calls better.
There should be no functionality change resulting from this patch.
--- arch/x86/include/asm/mce.h | 4 +- arch/x86/kernel/cpu/common.c | 2 +- arch/x86/kernel/cpu/mcheck/mce.c | 52 +++++++++++++++++++------------------- 3 files changed, 29 insertions(+), 29 deletions(-)
arch/x86/include/asm/mce.h +2 -2
@@ -120,9 +120,9 @@ extern int mce_disabled;extern int mce_p5_enabled;#ifdef CONFIG_X86_MCE -void mcheck_init (struct cpuinfo_x86 *c); +void mcheck_cpu_init (struct cpuinfo_x86 *c);#else -static inline void mcheck_init (struct cpuinfo_x86 *c) {} +static inline void mcheck_cpu_init (struct cpuinfo_x86 *c) {}#endif #ifdef CONFIG_X86_ANCIENT_MCE
arch/x86/kernel/cpu/common.c +1 -1
@@ -839,7 +839,7 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)#ifdef CONFIG_X86_MCE /* Init Machine Check Exception if available. */ -mcheck_init (c); +mcheck_cpu_init (c);#endif select_idle_routine (c);
arch/x86/kernel/cpu/mcheck/mce.c +26 -26
176 lines not on this page · raw message
Signature · 11 lines
1.6.4.3 -- Regards/Gruss, Boris. Operating | Advanced Micro Devices GmbH System | Karl-Hammerschmidt-Str. 34, 85609 Dornach b. München, Germany Research | Geschäftsführer: Andrew Bowd, Thomas M. McCoy, Giuliano Meroni Center | Sitz: Dornach, Gemeinde Aschheim, Landkreis München (OSRC) | Registergericht München, HRB Nr. 43632
PATCH 2/2 x86, mce: Add a global MCE init helper
In reply to Ingo MolnarQuoted 1 line
From
a99c2033750588600bc8ff44dbe6d22c1a064238Mon Sep 17 00:00:00 2001
From: Borislav Petkov <[email protected]>
Date: Tue, 13 Oct 2009 16:36:34 +0200
Subject: [PATCH 2/2] x86, mce: Add a global MCE init helper
Add an early pre-smp initcall for global MCE functionality setup.
--- arch/x86/kernel/cpu/mcheck/mce.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/mcheck/mce.c +8 -2
@@ -1429,8 +1429,6 @@ void __cpuinit mcheck_cpu_init(struct cpuinfo_x86 *c)__mcheck_cpu_init_timer ();INIT_WORK (&__get_cpu_var (mce_work), mce_process_work); -if (raw_smp_processor_id () ==0 ) -atomic_notifier_chain_register (&x86_mce_decoder_chain, &mce_dec_nb); }/*
@@ -1650,6 +1648,14 @@ static int __init mcheck_enable(char *str) }__setup ("mce" , mcheck_enable); +static int __init mcheck_init (void ) +{ +atomic_notifier_chain_register (&x86_mce_decoder_chain, &mce_dec_nb); + +return 0 ; +} +early_initcall (mcheck_init); +/* * Sysfs support */
Signature · 11 lines
1.6.4.3 -- Regards/Gruss, Boris. Operating | Advanced Micro Devices GmbH System | Karl-Hammerschmidt-Str. 34, 85609 Dornach b. München, Germany Research | Geschäftsführer: Andrew Bowd, Thomas M. McCoy, Giuliano Meroni Center | Sitz: Dornach, Gemeinde Aschheim, Landkreis München (OSRC) | Registergericht München, HRB Nr. 43632