Commit 46d5925b authored by David Kaplan's avatar David Kaplan Committed by Borislav Petkov (AMD)
Browse files

x86/bugs: Restructure spectre_v1 mitigation 



Restructure spectre_v1 to use select/apply functions to create
consistent vulnerability handling.

Signed-off-by: default avatarDavid Kaplan <david.kaplan@amd.com>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: default avatarJosh Poimboeuf <jpoimboe@kernel.org>
Link: https://lore.kernel.org/20250418161721.1855190-9-david.kaplan@amd.com
parent 9dcad2fb

arch/x86/kernel/cpu/bugs.c

+8 −2
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ 
 */



static void __init spectre_v1_select_mitigation(void);

static void __init spectre_v1_apply_mitigation(void);

static void __init spectre_v2_select_mitigation(void);

static void __init retbleed_select_mitigation(void);

static void __init spectre_v2_user_select_mitigation(void);
@@ -223,6 +224,7 @@ void __init cpu_select_mitigations(void) 
	mmio_update_mitigation();

	rfds_update_mitigation();



	spectre_v1_apply_mitigation();

	mds_apply_mitigation();

	taa_apply_mitigation();

	mmio_apply_mitigation();
@@ -1021,11 +1023,15 @@ 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) || cpu_mitigations_off())

		spectre_v1_mitigation = SPECTRE_V1_MITIGATION_NONE;

		return;

}



static void __init spectre_v1_apply_mitigation(void)

{

	if (!boot_cpu_has_bug(X86_BUG_SPECTRE_V1) || cpu_mitigations_off())

		return;



	if (spectre_v1_mitigation == SPECTRE_V1_MITIGATION_AUTO) {

		/*

		 * With Spectre v1, a user can speculatively control either