Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3a63d9c authored by Josh Poimboeuf's avatar Josh Poimboeuf Committed by Greg Kroah-Hartman
Browse files

x86/speculation: Move arch_smt_update() call to after mitigation decisions 



commit 7c3658b20194a5b3209a143f63bc9c643c6a3ae2 upstream

arch_smt_update() now has a dependency on both Spectre v2 and MDS
mitigations.  Move its initial call to after all the mitigation decisions
have been made.

Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarTyler Hicks <tyhicks@canonical.com>
Acked-by: default avatarJiri Kosina <jkosina@suse.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f7a119a7

arch/x86/kernel/cpu/bugs.c

+2 −3
Original line number Diff line number Diff line
@@ -109,6 +109,8 @@ void __init check_bugs(void) 


	mds_select_mitigation();



	arch_smt_update();



#ifdef CONFIG_X86_32

	/*

	 * Check whether we are able to run this kernel safely on SMP.
@@ -624,9 +626,6 @@ static void __init spectre_v2_select_mitigation(void) 


	/* Set up IBPB and STIBP depending on the general spectre V2 command */

	spectre_v2_user_select_mitigation(cmd);



	/* Enable STIBP if appropriate */

	arch_smt_update();

}



static void update_stibp_msr(void * __unused)