History

x86/mce: Set up the polling timer before CMCI discovery

I hit the following on one of my machines: mce: CPU0 BANK15 CMCI inherited storm ------------[ cut here ]------------ ODEBUG: assert_init not available (active state 0) object: (____ptrval____) object type: timer_list hint: 0x0 WARNING: lib/debugobjects.c:632 at debug_object_assert_init+0x178/0x230, CPU#0: swapper/0/0 CPU: 0 UID: 0 PID: 0 Comm: swapper/0 Not tainted 7.2.0-rc5 #3 PREEMPTLAZY RIP: 0010:debug_object_assert_init+0x18f/0x230 Call Trace: <TASK> __mod_timer mce_timer_kick cmci_discover intel_init_cmci mce_intel_feature_init mcheck_cpu_init identify_cpu identify_boot_cpu arch_cpu_finalize_init start_kernel A second splat follows right after, from timer_setup() finding that same timer already queued: ODEBUG: init active (active state 0) object: (____ptrval____) object type: timer_list hint: stub_timer+0x0/0x10 This is happening because CMCI storm detection is trying to modify the timer before latter was properly set up. Set up the timer first. __mcheck_cpu_setup_timer() only calls timer_setup(), and depends on neither the generic nor the vendor init. [ bp: Massage commit message. ]

Breno Leitao committed 3 months ago

Commit a213dfa1 parent 075b7481 file · +1 −1Browse files

Unified · Split

arch/x86/kernel/cpu/mce/core.c+1−1
@@ -2266,10 +2266,10 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c) · 2265 unmodified lines
22662266
22672267 mca_cfg.initialized = 1;
22682268
2269+ __mcheck_cpu_setup_timer();
22692270 __mcheck_cpu_init_generic();
22702271 __mcheck_cpu_init_vendor(c);
22712272 __mcheck_cpu_init_prepare_banks();
2272− __mcheck_cpu_setup_timer();
22732273 cr4_set_bits(X86_CR4_MCE);
22742274 }
22752275

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t