Skip to content

Commit 012206a

Browse files
jpoimboeKAGA-KOKO
authored andcommitted
x86/speculation/taa: Fix printing of TAA_MSG_SMT on IBRS_ALL CPUs
For new IBRS_ALL CPUs, the Enhanced IBRS check at the beginning of cpu_bugs_smt_update() causes the function to return early, unintentionally skipping the MDS and TAA logic. This is not a problem for MDS, because there appears to be no overlap between IBRS_ALL and MDS-affected CPUs. So the MDS mitigation would be disabled and nothing would need to be done in this function anyway. But for TAA, the TAA_MSG_SMT string will never get printed on Cascade Lake and newer. The check is superfluous anyway: when 'spectre_v2_enabled' is SPECTRE_V2_IBRS_ENHANCED, 'spectre_v2_user' is always SPECTRE_V2_USER_NONE, and so the 'spectre_v2_user' switch statement handles it appropriately by doing nothing. So just remove the check. Fixes: 1b42f01 ("x86/speculation/taa: Add mitigation for TSX Async Abort") Signed-off-by: Josh Poimboeuf <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Reviewed-by: Tyler Hicks <[email protected]> Reviewed-by: Borislav Petkov <[email protected]>
1 parent 7f00cc8 commit 012206a

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

arch/x86/kernel/cpu/bugs.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -886,10 +886,6 @@ static void update_mds_branch_idle(void)
886886

887887
void cpu_bugs_smt_update(void)
888888
{
889-
/* Enhanced IBRS implies STIBP. No update required. */
890-
if (spectre_v2_enabled == SPECTRE_V2_IBRS_ENHANCED)
891-
return;
892-
893889
mutex_lock(&spec_ctrl_mutex);
894890

895891
switch (spectre_v2_user) {

0 commit comments

Comments
 (0)