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 8DBB252CCC4 for ; Tue, 29 Sep 2026 13:51:25 +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=1790689886; cv=none; b=lQWi8gr73TueOF9azPgz18hXPLgo16GYSUu4tI3mVvOEQyydGddugydfAUVFBzlJ17oJ+nf4A3KtbJXJeoua/z4cs6752w1RuodFEunDted7YOnehff0lXV4jfYInvEULEAc6z6LgLsZ9rHYLXgvG76Lc4yrJpTU27d49QO/7Hs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790689886; c=relaxed/simple; bh=HyU/xtK9ZlMU+4R27kdofsMU9mbFiysmNS3fJGCfSHQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jrK8ozcmBzvb0l8Qsa3pT51Q340FJpcOh+CmclnL7xbuoOJuwcnhg64PLBhQB0fQZuITKpQlQwisyFJvsFYjsOcMEzlF6puXKvWAr2Fi2bIwJvqYvpiqegtI9yzHfJ/d9fcWTBoT7omvn4QolUADXDiBSPZ6PnZ0YpGJqfyUnyI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=S1z0yJc3; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="S1z0yJc3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 86B2A1F00893; Tue, 29 Sep 2026 13:51:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1790689885; bh=EY1AqiaiMC7S6EEhQXu0LEV0bOmCwZZ5wzRmkRduaGI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=S1z0yJc3cDU35H+91bBH8A0ZbP8uS2JJymv/EijjT0EUs0G2NJn6Peop4DC0Ez5nS zddNIrWBl+m5NK/pIlSaSQkwruyZ8qmxaF6KDZzbIpTatVm7ItsNCQbN2+lZVdLRxo i9+A7QlVoDiCnNkJBXL/i+OrSeuKObQ5RmCfmipK1n/LF53O/JMU2/RdH7BVWIp3vA in32dXX6IX4WmJO5jjoN282zPiCQPh5qIDNIdsHnJSakXULaxxSYkqaQJL2Euqol7U /2k+r6e2sabFxkBUItlcAIiWpuVCDi43hFwSQpAH8Swk6T36lalyMzf73R2SguIGQa HYC2XvmZeIDKQ== From: Sasha Levin To: stable@vger.kernel.org Cc: "Masami Hiramatsu (Google)" , "Borislav Petkov (AMD)" , "Peter Zijlstra (Intel)" , stable@kernel.org, Sasha Levin Subject: [PATCH 6.1.y] x86/mce: Fix hardware debug register corruption on task migration Date: Tue, 29 Sep 2026 09:51:23 -0400 Message-ID: <20260929135123.3518678-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026092918-scavenger-recite-1f38@gregkh> References: <2026092918-scavenger-recite-1f38@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 [ Omitted changes to the FRED machine-check handler because it is absent in Linux 6.6. ] 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