Skip to content

Commit

Permalink
x86/mm: Remove X86_FEATURE_USE_IBPB checks in cond_mitigation()
Browse files Browse the repository at this point in the history
The check is performed when either switch_mm_cond_ibpb or
switch_mm_always_ibpb is set. In both cases, X86_FEATURE_USE_IBPB is
always set. Remove the redundant check.

Signed-off-by: Yosry Ahmed <yosry.ahmed@linux.dev>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Josh Poimboeuf <jpoimboe@kernel.org>
Link: https://lore.kernel.org/r/20250227012712.3193063-3-yosry.ahmed@linux.dev
  • Loading branch information
Yosry Ahmed authored and Ingo Molnar committed Feb 27, 2025
1 parent 549435a commit a48dc42
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions arch/x86/mm/tlb.c
Original file line number Diff line number Diff line change
Expand Up @@ -437,8 +437,7 @@ static void cond_mitigation(struct task_struct *next)
* both have the IBPB bit set.
*/
if (next_mm != prev_mm &&
(next_mm | prev_mm) & LAST_USER_MM_IBPB &&
cpu_feature_enabled(X86_FEATURE_USE_IBPB))
(next_mm | prev_mm) & LAST_USER_MM_IBPB)
indirect_branch_prediction_barrier();
}

Expand All @@ -448,8 +447,7 @@ static void cond_mitigation(struct task_struct *next)
* different context than the user space task which ran
* last on this CPU.
*/
if ((prev_mm & ~LAST_USER_MM_SPEC_MASK) != (unsigned long)next->mm &&
cpu_feature_enabled(X86_FEATURE_USE_IBPB))
if ((prev_mm & ~LAST_USER_MM_SPEC_MASK) != (unsigned long)next->mm)
indirect_branch_prediction_barrier();
}

Expand Down

0 comments on commit a48dc42

Please sign in to comment.