From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5AEFD481A9E; Thu, 20 Aug 2026 17:35:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787247316; cv=none; b=OsVt8JN7oTqz1u3QuxFhUE+9NHdZimTNSZgAnG+KgBUVWLby9eJ+0Jj5vJ9ItMbB/hM9lJIVOheIphCjDI4SA5XlIfiipVScQULjgykO1/7hL+RaGDlU/HAcbFgncuQeTIMFEUX6HpXUVklWDyZ0u9dJQSbC5MrVeu3xa2oVy+M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787247316; c=relaxed/simple; bh=a/woTTCWaqkIed1ijoRz9PrHvGOQ9pVptSBKMx0fpv4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DBkxjZ9QZ90TVKHa/N/KWq8XeXJDLZ9hjJ4hH1QCCa7y/FHzwtYdP+t5srKtpwlhBVwfht1MIZ7fkyCOUVXojD6v0P6IQbVO2uoAHgTtWFXzHdaZCcEaEJDrdY392vbrY9lw0Ib1qfu1hBc6+k4aMQdmvz5VRKGjTcLS58rRjwU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=LAD9wXRL; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="LAD9wXRL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AE99B1F00A3A; Thu, 20 Aug 2026 17:35:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1787247315; bh=/dMUzv0LtWONPQJYO4kl6bhcyUEl4QOeYyNezIynNJ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=LAD9wXRLMgjKSF1qCHtUGu9aU33lUIZnFBjek9ZkD7mWEX5RrfyHfxblwj/oaL86m Fi4YO7c2tZhqyx5RvqHHal8q4PFsIlDPq7H0sssRvsfv4FLjJ29bBd6wsylA7u2GOK 9ArH7AVaFQIE/C0+QCBEyW+VPXu/RGmFvQOt4vt4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Breno Leitao , "Borislav Petkov (AMD)" , Sasha Levin Subject: [PATCH 6.12 188/220] x86/mce: Set up the polling timer before CMCI discovery Date: Thu, 20 Aug 2026 16:56:18 +0200 Message-ID: <20260820145229.161705830@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260820145223.480031205@linuxfoundation.org> References: <20260820145223.480031205@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Breno Leitao [ 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: __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. ] Fixes: 1f68ce2a0272 ("x86/mce: Handle Intel threshold interrupt storms") Signed-off-by: Breno Leitao Signed-off-by: Borislav Petkov (AMD) Cc: stable@vger.kernel.org Link: https://patch.msgid.link/20260803-mce_timer_init-v1-1-9539db424330@debian.org [ kept 6.12's `__mcheck_cpu_init_clear_banks()`/`__mcheck_cpu_check_banks()` pair instead of the merged `__mcheck_cpu_init_prepare_banks()` ] Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- arch/x86/kernel/cpu/mce/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/x86/kernel/cpu/mce/core.c +++ b/arch/x86/kernel/cpu/mce/core.c @@ -2251,11 +2251,11 @@ void mcheck_cpu_init(struct cpuinfo_x86 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); }