FAILED: patch "[PATCH] x86/mce: Set up the polling timer before CMCI discovery" failed to apply to 6.12-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.12-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.12.y
git checkout FETCH_HEAD
git cherry-pick -x a213dfaa2596c1c0dc4dae91c14fbfa499c03223
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026081738-avert-freebie-72be@gregkh' --subject-prefix 'PATCH 6.12.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From a213dfaa2596c1c0dc4dae91c14fbfa499c03223 Mon Sep 17 00:00:00 2001
From: Breno Leitao <[email protected]>
Date: Mon, 3 Aug 2026 02:47:40 -0700
Subject: [PATCH] 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. ]
arch/x86/kernel/cpu/mce/core.c +1 -1
@@ -2266,10 +2266,10 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c) mca_cfg.initialized =1 ; +__mcheck_cpu_setup_timer ();__mcheck_cpu_init_generic ();__mcheck_cpu_init_vendor (c);__mcheck_cpu_init_prepare_banks (); -__mcheck_cpu_setup_timer ();cr4_set_bits (X86_CR4_MCE ); }
Sasha Levin
maintainerPATCH 1/3 x86/mce: Remove __mcheck_cpu_init_early()
From: Yazen Ghannam <[email protected]>
[ Upstream commit 9f34032ec0deef58bd0eb7475f1981adfa998648 ]
The __mcheck_cpu_init_early() function was introduced so that some vendor-specific features are detected before the first MCA polling event done in __mcheck_cpu_init_generic().
Currently, __mcheck_cpu_init_early() is only used on AMD-based systems and additional code will be needed to support various system configurations.
However, the current and future vendor-specific code should be done during vendor init. This keeps all the vendor code in a common location and simplifies the generic init flow.
Move all the __mcheck_cpu_init_early() code into mce_amd_feature_init().
Stable-dep-of: a213dfaa2596 ("x86/mce: Set up the polling timer before CMCI discovery")
--- arch/x86/kernel/cpu/mce/amd.c | 4 ++++ arch/x86/kernel/cpu/mce/core.c | 14 -------------- 2 files changed, 4 insertions(+), 14 deletions(-)
arch/x86/kernel/cpu/mce/amd.c +4 -0
@@ -674,6 +674,10 @@ void mce_amd_feature_init(struct cpuinfo_x86 *c)u32 low =0 , high =0 , address =0 ;int offset =-1 ; + mce_flags.overflow_recov =cpu_feature_enabled (X86_FEATURE_OVERFLOW_RECOV ); + mce_flags.succor =cpu_feature_enabled (X86_FEATURE_SUCCOR ); + mce_flags.smca =cpu_feature_enabled (X86_FEATURE_SMCA ); + mce_flags.amd_threshold =1 ;for (bank =0 ; bank <this_cpu_read (mce_num_banks); ++bank) {if (mce_flags.smca)
arch/x86/kernel/cpu/mce/core.c +0 -14
@@ -2011,19 +2011,6 @@ static int __mcheck_cpu_ancient_init(struct cpuinfo_x86 *c)return 0 ; } -/* -* Init basic CPU features needed for early decoding of MCEs. -*/ -static void __mcheck_cpu_init_early (struct cpuinfo_x86 *c) -{ -if (c->x86_vendor ==X86_VENDOR_AMD || c->x86_vendor ==X86_VENDOR_HYGON ) { - mce_flags.overflow_recov = !!cpu_has (c,X86_FEATURE_OVERFLOW_RECOV ); - mce_flags.succor = !!cpu_has (c,X86_FEATURE_SUCCOR ); - mce_flags.smca = !!cpu_has (c,X86_FEATURE_SMCA ); - mce_flags.amd_threshold =1 ; - } -} -static void mce_centaur_feature_init (struct cpuinfo_x86 *c) {struct mca_config *cfg = &mca_cfg;
@@ -2266,7 +2253,6 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c) mca_cfg.initialized =1 ; -__mcheck_cpu_init_early (c);__mcheck_cpu_init_generic ();__mcheck_cpu_init_vendor (c);__mcheck_cpu_init_clear_banks ();
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/3 x86/mce: Set CR4.MCE last during init
From: Yazen Ghannam <[email protected]>
[ Upstream commit cfffcf97997bd35f4a59e035523d1762568bdbad ]
Set the CR4.MCE bit as the last step during init. This brings the MCA init order closer to what is described in the x86 docs.
x86 docs:
AMD Intel
MCG_CTL
MCA_CONFIG MCG_EXT_CTL
MCi_CTL MCi_CTL
MCG_CTL
CR4.MCE CR4.MCE
Current Linux:
AMD Intel
CR4.MCE CR4.MCE
MCG_CTL MCG_CTL
MCA_CONFIG MCG_EXT_CTL
MCi_CTL MCi_CTL
Updated Linux:
AMD Intel
MCG_CTL MCG_CTL
MCA_CONFIG MCG_EXT_CTL
MCi_CTL MCi_CTL
CR4.MCE CR4.MCE
The new init flow will match Intel's docs, but there will still be a mismatch for AMD regarding MCG_CTL. However, there is no known issue with this ordering, so leave it for now.
Stable-dep-of: a213dfaa2596 ("x86/mce: Set up the polling timer before CMCI discovery")
--- arch/x86/kernel/cpu/mce/core.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/mce/core.c +3 -2
@@ -1836,8 +1836,6 @@ static void __mcheck_cpu_init_generic(void)bitmap_fill (all_banks,MAX_NR_BANKS );machine_check_poll (MCP_UC |MCP_QUEUE_LOG | m_fl, &all_banks); -cr4_set_bits (X86_CR4_MCE ); -rdmsrl (MSR_IA32_MCG_CAP , cap);if (cap &MCG_CTL_P )wrmsr (MSR_IA32_MCG_CTL ,0xffffffff ,0xffffffff );
@@ -2258,6 +2256,7 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)__mcheck_cpu_init_clear_banks ();__mcheck_cpu_check_banks ();__mcheck_cpu_setup_timer (); +cr4_set_bits (X86_CR4_MCE ); }/*
@@ -2425,6 +2424,7 @@ static void mce_syscore_resume(void)__mcheck_cpu_init_generic ();__mcheck_cpu_init_vendor (raw_cpu_ptr (&cpu_info));__mcheck_cpu_init_clear_banks (); +cr4_set_bits (X86_CR4_MCE ); }static struct syscore_ops mce_syscore_ops = {
@@ -2444,6 +2444,7 @@ static void mce_cpu_restart(void *data)__mcheck_cpu_init_generic ();__mcheck_cpu_init_clear_banks ();__mcheck_cpu_init_timer (); +cr4_set_bits (X86_CR4_MCE ); }/* Reinit MCEs after user configuration changes */
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 3/3 x86/mce: Set up the polling timer before CMCI discovery
In reply to Sasha LevinFrom: Breno Leitao <[email protected]>
[ Upstream commit a213dfaa2596c1c0dc4dae91c14fbfa499c03223 ]
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. ]
--- arch/x86/kernel/cpu/mce/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/cpu/mce/core.c +1 -1
@@ -2251,11 +2251,11 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c) mca_cfg.initialized =1 ; +__mcheck_cpu_setup_timer ();__mcheck_cpu_init_generic ();__mcheck_cpu_init_vendor (c);__mcheck_cpu_init_clear_banks ();__mcheck_cpu_check_banks (); -__mcheck_cpu_setup_timer ();cr4_set_bits (X86_CR4_MCE ); }
Signature · 1 line
2.53.0