]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
x86/bugs: Use SBPB in write_ibpb() if applicable
authorJosh Poimboeuf <jpoimboe@kernel.org>
Tue, 8 Apr 2025 21:47:31 +0000 (14:47 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 2 May 2025 05:50:59 +0000 (07:50 +0200)
commit19160ed5e5fa7cef24135fe6c1347ce55713d4f1
treef8af7ee7b02cf52323553633fa6b96973b8afe8d
parent84b52a6cd01202e7f3177ed286e3f0c200bd3bcd
x86/bugs: Use SBPB in write_ibpb() if applicable

[ Upstream commit fc9fd3f98423367c79e0bd85a9515df26dc1b3cc ]

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
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/x86/entry/entry.S