Commit 6a7c3c26 authored by Pawan Gupta's avatar Pawan Gupta Committed by Borislav Petkov (AMD)
Browse files

x86/bugs: Fix spectre_v2 mitigation default on Intel 



Commit

  480e803d ("x86/bugs: Restructure spectre_v2 mitigation")

inadvertently changed the spectre-v2 mitigation default from eIBRS to IBRS on
Intel. While splitting the spectre_v2 mitigation in select/update/apply
functions, eIBRS and IBRS selection logic was separated in select and update.

This caused IBRS selection to not consider that eIBRS mitigation is already
selected, fix it.

Fixes: 480e803d ("x86/bugs: Restructure spectre_v2 mitigation")
Signed-off-by: default avatarPawan Gupta <pawan.kumar.gupta@linux.intel.com>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/20250520-eibrs-fix-v1-1-91bacd35ed09@linux.intel.com
parent 61ab72c2

arch/x86/kernel/cpu/bugs.c

+2 −1
Original line number Diff line number Diff line
@@ -2105,7 +2105,8 @@ static void __init spectre_v2_select_mitigation(void) 


static void __init spectre_v2_update_mitigation(void)

{

	if (spectre_v2_cmd == SPECTRE_V2_CMD_AUTO) {

	if (spectre_v2_cmd == SPECTRE_V2_CMD_AUTO &&

	    !spectre_v2_in_eibrs_mode(spectre_v2_enabled)) {

		if (IS_ENABLED(CONFIG_MITIGATION_IBRS_ENTRY) &&

		    boot_cpu_has_bug(X86_BUG_RETBLEED) &&

		    retbleed_mitigation != RETBLEED_MITIGATION_NONE &&