diff options
author | Ingo Molnar <mingo@kernel.org> | 2024-04-10 07:04:04 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2024-04-10 07:04:04 +0200 |
commit | a40d2525eaa6ba40ebd39ea2ed9598e13092a7dc (patch) | |
tree | d5d5515c98d6163e14d56dfe3272cb3b4e9c7d71 /arch/x86/Kconfig | |
parent | 5ce344beaca688f4cdea07045e0b8f03dc537e74 (diff) | |
parent | 2c71fdf02a95b3dd425b42f28fd47fb2b1d22702 (diff) | |
download | linux-stable-a40d2525eaa6ba40ebd39ea2ed9598e13092a7dc.tar.gz linux-stable-a40d2525eaa6ba40ebd39ea2ed9598e13092a7dc.tar.bz2 linux-stable-a40d2525eaa6ba40ebd39ea2ed9598e13092a7dc.zip |
Merge branch 'linus' into x86/urgent, to pick up dependent commits
Prepare to fix aspects of the new BHI code.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r-- | arch/x86/Kconfig | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 4fff6ed46e90..10a6251f58f3 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2633,6 +2633,32 @@ config MITIGATION_RFDS stored in floating point, vector and integer registers. See also <file:Documentation/admin-guide/hw-vuln/reg-file-data-sampling.rst> +choice + prompt "Clear branch history" + depends on CPU_SUP_INTEL + default SPECTRE_BHI_ON + help + Enable BHI mitigations. BHI attacks are a form of Spectre V2 attacks + where the branch history buffer is poisoned to speculatively steer + indirect branches. + See <file:Documentation/admin-guide/hw-vuln/spectre.rst> + +config SPECTRE_BHI_ON + bool "on" + help + Equivalent to setting spectre_bhi=on command line parameter. +config SPECTRE_BHI_OFF + bool "off" + help + Equivalent to setting spectre_bhi=off command line parameter. +config SPECTRE_BHI_AUTO + bool "auto" + depends on BROKEN + help + Equivalent to setting spectre_bhi=auto command line parameter. + +endchoice + endif config ARCH_HAS_ADD_PAGES |