Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

x86: remove CONFIG_DISABLE_SSBD and CONFIG_ENABLE_EXTENDED_IBRS #81540

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −18
Open

x86: remove CONFIG_DISABLE_SSBD and CONFIG_ENABLE_EXTENDED_IBRS #81540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions arch/x86/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,15 +417,6 @@ config X86_DISABLE_SSBD
Even if enabled, will have no effect on CPUs that do not
require this feature.

config DISABLE_SSBD
bool "Disable Speculative Store Bypass [DEPRECATED]"
depends on USERSPACE
default y if !X86_NO_SPECTRE_V4
select X86_DISABLE_SSBD
select DEPRECATED
help
Deprecated. Use CONFIG_X86_DISABLE_SSBD instead.

config X86_ENABLE_EXTENDED_IBRS
bool "Extended IBRS"
depends on USERSPACE
Expand All @@ -435,15 +426,6 @@ config X86_ENABLE_EXTENDED_IBRS
Speculation 'always on' feature. This mitigates Indirect Branch
Control vulnerabilities (aka Spectre V2).

config ENABLE_EXTENDED_IBRS
bool "Extended IBRS [DEPRECATED]"
depends on USERSPACE
default y if !X86_NO_SPECTRE_V2
select X86_ENABLE_EXTENDED_IBRS
select DEPRECATED
help
Deprecated. Use CONFIG_X86_ENABLE_EXTENDED_IBRS instead.

config X86_BOUNDS_CHECK_BYPASS_MITIGATION
bool
depends on USERSPACE
Expand Down
6 changes: 6 additions & 0 deletions doc/releases/migration-guide-4.1.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,3 +115,9 @@ Modem

Architectures
*************

* x86

* Kconfigs ``CONFIG_DISABLE_SSBD`` and ``CONFIG_ENABLE_EXTENDED_IBRS`` have been deprecated
since v3.7. These were removed. Use :kconfig:option:`CONFIG_X86_DISABLE_SSBD` and
:kconfig:option:`CONFIG_X86_ENABLE_EXTENDED_IBRS` instead.
Loading