aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/cpu
diff options
context:
space:
mode:
authorDavid Kaplan <david.kaplan@amd.com>2025-04-18 11:17:14 -0500
committerBorislav Petkov (AMD) <bp@alien8.de>2025-04-28 19:55:50 +0200
commit83d4b19331f3a5d5829d338a0a64b69c9c28b36e (patch)
tree155db3c6984b1ba06e2507e85030cb7e67c1c5fd /arch/x86/kernel/cpu
parentx86/bugs: Restructure spectre_v1 mitigation (diff)
downloadlinux-83d4b19331f3a5d5829d338a0a64b69c9c28b36e.tar.gz
linux-83d4b19331f3a5d5829d338a0a64b69c9c28b36e.zip
x86/bugs: Allow retbleed=stuff only on Intel
The retbleed=stuff mitigation is only applicable for Intel CPUs affected by retbleed. If this option is selected for another vendor, print a warning and fall back to the AUTO option. Signed-off-by: David Kaplan <david.kaplan@amd.com> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Reviewed-by: Josh Poimboeuf <jpoimboe@kernel.org> Link: https://lore.kernel.org/20250418161721.1855190-10-david.kaplan@amd.com
Diffstat (limited to 'arch/x86/kernel/cpu')
-rw-r--r--arch/x86/kernel/cpu/bugs.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index 1a42abb289ac..7edf42912cdf 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -1191,6 +1191,10 @@ static void __init retbleed_select_mitigation(void)
case RETBLEED_CMD_STUFF:
if (IS_ENABLED(CONFIG_MITIGATION_CALL_DEPTH_TRACKING) &&
spectre_v2_enabled == SPECTRE_V2_RETPOLINE) {
+ if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL) {
+ pr_err("WARNING: retbleed=stuff only supported for Intel CPUs.\n");
+ goto do_cmd_auto;
+ }
retbleed_mitigation = RETBLEED_MITIGATION_STUFF;
} else {