From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795044134; b=VJ8VBlQEfWOmWeFHKWJA3J9+bpNbOZPPENozjEQ0qRBXvWSFjXWLel3Fsoig1m62DcTY HyqRnIuerhPRUPH+Duvd8cLNADvoY1VUmtY2W4oi81Pkl+og54xchfjvKCSNW+Qxt65As uPBheehH0Nimi843pVtIAGqJwioHyeO87AaBvoxki88NUHhEVwK4j8wU8G0ckXS4HeZ0n YhLiwpdyFhXXEAjqDblDRlHaRPXLIgqsVqEry8Qhaphcux76JFA9VZmrimV18rwiMYa9m xQX1D8REpqlUrZnUKEaXF2ktnNzz2mB9SdH8A3asiElADHXrXhcWYL02f/gs8VMO9tg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795044134; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=xs81fvK+AdbdkwaZJm9B9JshgnO9S25SW95/3NBduyI=; b=Km03WmmIuobCe1UJdcdnv2DeTaieFrTx/jmgri555ii0GG60W5KKZVAkk9XKu2Wj0gE7 YQa2sGA64JAf5Q+hFlxFFHFpdviGd24IC7cNz9cgIb9Q3s1JNuNstWR3BS0U4ybKIqLGX XcF7A0ahKpa4RyBA9epHEsgoIS7ltns2Y8XL1d5cpF4DqdogPm+5qKl9aqU+m3frj/xbB UdwdO6y0mgUCOAgozqVN+K1S0q0lmFe8qNGnxcTz8iwmaWI4rF5qBVMTK6yUPROD1dKNR KTaQhRF9bKLiZ2lehWvhVD0w1EnYiVjnUzBL4piSMDAIhhp2S57wChlgL4X7DiiICVg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=NNyDGDX3; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5E2CC606A31C; Wed, 18 Nov 2026 23:22:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=NNyDGDX3 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6209C1F000C4; Wed, 18 Nov 2026 23:22:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795044133; bh=xs81fvK+AdbdkwaZJm9B9JshgnO9S25SW95/3NBduyI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=NNyDGDX3uFGq7T5S5mDmCOvC4Li4CE8lDM2Ahhn1p3ZD/AGzyl0ySKn49lwHfVHJ9 OhY5LhEobEI3miqT5jFqJ0+6c0qSOSCKnfGL+ZJ6phf65loUy+3Om4lW6Ti9zb8iAc E254IVa/1WyT3CnQok6L//+gmUL0jFyt+pQEFnNQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "Masami Hiramatsu (Google)" , "Borislav Petkov (AMD)" , "Peter Zijlstra (Intel)" , stable@kernel.org, Sasha Levin Subject: [PATCH 6.1 0457/2857] x86/mce: Fix hardware debug register corruption on task migration Date: Wed, 18 Nov 2026 15:24:51 +0100 Message-ID: <20261118150217.878539164@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150201.293410965@linuxfoundation.org> References: <20261118150201.293410965@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Masami Hiramatsu (Google) [ Upstream commit b8d1d5b63a8ef532038eebd9d97d406860385668 ] In exc_machine_check_user(), local_db_save() and local_db_restore() are invoked in the outer entry stubs (DEFINE_IDTENTRY_MCE_USER, DEFINE_FREDENTRY_MCE, and DEFINE_IDTENTRY_RAW), surrounding exc_machine_check_user(). However, exc_machine_check_user() calls irqentry_exit_to_user_mode(), which handles pending thread work and may schedule() if TIF_NEED_RESCHED is set. If the task migrates to another CPU during schedule(), local_db_restore() runs on the new CPU with the dr7 state saved from the old CPU. This corrupts the new CPU's DR7 hardware debug register and leaves the old CPU's DR7 disabled. In short, local_db_save() and local_db_restore() pair must be run on the same CPU. To fix this, move local_db_save() and local_db_restore() inside exc_machine_check_user() and exc_machine_check_kernel(). In exc_machine_check_user(), DR7 is saved and restored strictly around do_machine_check() to avoid schedule() during migration. In exc_machine_check_kernel(), local_db_save() is called at the entry point to prevent early memory accesses from triggering nested #DB exceptions, and restored on all exits. Fixes: cd840e424f27 ("x86/entry, mce: Disallow #DB during #MC") Assisted-by: LLM Signed-off-by: Masami Hiramatsu (Google) Signed-off-by: Borislav Petkov (AMD) Acked-by: Peter Zijlstra (Intel) Cc: Link: https://patch.msgid.link/179005109564.388919.3937970081044095776.stgit@devnote2 [ sashal: Dropped the FRED machine-check stub hunk because this branch has no FRED entry stub in the MCE code to apply it to. ] Signed-off-by: Sasha Levin --- arch/x86/kernel/cpu/mce/core.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c index e65dfc88b9259..443dd6a3ef3ac 100644 --- a/arch/x86/kernel/cpu/mce/core.c +++ b/arch/x86/kernel/cpu/mce/core.c @@ -2117,6 +2117,9 @@ bool filter_mce(struct mce *m) static __always_inline void exc_machine_check_kernel(struct pt_regs *regs) { irqentry_state_t irq_state; + unsigned long dr7; + + dr7 = local_db_save(); WARN_ON_ONCE(user_mode(regs)); @@ -2125,20 +2128,26 @@ static __always_inline void exc_machine_check_kernel(struct pt_regs *regs) * mce_check_crashing_cpu() for details. */ if (mca_cfg.initialized && mce_check_crashing_cpu()) - return; + goto out; irq_state = irqentry_nmi_enter(regs); do_machine_check(regs); irqentry_nmi_exit(regs, irq_state); +out: + local_db_restore(dr7); } static __always_inline void exc_machine_check_user(struct pt_regs *regs) { + unsigned long dr7; + irqentry_enter_from_user_mode(regs); + dr7 = local_db_save(); do_machine_check(regs); + local_db_restore(dr7); irqentry_exit_to_user_mode(regs); } @@ -2147,34 +2156,22 @@ static __always_inline void exc_machine_check_user(struct pt_regs *regs) /* MCE hit kernel mode */ DEFINE_IDTENTRY_MCE(exc_machine_check) { - unsigned long dr7; - - dr7 = local_db_save(); exc_machine_check_kernel(regs); - local_db_restore(dr7); } /* The user mode variant. */ DEFINE_IDTENTRY_MCE_USER(exc_machine_check) { - unsigned long dr7; - - dr7 = local_db_save(); exc_machine_check_user(regs); - local_db_restore(dr7); } #else /* 32bit unified entry point */ DEFINE_IDTENTRY_RAW(exc_machine_check) { - unsigned long dr7; - - dr7 = local_db_save(); if (user_mode(regs)) exc_machine_check_user(regs); else exc_machine_check_kernel(regs); - local_db_restore(dr7); } #endif -- 2.53.0