RAS fix
Subsystems (2)
Linus,
Please pull the latest ras-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git ras-urgent-for-linus
# HEAD: 978370956d2046b19313659ce65ed12d5b996626 x86/mce/therm_throt: Do not access uninitialized therm_work
Fix a thermal throttling race that can result in easy to trigger boot crashes on certain Ice Lake platforms.
Thanks,
Ingo
------------------>
Chuansheng Liu (1):
x86/mce/therm_throt: Do not access uninitialized therm_work
arch/x86/kernel/cpu/mce/therm_throt.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
arch/x86/kernel/cpu/mce/therm_throt.c +5 -4
@@ -467,6 +467,7 @@ static int thermal_throttle_online(unsigned int cpu) {struct thermal_state *state = &per_cpu (thermal_state, cpu);struct device *dev =get_cpu_device (cpu); +u32 l; state->package_throttle.level =PACKAGE_LEVEL ; state->core_throttle.level =CORE_LEVEL ;
@@ -474,6 +475,10 @@ static int thermal_throttle_online(unsigned int cpu)INIT_DELAYED_WORK (&state->package_throttle.therm_work, throttle_active_work);INIT_DELAYED_WORK (&state->core_throttle.therm_work, throttle_active_work); +/* Unmask the thermal vector after the above workqueues are initialized. */ + l =apic_read (APIC_LVTTHMR ); +apic_write (APIC_LVTTHMR , l & ~APIC_LVT_MASKED ); +return thermal_throttle_add_dev (dev, cpu); }
@@ -722,10 +727,6 @@ void intel_init_thermal(struct cpuinfo_x86 *c)rdmsr (MSR_IA32_MISC_ENABLE , l, h);wrmsr (MSR_IA32_MISC_ENABLE , l |MSR_IA32_MISC_ENABLE_TM1 , h); -/* Unmask the thermal vector: */ - l =apic_read (APIC_LVTTHMR ); -apic_write (APIC_LVTTHMR , l & ~APIC_LVT_MASKED ); -pr_info_once ("CPU0: Thermal monitoring enabled (%s)\n" , tm2 ?"TM2" :"TM1" );
The pull request you sent on Sat, 18 Jan 2020 19:29:49 +0100:
The pull request you sent on Sat, 18 Jan 2020 19:29:49 +0100:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.gitras-urgent-for-linus
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/a186c112c7a44fefdf9e4208f2b38c31b53f3c1d
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker