From: Josh Poimboeuf Date: Tue, 2 Apr 2019 15:00:14 +0000 (-0500) Subject: x86/speculation: Move arch_smt_update() call to after mitigation decisions X-Git-Tag: archive/raspbian/5.2.17-1+rpi1^2^2^2~104 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8d8942e10a5af0ed85a2171e707f93457434afb2;p=linux.git 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: Josh Poimboeuf Signed-off-by: Thomas Gleixner Reviewed-by: Tyler Hicks Acked-by: Jiri Kosina Gbp-Pq: Topic bugfix/all/spec Gbp-Pq: Name 0019-x86-speculation-Move-arch_smt_update-call-to-after-m.patch --- diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 3f70da3a4e5..6ccbcac2cb1 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -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 @@ specv2_set_mode: /* 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)