From: "tip-bot2 for Breno Leitao" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Borislav Petkov <bp@alien8.de>, Breno Leitao <leitao@debian.org>,
Daniel Sneddon <daniel.sneddon@linux.intel.com>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/bugs] x86/bugs: Remove GDS Force Kconfig option
Date: Tue, 30 Jul 2024 14:15:11 -0000 [thread overview]
Message-ID: <172234891192.2215.14873791038703677473.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20240729164105.554296-11-leitao@debian.org>
The following commit has been merged into the x86/bugs branch of tip:
Commit-ID: 03267a534bb388acdd2ee685101084d144e8384c
Gitweb: https://git.kernel.org/tip/03267a534bb388acdd2ee685101084d144e8384c
Author: Breno Leitao <leitao@debian.org>
AuthorDate: Mon, 29 Jul 2024 09:40:58 -07:00
Committer: Borislav Petkov (AMD) <bp@alien8.de>
CommitterDate: Tue, 30 Jul 2024 14:53:15 +02:00
x86/bugs: Remove GDS Force Kconfig option
Remove the MITIGATION_GDS_FORCE Kconfig option, which aggressively disables
AVX as a mitigation for Gather Data Sampling (GDS) vulnerabilities. This
option is not widely used by distros.
While removing the Kconfig option, retain the runtime configuration ability
through the `gather_data_sampling=force` kernel parameter. This allows users
to still enable this aggressive mitigation if needed, without baking it into
the kernel configuration.
Simplify the kernel configuration while maintaining flexibility for runtime
mitigation choices.
Suggested-by: Borislav Petkov <bp@alien8.de>
Signed-off-by: Breno Leitao <leitao@debian.org>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: Daniel Sneddon <daniel.sneddon@linux.intel.com>
Link: https://lore.kernel.org/r/20240729164105.554296-11-leitao@debian.org
---
arch/x86/Kconfig | 19 -------------------
arch/x86/kernel/cpu/bugs.c | 4 ----
2 files changed, 23 deletions(-)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 2e72a07..ab5b210 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2610,25 +2610,6 @@ config MITIGATION_SLS
against straight line speculation. The kernel image might be slightly
larger.
-config MITIGATION_GDS_FORCE
- bool "Force GDS Mitigation"
- depends on CPU_SUP_INTEL
- default n
- help
- Gather Data Sampling (GDS) is a hardware vulnerability which allows
- unprivileged speculative access to data which was previously stored in
- vector registers.
-
- This option is equivalent to setting gather_data_sampling=force on the
- command line. The microcode mitigation is used if present, otherwise
- AVX is disabled as a mitigation. On affected systems that are missing
- the microcode any userspace code that unconditionally uses AVX will
- break with this option set.
-
- Setting this option on systems not vulnerable to GDS has no effect.
-
- If in doubt, say N.
-
config MITIGATION_RFDS
bool "RFDS Mitigation"
depends on CPU_SUP_INTEL
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index a7f20ae..b2e752e 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -735,11 +735,7 @@ enum gds_mitigations {
GDS_MITIGATION_HYPERVISOR,
};
-#if IS_ENABLED(CONFIG_MITIGATION_GDS_FORCE)
-static enum gds_mitigations gds_mitigation __ro_after_init = GDS_MITIGATION_FORCE;
-#else
static enum gds_mitigations gds_mitigation __ro_after_init = GDS_MITIGATION_FULL;
-#endif
static const char * const gds_strings[] = {
[GDS_MITIGATION_OFF] = "Vulnerable",
next prev parent reply other threads:[~2024-07-30 14:15 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-29 16:40 [PATCH v4 00/11] x86/bugs: Separate config for mitigations Breno Leitao
2024-07-29 16:40 ` [PATCH v4 01/11] x86/bugs: Add a separate config for MDS Breno Leitao
2024-07-30 14:15 ` [tip: x86/bugs] " tip-bot2 for Breno Leitao
2024-07-29 16:40 ` [PATCH v4 02/11] x86/bugs: Add a separate config for TAA Breno Leitao
2024-07-30 14:15 ` [tip: x86/bugs] " tip-bot2 for Breno Leitao
2024-07-29 16:40 ` [PATCH v4 03/11] x86/bugs: Add a separate config for MMIO Stable Data Breno Leitao
2024-07-30 14:15 ` [tip: x86/bugs] " tip-bot2 for Breno Leitao
2024-07-29 16:40 ` [PATCH v4 04/11] x86/bugs: Add a separate config for L1TF Breno Leitao
2024-07-30 14:15 ` [tip: x86/bugs] " tip-bot2 for Breno Leitao
2024-07-29 16:40 ` [PATCH v4 05/11] x86/bugs: Add a separate config for RETBLEED Breno Leitao
2024-07-30 14:15 ` [tip: x86/bugs] " tip-bot2 for Breno Leitao
2024-07-29 16:40 ` [PATCH v4 06/11] x86/bugs: Add a separate config for Spectre v1 Breno Leitao
2024-07-30 14:15 ` [tip: x86/bugs] " tip-bot2 for Breno Leitao
2024-07-29 16:40 ` [PATCH v4 07/11] x86/bugs: Add a separate config for SRBDS Breno Leitao
2024-07-30 14:15 ` [tip: x86/bugs] " tip-bot2 for Breno Leitao
2024-07-29 16:40 ` [PATCH v4 08/11] x86/bugs: Add a separate config for Spectre V2 Breno Leitao
2024-07-30 14:15 ` [tip: x86/bugs] " tip-bot2 for Breno Leitao
2024-07-29 16:40 ` [PATCH v4 09/11] x86/bugs: Add a separate config for SSB Breno Leitao
2024-07-30 14:15 ` [tip: x86/bugs] " tip-bot2 for Breno Leitao
2024-07-29 16:40 ` [PATCH v4 10/11] x86/bugs: Remove GDS Force Kconfig option Breno Leitao
2024-07-29 17:09 ` Daniel Sneddon
2024-07-30 14:15 ` tip-bot2 for Breno Leitao [this message]
2024-07-29 16:40 ` [PATCH v4 11/11] x86/bugs: Add a separate config for GDS Breno Leitao
2024-07-30 14:15 ` [tip: x86/bugs] " tip-bot2 for Breno Leitao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=172234891192.2215.14873791038703677473.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=bp@alien8.de \
--cc=daniel.sneddon@linux.intel.com \
--cc=leitao@debian.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®