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 /Documentation/admin-guide/kernel-parameters.txt | |
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 'Documentation/admin-guide/kernel-parameters.txt')
-rw-r--r-- | Documentation/admin-guide/kernel-parameters.txt | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 623fce7d5fcd..70046a019d42 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -6063,6 +6063,18 @@ sonypi.*= [HW] Sony Programmable I/O Control Device driver See Documentation/admin-guide/laptops/sonypi.rst + spectre_bhi= [X86] Control mitigation of Branch History Injection + (BHI) vulnerability. Syscalls are hardened against BHI + reglardless of this setting. This setting affects the + deployment of the HW BHI control and the SW BHB + clearing sequence. + + on - unconditionally enable. + off - unconditionally disable. + auto - (default) enable hardware mitigation + (BHI_DIS_S) if available, otherwise enable + alternate mitigation in KVM. + spectre_v2= [X86,EARLY] Control mitigation of Spectre variant 2 (indirect branch speculation) vulnerability. The default operation protects the kernel from |