Skip to content

Commit 81ffdcd

Browse files
Andi KleenIngo Molnar
authored andcommitted
x86/mce: Fix thermal throttling reporting after kexec
The per CPU thermal vector init code checks if the thermal vector is already installed and complains and bails out if it is. This happens after kexec, as kernel shut down does not clear the thermal vector APIC register. This causes two problems: 1. So we always do not fully initialize thermal reports after kexec. The CPU is still likely initialized, as the previous kernel should have done it. But we don't set up the software pointer to the thermal vector, so reporting may end up with a unknown thermal interrupt message. 2. Also it complains for every logical CPU, even though the value is actually derived from BP only. The problem is that we end up with one message per CPU, so on larger systems it becomes very noisy and messes up the otherwise nicely formatted CPU bootup numbers in the kernel log. Just remove the check. I checked the code and there's no valid code paths where the thermal init code for a CPU could be called multiple times. Why the kernel does not clean up this value on shutdown: The thermal monitoring is controlled per logical CPU thread. Normal shutdown code is just running on one CPU. To disable it we would need a broadcast NMI to all CPUs on shut down. That's overkill for this. So we just ignore it after kexec. Signed-off-by: Andi Kleen <[email protected]> Signed-off-by: Borislav Petkov <[email protected]> Reviewed-by: Thomas Gleixner <[email protected]> Cc: H. Peter Anvin <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Tony Luck <[email protected]> Cc: linux-edac <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
1 parent 53b90c0 commit 81ffdcd

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

arch/x86/kernel/cpu/mcheck/therm_throt.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -503,14 +503,6 @@ void intel_init_thermal(struct cpuinfo_x86 *c)
503503
return;
504504
}
505505

506-
/* Check whether a vector already exists */
507-
if (h & APIC_VECTOR_MASK) {
508-
printk(KERN_DEBUG
509-
"CPU%d: Thermal LVT vector (%#x) already installed\n",
510-
cpu, (h & APIC_VECTOR_MASK));
511-
return;
512-
}
513-
514506
/* early Pentium M models use different method for enabling TM2 */
515507
if (cpu_has(c, X86_FEATURE_TM2)) {
516508
if (c->x86 == 6 && (c->x86_model == 9 || c->x86_model == 13)) {

0 commit comments

Comments
 (0)