From: David Kaplan <david.kaplan@amd.com>
To: Thomas Gleixner <tglx@linutronix.de>,
Borislav Petkov <bp@alien8.de>,
Peter Zijlstra <peterz@infradead.org>,
Josh Poimboeuf <jpoimboe@kernel.org>,
Pawan Gupta <pawan.kumar.gupta@linux.intel.com>,
Ingo Molnar <mingo@redhat.com>,
Dave Hansen <dave.hansen@linux.intel.com>, <x86@kernel.org>,
"H . Peter Anvin" <hpa@zytor.com>
Cc: <linux-kernel@vger.kernel.org>
Subject: [PATCH v2 21/35] x86/bugs: Determine relevant vulnerabilities based on attack vector controls.
Date: Tue, 5 Nov 2024 15:54:41 -0600 [thread overview]
Message-ID: <20241105215455.359471-22-david.kaplan@amd.com> (raw)
In-Reply-To: <20241105215455.359471-1-david.kaplan@amd.com>
The function should_mitigate_vuln() defines which vulnerabilities should
be mitigated based on the selected attack vector controls. The
selections here are based on the individual characteristics of each
vulnerability.
Signed-off-by: David Kaplan <david.kaplan@amd.com>
---
arch/x86/kernel/cpu/bugs.c | 69 ++++++++++++++++++++++++++++++++++++++
1 file changed, 69 insertions(+)
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index 178415d8026a..6a5996d3b324 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -287,6 +287,75 @@ static void x86_amd_ssb_disable(void)
wrmsrl(MSR_AMD64_LS_CFG, msrval);
}
+/*
+ * Returns true if vulnerability should be mitigated based on the
+ * selected attack vector controls
+ *
+ * See Documentation/admin-guide/hw-vuln/attack_vector_controls.rst
+ */
+static bool __init should_mitigate_vuln(unsigned int bug)
+{
+ switch (bug) {
+ /*
+ * The only spectre_v1 mitigations in the kernel are related to
+ * SWAPGS protection on kernel entry. Therefore, protection is
+ * only required for the user->kernel attack vector.
+ */
+ case X86_BUG_SPECTRE_V1:
+ return cpu_mitigate_attack_vector(CPU_MITIGATE_USER_KERNEL);
+
+ /*
+ * Both spectre_v2 and srso may allow user->kernel or
+ * guest->host attacks through branch predictor manipulation.
+ */
+ case X86_BUG_SPECTRE_V2:
+ case X86_BUG_SRSO:
+ return cpu_mitigate_attack_vector(CPU_MITIGATE_USER_KERNEL) ||
+ cpu_mitigate_attack_vector(CPU_MITIGATE_GUEST_HOST);
+
+ /*
+ * spectre_v2_user refers to user->user or guest->guest branch
+ * predictor attacks only. Other indirect branch predictor attacks
+ * are covered by the spectre_v2 vulnerability.
+ */
+ case X86_BUG_SPECTRE_V2_USER:
+ return cpu_mitigate_attack_vector(CPU_MITIGATE_USER_USER) ||
+ cpu_mitigate_attack_vector(CPU_MITIGATE_GUEST_GUEST);
+
+ /* L1TF is only possible as a guest->host attack */
+ case X86_BUG_L1TF:
+ return cpu_mitigate_attack_vector(CPU_MITIGATE_GUEST_HOST);
+
+ /*
+ * All the vulnerabilities below allow potentially leaking data
+ * across address spaces. Therefore, mitigation is required for
+ * any of these 4 attack vectors.
+ */
+ case X86_BUG_MDS:
+ case X86_BUG_TAA:
+ case X86_BUG_MMIO_STALE_DATA:
+ case X86_BUG_RFDS:
+ case X86_BUG_SRBDS:
+ return cpu_mitigate_attack_vector(CPU_MITIGATE_USER_KERNEL) ||
+ cpu_mitigate_attack_vector(CPU_MITIGATE_GUEST_HOST) ||
+ cpu_mitigate_attack_vector(CPU_MITIGATE_USER_USER) ||
+ cpu_mitigate_attack_vector(CPU_MITIGATE_GUEST_GUEST);
+ /*
+ * GDS can potentially leak data across address spaces and
+ * threads. Mitigation is required under all attack vectors.
+ */
+ case X86_BUG_GDS:
+ return cpu_mitigate_attack_vector(CPU_MITIGATE_USER_KERNEL) ||
+ cpu_mitigate_attack_vector(CPU_MITIGATE_GUEST_HOST) ||
+ cpu_mitigate_attack_vector(CPU_MITIGATE_USER_USER) ||
+ cpu_mitigate_attack_vector(CPU_MITIGATE_GUEST_GUEST) ||
+ cpu_mitigate_attack_vector(CPU_MITIGATE_CROSS_THREAD);
+ default:
+ return false;
+ }
+}
+
+
/* Default mitigation for MDS-affected CPUs */
static enum mds_mitigations mds_mitigation __ro_after_init =
IS_ENABLED(CONFIG_MITIGATION_MDS) ? MDS_MITIGATION_AUTO : MDS_MITIGATION_OFF;
--
2.34.1
next prev parent reply other threads:[~2024-11-05 21:55 UTC|newest]
Thread overview: 78+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-05 21:54 [PATCH v2 00/35] x86/bugs: Attack vector controls David Kaplan
2024-11-05 21:54 ` [PATCH v2 01/35] x86/bugs: Add X86_BUG_SPECTRE_V2_USER David Kaplan
2024-11-05 21:54 ` [PATCH v2 02/35] x86/bugs: Relocate mds/taa/mmio/rfds defines David Kaplan
2024-11-05 21:54 ` [PATCH v2 03/35] x86/bugs: Add AUTO mitigations for mds/taa/mmio/rfds David Kaplan
2024-11-14 2:26 ` Pawan Gupta
2024-11-14 14:59 ` Kaplan, David
2024-11-14 17:14 ` Pawan Gupta
2024-11-14 17:17 ` Kaplan, David
2024-11-05 21:54 ` [PATCH v2 04/35] x86/bugs: Restructure mds mitigation David Kaplan
2024-11-14 3:03 ` Pawan Gupta
2024-11-14 15:01 ` Kaplan, David
2024-12-10 15:24 ` Borislav Petkov
2024-11-05 21:54 ` [PATCH v2 05/35] x86/bugs: Restructure taa mitigation David Kaplan
2024-11-14 4:43 ` Pawan Gupta
2024-11-14 15:08 ` Kaplan, David
2024-11-05 21:54 ` [PATCH v2 06/35] x86/bugs: Restructure mmio mitigation David Kaplan
2024-11-14 5:03 ` Pawan Gupta
2024-11-05 21:54 ` [PATCH v2 07/35] x86/bugs: Restructure rfds mitigation David Kaplan
2024-11-14 5:55 ` Pawan Gupta
2024-11-05 21:54 ` [PATCH v2 08/35] x86/bugs: Remove md_clear_*_mitigation() David Kaplan
2024-11-05 21:54 ` [PATCH v2 09/35] x86/bugs: Restructure srbds mitigation David Kaplan
2024-11-05 21:54 ` [PATCH v2 10/35] x86/bugs: Restructure gds mitigation David Kaplan
2024-11-14 6:21 ` Pawan Gupta
2024-11-05 21:54 ` [PATCH v2 11/35] x86/bugs: Restructure spectre_v1 mitigation David Kaplan
2024-11-14 6:57 ` Pawan Gupta
2024-11-14 15:36 ` Kaplan, David
2024-11-14 15:49 ` Kaplan, David
2024-11-14 16:19 ` Borislav Petkov
2024-11-14 16:45 ` Kaplan, David
2024-11-14 23:33 ` Josh Poimboeuf
2024-12-12 10:41 ` Borislav Petkov
2024-11-14 17:41 ` Pawan Gupta
2024-11-14 17:48 ` Kaplan, David
2024-11-05 21:54 ` [PATCH v2 12/35] x86/bugs: Restructure retbleed mitigation David Kaplan
2024-11-05 21:54 ` [PATCH v2 13/35] x86/bugs: Restructure spectre_v2_user mitigation David Kaplan
2024-11-06 18:56 ` kernel test robot
2024-11-05 21:54 ` [PATCH v2 14/35] x86/bugs: Restructure bhi mitigation David Kaplan
2024-11-05 21:54 ` [PATCH v2 15/35] x86/bugs: Restructure spectre_v2 mitigation David Kaplan
2024-11-05 21:54 ` [PATCH v2 16/35] x86/bugs: Restructure ssb mitigation David Kaplan
2024-11-05 21:54 ` [PATCH v2 17/35] x86/bugs: Restructure l1tf mitigation David Kaplan
2024-11-05 21:54 ` [PATCH v2 18/35] x86/bugs: Restructure srso mitigation David Kaplan
2025-01-02 14:55 ` Borislav Petkov
2024-11-05 21:54 ` [PATCH v2 19/35] Documentation/x86: Document the new attack vector controls David Kaplan
2024-11-06 10:39 ` Borislav Petkov
2024-11-06 14:49 ` Kaplan, David
2024-11-13 3:58 ` Manwaring, Derek
2024-11-13 14:15 ` Brendan Jackman
2024-11-13 15:05 ` Kaplan, David
2024-11-13 15:31 ` Brendan Jackman
2024-11-13 16:00 ` Kaplan, David
2024-11-13 16:19 ` Brendan Jackman
2024-11-14 9:32 ` Brendan Jackman
2024-11-22 16:15 ` Manwaring, Derek
2024-11-22 16:36 ` Brendan Jackman
2024-11-22 17:23 ` Kaplan, David
2024-11-20 0:14 ` Manwaring, Derek
2024-11-13 14:49 ` Kaplan, David
2024-11-13 14:15 ` Brendan Jackman
2024-11-13 15:42 ` Kaplan, David
2024-11-05 21:54 ` [PATCH v2 20/35] x86/bugs: Define attack vectors David Kaplan
2025-01-03 15:19 ` Borislav Petkov
2025-01-03 15:29 ` Kaplan, David
2025-01-03 15:51 ` Borislav Petkov
2024-11-05 21:54 ` David Kaplan [this message]
2024-11-05 21:54 ` [PATCH v2 22/35] x86/bugs: Add attack vector controls for mds David Kaplan
2024-11-05 21:54 ` [PATCH v2 23/35] x86/bugs: Add attack vector controls for taa David Kaplan
2024-11-05 21:54 ` [PATCH v2 24/35] x86/bugs: Add attack vector controls for mmio David Kaplan
2024-11-05 21:54 ` [PATCH v2 25/35] x86/bugs: Add attack vector controls for rfds David Kaplan
2024-11-05 21:54 ` [PATCH v2 26/35] x86/bugs: Add attack vector controls for srbds David Kaplan
2024-11-05 21:54 ` [PATCH v2 27/35] x86/bugs: Add attack vector controls for gds David Kaplan
2024-11-05 21:54 ` [PATCH v2 28/35] x86/bugs: Add attack vector controls for spectre_v1 David Kaplan
2024-11-05 21:54 ` [PATCH v2 29/35] x86/bugs: Add attack vector controls for retbleed David Kaplan
2024-11-05 21:54 ` [PATCH v2 30/35] x86/bugs: Add attack vector controls for spectre_v2_user David Kaplan
2024-11-05 21:54 ` [PATCH v2 31/35] x86/bugs: Add attack vector controls for bhi David Kaplan
2024-11-05 21:54 ` [PATCH v2 32/35] x86/bugs: Add attack vector controls for spectre_v2 David Kaplan
2024-11-05 21:54 ` [PATCH v2 33/35] x86/bugs: Add attack vector controls for l1tf David Kaplan
2024-11-05 21:54 ` [PATCH v2 34/35] x86/bugs: Add attack vector controls for srso David Kaplan
2024-11-05 21:54 ` [PATCH v2 35/35] x86/pti: Add attack vector controls for pti David Kaplan
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=20241105215455.359471-22-david.kaplan@amd.com \
--to=david.kaplan@amd.com \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=jpoimboe@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=pawan.kumar.gupta@linux.intel.com \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.