Skip to content

Commit 1da8d21

Browse files
leitaoIngo Molnar
authored andcommitted
x86/bugs: Rename CONFIG_CPU_IBRS_ENTRY => CONFIG_MITIGATION_IBRS_ENTRY
Step 8/10 of the namespace unification of CPU mitigations related Kconfig options. Suggested-by: Josh Poimboeuf <[email protected]> Signed-off-by: Breno Leitao <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Acked-by: Josh Poimboeuf <[email protected]> Cc: Linus Torvalds <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent ac61d43 commit 1da8d21

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

arch/x86/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2561,7 +2561,7 @@ config MITIGATION_IBPB_ENTRY
25612561
help
25622562
Compile the kernel with support for the retbleed=ibpb mitigation.
25632563

2564-
config CPU_IBRS_ENTRY
2564+
config MITIGATION_IBRS_ENTRY
25652565
bool "Enable IBRS on kernel entry"
25662566
depends on CPU_SUP_INTEL && X86_64
25672567
default y

arch/x86/entry/calling.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ For 32-bit we have the following conventions - kernel is built with
303303
* Assumes x86_spec_ctrl_{base,current} to have SPEC_CTRL_IBRS set.
304304
*/
305305
.macro IBRS_ENTER save_reg
306-
#ifdef CONFIG_CPU_IBRS_ENTRY
306+
#ifdef CONFIG_MITIGATION_IBRS_ENTRY
307307
ALTERNATIVE "jmp .Lend_\@", "", X86_FEATURE_KERNEL_IBRS
308308
movl $MSR_IA32_SPEC_CTRL, %ecx
309309

@@ -332,7 +332,7 @@ For 32-bit we have the following conventions - kernel is built with
332332
* regs. Must be called after the last RET.
333333
*/
334334
.macro IBRS_EXIT save_reg
335-
#ifdef CONFIG_CPU_IBRS_ENTRY
335+
#ifdef CONFIG_MITIGATION_IBRS_ENTRY
336336
ALTERNATIVE "jmp .Lend_\@", "", X86_FEATURE_KERNEL_IBRS
337337
movl $MSR_IA32_SPEC_CTRL, %ecx
338338

arch/x86/kernel/cpu/bugs.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1439,7 +1439,7 @@ static enum spectre_v2_mitigation_cmd __init spectre_v2_parse_cmdline(void)
14391439
return SPECTRE_V2_CMD_AUTO;
14401440
}
14411441

1442-
if (cmd == SPECTRE_V2_CMD_IBRS && !IS_ENABLED(CONFIG_CPU_IBRS_ENTRY)) {
1442+
if (cmd == SPECTRE_V2_CMD_IBRS && !IS_ENABLED(CONFIG_MITIGATION_IBRS_ENTRY)) {
14431443
pr_err("%s selected but not compiled in. Switching to AUTO select\n",
14441444
mitigation_options[i].option);
14451445
return SPECTRE_V2_CMD_AUTO;
@@ -1565,7 +1565,7 @@ static void __init spectre_v2_select_mitigation(void)
15651565
break;
15661566
}
15671567

1568-
if (IS_ENABLED(CONFIG_CPU_IBRS_ENTRY) &&
1568+
if (IS_ENABLED(CONFIG_MITIGATION_IBRS_ENTRY) &&
15691569
boot_cpu_has_bug(X86_BUG_RETBLEED) &&
15701570
retbleed_cmd != RETBLEED_CMD_OFF &&
15711571
retbleed_cmd != RETBLEED_CMD_STUFF &&

0 commit comments

Comments
 (0)