x86/bugs: Add attack vector controls for spectre_v1

Use attack vector controls to determine if spectre_v1 mitigation is
required.

Signed-off-by: David Kaplan <david.kaplan@amd.com>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/20250707183316.1349127-12-david.kaplan@amd.com

diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index e9227e4a97732c52709c38f040f0a86ffbdd6e92..130db820d49d5233bccd2e40b774097de1c95851 100644 (file)
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -1144,13 +1144,16 @@ static bool smap_works_speculatively(void)
 
 static void __init spectre_v1_select_mitigation(void)
 {
-       if (!boot_cpu_has_bug(X86_BUG_SPECTRE_V1) || cpu_mitigations_off())
+       if (!boot_cpu_has_bug(X86_BUG_SPECTRE_V1))
+               spectre_v1_mitigation = SPECTRE_V1_MITIGATION_NONE;
+
+       if (!should_mitigate_vuln(X86_BUG_SPECTRE_V1))
                spectre_v1_mitigation = SPECTRE_V1_MITIGATION_NONE;
 }
 
 static void __init spectre_v1_apply_mitigation(void)
 {
-       if (!boot_cpu_has_bug(X86_BUG_SPECTRE_V1) || cpu_mitigations_off())
+       if (!boot_cpu_has_bug(X86_BUG_SPECTRE_V1))
                return;
 
        if (spectre_v1_mitigation == SPECTRE_V1_MITIGATION_AUTO) {