From: "tip-bot2 for Breno Leitao" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Josh Poimboeuf <jpoimboe@kernel.org>,
Breno Leitao <leitao@debian.org>,
"Borislav Petkov (AMD)" <bp@alien8.de>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/bugs] x86/bugs: Add a separate config for GDS
Date: Tue, 30 Jul 2024 14:15:11 -0000 [thread overview]
Message-ID: <172234891142.2215.16307852253027242186.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20240729164105.554296-12-leitao@debian.org>
The following commit has been merged into the x86/bugs branch of tip:
Commit-ID: 225f2bd064c32397acfe3d9dfd9a2b3bc6d64fd7
Gitweb: https://git.kernel.org/tip/225f2bd064c32397acfe3d9dfd9a2b3bc6d64fd7
Author: Breno Leitao <leitao@debian.org>
AuthorDate: Mon, 29 Jul 2024 09:40:59 -07:00
Committer: Borislav Petkov (AMD) <bp@alien8.de>
CommitterDate: Tue, 30 Jul 2024 14:54:15 +02:00
x86/bugs: Add a separate config for GDS
Currently, the CONFIG_SPECULATION_MITIGATIONS is halfway populated, where some
mitigations have entries in Kconfig, and they could be modified, while others
mitigations do not have Kconfig entries, and could not be controlled at build
time.
Create a new kernel config that allows GDS to be completely disabled,
similarly to the "gather_data_sampling=off" or "mitigations=off" kernel
command-line.
Now, there are two options for GDS mitigation:
* CONFIG_MITIGATION_GDS=n -> Mitigation disabled (New)
* CONFIG_MITIGATION_GDS=y -> Mitigation enabled (GDS_MITIGATION_FULL)
Suggested-by: Josh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: Breno Leitao <leitao@debian.org>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Acked-by: Josh Poimboeuf <jpoimboe@kernel.org>
Link: https://lore.kernel.org/r/20240729164105.554296-12-leitao@debian.org
---
arch/x86/Kconfig | 10 ++++++++++
arch/x86/kernel/cpu/bugs.c | 3 ++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index ab5b210..475bc53 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2610,6 +2610,16 @@ config MITIGATION_SLS
against straight line speculation. The kernel image might be slightly
larger.
+config MITIGATION_GDS
+ bool "Mitigate Gather Data Sampling"
+ depends on CPU_SUP_INTEL
+ default y
+ help
+ Enable mitigation for Gather Data Sampling (GDS). GDS is a hardware
+ vulnerability which allows unprivileged speculative access to data
+ which was previously stored in vector registers. The attacker uses gather
+ instructions to infer the stale vector register data.
+
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 b2e752e..189840d 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -735,7 +735,8 @@ enum gds_mitigations {
GDS_MITIGATION_HYPERVISOR,
};
-static enum gds_mitigations gds_mitigation __ro_after_init = GDS_MITIGATION_FULL;
+static enum gds_mitigations gds_mitigation __ro_after_init =
+ IS_ENABLED(CONFIG_MITIGATION_GDS) ? GDS_MITIGATION_FULL : GDS_MITIGATION_OFF;
static const char * const gds_strings[] = {
[GDS_MITIGATION_OFF] = "Vulnerable",
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: x86/bugs] " tip-bot2 for Breno Leitao
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-bot2 for Breno Leitao [this message]
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=172234891142.2215.16307852253027242186.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=bp@alien8.de \
--cc=jpoimboe@kernel.org \
--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®