linux-kernel - [RFC PATCH 05/56] x86/bugs: Reset spectre

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20251013143444.3999-6-david.kaplan@amd.com>
Date: Mon, 13 Oct 2025 09:33:53 -0500
From: David Kaplan <david.kaplan@....com>
To: Thomas Gleixner <tglx@...utronix.de>, Borislav Petkov <bp@...en8.de>,
	Peter Zijlstra <peterz@...radead.org>, Josh Poimboeuf <jpoimboe@...nel.org>,
	Pawan Gupta <pawan.kumar.gupta@...ux.intel.com>, Ingo Molnar
	<mingo@...hat.com>, Dave Hansen <dave.hansen@...ux.intel.com>,
	<x86@...nel.org>, "H . Peter Anvin" <hpa@...or.com>
CC: Alexander Graf <graf@...zon.com>, Boris Ostrovsky
	<boris.ostrovsky@...cle.com>, <linux-kernel@...r.kernel.org>
Subject: [RFC PATCH 05/56] x86/bugs: Reset spectre_v2 mitigations

Add function to reset spectre_v2 mitigations back to their boot-time
defaults.

Signed-off-by: David Kaplan <david.kaplan@....com>
---
 arch/x86/kernel/cpu/bugs.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index 9d5c6a3e50e1..0430635bb17d 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -2477,6 +2477,24 @@ static void __init spectre_v2_apply_mitigation(void)
 	}
 }
 
+#ifdef CONFIG_DYNAMIC_MITIGATIONS
+static void spectre_v2_reset_mitigation(void)
+{
+	x86_spec_ctrl_base &= ~SPEC_CTRL_IBRS;
+	x86_spec_ctrl_base &= ~SPEC_CTRL_RRSBA_DIS_S;
+	rrsba_disabled = false;
+	setup_clear_cpu_cap(X86_FEATURE_KERNEL_IBRS);
+	setup_clear_cpu_cap(X86_FEATURE_RETPOLINE_LFENCE);
+	setup_clear_cpu_cap(X86_FEATURE_RETPOLINE);
+	setup_clear_cpu_cap(X86_FEATURE_RSB_CTXSW);
+	setup_clear_cpu_cap(X86_FEATURE_USE_IBPB_FW);
+	spectre_v2_enabled = SPECTRE_V2_NONE;
+	nospectre_v2 = false;
+	spectre_v2_cmd = IS_ENABLED(CONFIG_MITIGATION_SPECTRE_V2) ?
+		SPECTRE_V2_CMD_AUTO : SPECTRE_V2_CMD_NONE;
+}
+#endif
+
 static void update_stibp_msr(void * __unused)
 {
 	u64 val = spec_ctrl_current() | (x86_spec_ctrl_base & SPEC_CTRL_STIBP);
@@ -3810,5 +3828,6 @@ void __warn_thunk(void)
 void arch_cpu_reset_mitigations(void)
 {
 	spectre_v1_reset_mitigation();
+	spectre_v2_reset_mitigation();
 }
 #endif
-- 
2.34.1