diff options
| author | Josh Poimboeuf <[email protected]> | 2019-04-02 10:00:14 -0500 |
|---|---|---|
| committer | Thomas Gleixner <[email protected]> | 2019-04-02 20:02:37 +0200 |
| commit | 7c3658b20194a5b3209a143f63bc9c643c6a3ae2 (patch) | |
| tree | cf0daadc475c4890da31040f667f21729564de2d | |
| parent | d71eb0ce109a124b0fa714832823b9452f2762cf (diff) | |
x86/speculation: Move arch_smt_update() call to after mitigation decisions
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 <[email protected]>
Signed-off-by: Thomas Gleixner <[email protected]>
Reviewed-by: Tyler Hicks <[email protected]>
Acked-by: Jiri Kosina <[email protected]>
| -rw-r--r-- | arch/x86/kernel/cpu/bugs.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 9f252082a83b..3f934ffef8cf 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -111,6 +111,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. @@ -638,9 +640,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) |