x86: under bios control, restore AP's APIC_LVTTHMR to the BSP value
PATCH v4 1/1 x86: under bios control, restore AP's APIC_LVTTHMR to the BSP value
Changes since v3:
Rename get_bsp_lvtthmr_init to mcheck_intel_therm_init and call it from mcheck_init function. Make mcheck_init a non-early_initcall so that it could execute earlier. Many thanks to Ingo for the valuable comments.
---
On platforms where bios handles the thermal monitor interrupt, APIC_LVTTHMR on each logical CPU is programmed to generate a SMI and OS can't touch it.
Unfortunately AP bringup sequence using INIT-SIPI-SIPI clear all the LVT entries except the mask bit. Essentially this results in all LVT entries including the thermal monitoring interrupt set to masked (clearing the bios programmed value for APIC_LVTTHMR).
And this leads to kernel take over the thermal monitoring interrupt on AP's but not on BSP (leaving the bios programmed value only on BSP).
As a result of this, we have seen system hangs when the thermal monitoring interrupt is generated.
Fix this by reading the initial value of thermal LVT entry on BSP and if bios has taken over the control, then program the same value on all AP's and leave the thermal monitoring interrupt control on all the logical cpu's to the bios.
--- arch/x86/include/asm/mce.h | 9 +++++++++ arch/x86/kernel/cpu/mcheck/mce.c | 5 +++-- arch/x86/kernel/cpu/mcheck/therm_throt.c | 27 ++++++++++++++++++++++++++- arch/x86/kernel/setup.c | 3 +++ 4 files changed, 41 insertions(+), 3 deletions(-)
arch/x86/include/asm/mce.h +9 -0
@@ -120,8 +120,10 @@ extern int mce_disabled;extern int mce_p5_enabled;#ifdef CONFIG_X86_MCE +int mcheck_init (void );void mcheck_cpu_init (struct cpuinfo_x86 *c);#else +static int mcheck_init (void ) {return 0 ; }static inline void mcheck_cpu_init (struct cpuinfo_x86 *c) {}#endif
@@ -215,5 +217,12 @@ 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); + +#ifdef CONFIG_X86_THERMAL_VECTOR +extern void mcheck_intel_therm_init (void ); +#else +static inline void mcheck_intel_therm_init (void ) { } +#endif +#endif /* __KERNEL__ */ #endif /* _ASM_X86_MCE_H */
arch/x86/kernel/cpu/mcheck/mce.c +3 -2
@@ -1655,13 +1655,14 @@ static int __init mcheck_enable(char *str) }__setup ("mce" , mcheck_enable); -static int __init mcheck_init (void ) +int __init mcheck_init (void ) {atomic_notifier_chain_register (&x86_mce_decoder_chain, &mce_dec_nb); +mcheck_intel_therm_init (); +return 0 ; } -early_initcall (mcheck_init);/* * Sysfs support
arch/x86/kernel/cpu/mcheck/therm_throt.c +26 -1
@@ -49,6 +49,8 @@ static DEFINE_PER_CPU(struct thermal_state, thermal_state);static atomic_t therm_throt_en =ATOMIC_INIT (0 ); +static u32 lvtthmr_init__read_mostly ; +#ifdef CONFIG_SYSFS #define define_therm_throt_sysdev_one_ro (_name) \ static SYSDEV_ATTR(_name, 0444, therm_throt_sysdev_show_##_name, NULL)
@@ -254,6 +256,16 @@ asmlinkage void smp_thermal_interrupt(struct pt_regs *regs)ack_APIC_irq (); } +void mcheck_intel_therm_init (void ) +{ +/* +* This function is only called on boot CPU. Save the init thermal +* LVT value on BSP and use that value to restore APs' thermal LVT +* entry BIOS programmed later +*/ + lvtthmr_init =apic_read (APIC_LVTTHMR ); +} +void intel_init_thermal (struct cpuinfo_x86 *c) {unsigned int cpu =smp_processor_id ();
@@ -270,7 +282,20 @@ void intel_init_thermal(struct cpuinfo_x86 *c)* since it might be delivered via SMI already: */ rdmsr (MSR_IA32_MISC_ENABLE , l, h); - h =apic_read (APIC_LVTTHMR ); + +/* +* The initial value of thermal LVT entries on all APs always reads +* 0x10000 because APs are woken up by BSP issuing INIT-SIPI-SIPI +* sequence to them and LVT registers are reset to 0s except for +* the mask bits which are set to 1s when APs receive INIT IPI. +* Always restore the value that BIOS has programmed on AP based on +* BSP's info we saved since BIOS is always setting the same value +* for all threads/cores +*/ +apic_write (APIC_LVTTHMR , lvtthmr_init); + + h = lvtthmr_init; +if ((l &MSR_IA32_MISC_ENABLE_TM1 ) && (h &APIC_DM_SMI )) {printk (KERN_DEBUG "CPU%d: Thermal monitoring handled by SMI\n" , cpu);
arch/x86/kernel/setup.c +3 -0
@@ -110,6 +110,7 @@#ifdef CONFIG_X86_64 #include <asm/numa_64.h> #endif +#include <asm/mce.h> /* * end_pfn only includes RAM, while max_pfn_mapped includes all e820 entries.
@@ -1040,6 +1041,8 @@ void __init setup_arch(char **cmdline_p)#endif #endif x86_init.oem.banner (); + +mcheck_init (); }#ifdef CONFIG_X86_32
On Mon, Nov 09, 2009 at 07:47:52PM +0800, Yong Wang wrote:
[..]
Quoted 13 lines
arch/x86/kernel/setup.c +1
-0@@ -110,6 +110,7 @@#ifdef CONFIG_X86_64 #include <asm/numa_64.h> #endif +#include <asm/mce.h> /* * end_pfn only includes RAM, while max_pfn_mapped includes all e820 entries.
arch/x86/kernel/setup.c void __init setup_arch(char **cmdline_p) · line 1045
Quoted 5 lines
arch/x86/kernel/setup.c +2
-0@@ -1040,6 +1041,8 @@ void __init setup_arch(char **cmdline_p)#endif #endif x86_init.oem.banner (); + +mcheck_init ();
I think you need
#ifdef CONFIG_X86_MCE
...
#endif
here for cases where mcheck is config-disabled, no?
Signature · 8 lines
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
Quoted 25 lines · Borislav Petkov
On Mon, Nov 09, 2009 at 07:47:52PM +0800, Yong Wang wrote:
[..]
Quoted 13 lines
arch/x86/kernel/setup.c +1
-0@@ -110,6 +110,7 @@#ifdef CONFIG_X86_64 #include <asm/numa_64.h> #endif +#include <asm/mce.h> /* * end_pfn only includes RAM, while max_pfn_mapped includes all e820 entries. arch/x86/kernel/setup.c void __init setup_arch(char **cmdline_p) · line 1045
Quoted 5 lines
arch/x86/kernel/setup.c +2
-0@@ -1040,6 +1041,8 @@ void __init setup_arch(char **cmdline_p)#endif #endif x86_init.oem.banner (); + +mcheck_init ();I think you need
Quoted 6 lines
#ifdef
CONFIG_X86_MCE
...
#endifhere for cases where mcheck is config-disabled, no?
Petkov, thanks for the review. Part of my patch is as below. Does this resolve your concern?
arch/x86/include/asm/mce.h +2 -0
@@ -120,8 +120,10 @@ extern int mce_disabled;extern int mce_p5_enabled;#ifdef CONFIG_X86_MCE +int mcheck_init (void );void mcheck_cpu_init (struct cpuinfo_x86 *c);#else +static int mcheck_init (void ) {return 0 ; }static inline void mcheck_cpu_init (struct cpuinfo_x86 *c) {}#endif
Thanks
-Yong
Quoted 8 lines · Yong Wang
Quoted 8 lines
Review
Quoted 1 line
(quoted diff) +1
-0+ mcheck_init();I think you need
#ifdef
CONFIG_X86_MCE
...
#endif
Quoted 5 lines
Quoted 2 lines
here for cases where mcheck is config-disabled, no?
Petkov, thanks for the review. Part of my patch is as below. Does this resolve your concern?
Sorry, my comment was wrong. I remember seeing "#ifdef CONFIG_X86_MCE... #endif" around mcheck_cpu_init(), that's why I asked. Anyways, with CONFIG_X86_MCE disabled I still get
.../home/boris/kernel/linux-2.6/arch/x86/include/asm/mce.h:126: warning: ‘mcheck_init’ defined but not used
CC arch/x86/ia32/audit.o AS arch/x86/kernel/entry_64.o CC arch/x86/kernel/traps.o LD arch/x86/ia32/built-in.o LD arch/x86/kvm/built-in.o CC [M] arch/x86/kvm/svm.o
/home/boris/kernel/linux-2.6/arch/x86/include/asm/mce.h:126: warning: ‘mcheck_init’ defined but not used
CC arch/x86/kernel/irq.o/home/boris/kernel/linux-2.6/arch/x86/include/asm/mce.h:126: warning: ‘mcheck_init’ defined but not used
...
which should be fixed IMHO by inlining mcheck_init() like mcheck_cpu_init(). And while we're at it, we should remove the #ifdef's around mcheck_cpu_init() in identify_cpu() since they're not needed.
Quoted 5 lines
arch/x86/include/asm/mce.h +0
-0
arch/x86/include/asm/mce.h extern int mce_disabled; · line 128
Quoted 9 lines
arch/x86/include/asm/mce.h +2
-0@@ -120,8 +120,10 @@ extern int mce_disabled;extern int mce_p5_enabled;#ifdef CONFIG_X86_MCE +int mcheck_init (void );void mcheck_cpu_init (struct cpuinfo_x86 *c);#else +static int mcheck_init (void ) {return 0 ; }static inline void mcheck_cpu_init (struct cpuinfo_x86 *c) {}#endif
Thanks.
Signature · 8 lines
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