Skip to content

Commit fc9fd3f

Browse files
jpoimboeIngo Molnar
authored andcommitted
x86/bugs: Use SBPB in write_ibpb() if applicable
write_ibpb() does IBPB, which (among other things) flushes branch type predictions on AMD. If the CPU has SRSO_NO, or if the SRSO mitigation has been disabled, branch type flushing isn't needed, in which case the lighter-weight SBPB can be used. The 'x86_pred_cmd' variable already keeps track of whether IBPB or SBPB should be used. Use that instead of hardcoding IBPB. Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org> Signed-off-by: Ingo Molnar <mingo@kernel.org> Link: https://lore.kernel.org/r/17c5dcd14b29199b75199d67ff7758de9d9a4928.1744148254.git.jpoimboe@kernel.org
1 parent 13235d6 commit fc9fd3f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/x86/entry/entry.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
SYM_FUNC_START(write_ibpb)
2222
ANNOTATE_NOENDBR
2323
movl $MSR_IA32_PRED_CMD, %ecx
24-
movl $PRED_CMD_IBPB, %eax
24+
movl _ASM_RIP(x86_pred_cmd), %eax
2525
xorl %edx, %edx
2626
wrmsr
2727

0 commit comments

Comments
 (0)