mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "tip-bot2 for David Kaplan" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: David Kaplan <david.kaplan@amd.com>,
	"Borislav Petkov (AMD)" <bp@alien8.de>,
	x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/bugs] x86/bugs: Define attack vectors relevant for each bug
Date: Fri, 11 Jul 2025 16:09:43 -0000	[thread overview]
Message-ID: <175225018389.406.12657174970653843515.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20250707183316.1349127-5-david.kaplan@amd.com>

The following commit has been merged into the x86/bugs branch of tip:

Commit-ID:     2d31d2874663cde2cab8c18bfb52ed8be6dfa958
Gitweb:        https://git.kernel.org/tip/2d31d2874663cde2cab8c18bfb52ed8be6dfa958
Author:        David Kaplan <david.kaplan@amd.com>
AuthorDate:    Mon, 07 Jul 2025 13:32:59 -05:00
Committer:     Borislav Petkov (AMD) <bp@alien8.de>
CommitterDate: Fri, 11 Jul 2025 17:56:40 +02:00

x86/bugs: Define attack vectors relevant for each bug

Add a function which 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>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/20250707183316.1349127-5-david.kaplan@amd.com
---
 arch/x86/kernel/cpu/bugs.c | 56 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 56 insertions(+)

diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index 88769c4..b083e7e 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -332,6 +332,62 @@ static void x86_amd_ssb_disable(void)
 #undef pr_fmt
 #define pr_fmt(fmt)	"MDS: " fmt
 
+/*
+ * 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 runtime-selected 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_attack_vector_mitigated(CPU_MITIGATE_USER_KERNEL);
+
+	case X86_BUG_SPECTRE_V2:
+	case X86_BUG_RETBLEED:
+	case X86_BUG_SRSO:
+	case X86_BUG_L1TF:
+	case X86_BUG_ITS:
+		return cpu_attack_vector_mitigated(CPU_MITIGATE_USER_KERNEL) ||
+		       cpu_attack_vector_mitigated(CPU_MITIGATE_GUEST_HOST);
+
+	case X86_BUG_SPECTRE_V2_USER:
+		return cpu_attack_vector_mitigated(CPU_MITIGATE_USER_USER) ||
+		       cpu_attack_vector_mitigated(CPU_MITIGATE_GUEST_GUEST);
+
+	/*
+	 * 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_attack_vector_mitigated(CPU_MITIGATE_USER_KERNEL) ||
+		       cpu_attack_vector_mitigated(CPU_MITIGATE_GUEST_HOST) ||
+		       cpu_attack_vector_mitigated(CPU_MITIGATE_USER_USER) ||
+		       cpu_attack_vector_mitigated(CPU_MITIGATE_GUEST_GUEST);
+
+	case X86_BUG_GDS:
+		return cpu_attack_vector_mitigated(CPU_MITIGATE_USER_KERNEL) ||
+		       cpu_attack_vector_mitigated(CPU_MITIGATE_GUEST_HOST) ||
+		       cpu_attack_vector_mitigated(CPU_MITIGATE_USER_USER) ||
+		       cpu_attack_vector_mitigated(CPU_MITIGATE_GUEST_GUEST) ||
+		       (smt_mitigations != SMT_MITIGATIONS_OFF);
+	default:
+		WARN(1, "Unknown bug %x\n", bug);
+		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;

  reply	other threads:[~2025-07-11 16:09 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-07-07 18:32 [PATCH v6 00/21] Attack vector controls (part 2) David Kaplan
2025-07-07 18:32 ` [PATCH v6 01/21] Documentation/x86: Document new attack vector controls David Kaplan
2025-07-09 15:57   ` [PATCH v7 01/22] " David Kaplan
2025-07-11 16:09     ` [tip: x86/bugs] " tip-bot2 for David Kaplan
2025-07-07 18:32 ` [PATCH v6 02/21] cpu: Define attack vectors David Kaplan
2025-07-10 10:42   ` Borislav Petkov
2025-07-10 14:02     ` Kaplan, David
2025-07-10 15:17       ` Borislav Petkov
2025-07-10 15:22         ` Kaplan, David
2025-07-11 16:09   ` [tip: x86/bugs] " tip-bot2 for David Kaplan
2025-07-07 18:32 ` [PATCH v6 03/21] x86/Kconfig: Add arch attack vector support David Kaplan
2025-07-11 16:09   ` [tip: x86/bugs] " tip-bot2 for David Kaplan
2025-07-07 18:32 ` [PATCH v6 04/21] x86/bugs: Define attack vectors relevant for each bug David Kaplan
2025-07-11 16:09   ` tip-bot2 for David Kaplan [this message]
2025-07-07 18:33 ` [PATCH v6 05/21] x86/bugs: Add attack vector controls for MDS David Kaplan
2025-07-11 16:09   ` [tip: x86/bugs] " tip-bot2 for David Kaplan
2025-07-07 18:33 ` [PATCH v6 06/21] x86/bugs: Add attack vector controls for TAA David Kaplan
2025-07-11 16:09   ` [tip: x86/bugs] " tip-bot2 for David Kaplan
2025-07-07 18:33 ` [PATCH v6 07/21] x86/bugs: Add attack vector controls for MMIO David Kaplan
2025-07-11 16:09   ` [tip: x86/bugs] " tip-bot2 for David Kaplan
2025-07-07 18:33 ` [PATCH v6 08/21] x86/bugs: Add attack vector controls for RFDS David Kaplan
2025-07-11 16:09   ` [tip: x86/bugs] " tip-bot2 for David Kaplan
2025-07-07 18:33 ` [PATCH v6 09/21] x86/bugs: Add attack vector controls for SRBDS David Kaplan
2025-07-11 16:09   ` [tip: x86/bugs] " tip-bot2 for David Kaplan
2025-07-07 18:33 ` [PATCH v6 10/21] x86/bugs: Add attack vector controls for GDS David Kaplan
2025-07-11 16:09   ` [tip: x86/bugs] " tip-bot2 for David Kaplan
2025-07-07 18:33 ` [PATCH v6 11/21] x86/bugs: Add attack vector controls for spectre_v1 David Kaplan
2025-07-11 16:09   ` [tip: x86/bugs] " tip-bot2 for David Kaplan
2025-07-07 18:33 ` [PATCH v6 12/21] x86/bugs: Add attack vector controls for retbleed David Kaplan
2025-07-11 16:09   ` [tip: x86/bugs] " tip-bot2 for David Kaplan
2025-07-07 18:33 ` [PATCH v6 13/21] x86/bugs: Add attack vector controls for spectre_v2_user David Kaplan
2025-07-11 16:09   ` [tip: x86/bugs] " tip-bot2 for David Kaplan
2025-07-07 18:33 ` [PATCH v6 14/21] x86/bugs: Add attack vector controls for BHI David Kaplan
2025-07-11 16:09   ` [tip: x86/bugs] " tip-bot2 for David Kaplan
2025-07-07 18:33 ` [PATCH v6 15/21] x86/bugs: Add attack vector controls for spectre_v2 David Kaplan
2025-07-11 16:09   ` [tip: x86/bugs] " tip-bot2 for David Kaplan
2025-07-07 18:33 ` [PATCH v6 16/21] x86/bugs: Add attack vector controls for L1TF David Kaplan
2025-07-11 16:09   ` [tip: x86/bugs] " tip-bot2 for David Kaplan
2025-07-07 18:33 ` [PATCH v6 17/21] x86/bugs: Add attack vector controls for SRSO David Kaplan
2025-07-11 16:09   ` [tip: x86/bugs] " tip-bot2 for David Kaplan
2025-07-07 18:33 ` [PATCH v6 18/21] x86/bugs: Add attack vector controls for ITS David Kaplan
2025-07-11 16:09   ` [tip: x86/bugs] " tip-bot2 for David Kaplan
2025-07-07 18:33 ` [PATCH v6 19/21] x86/pti: Add attack vector controls for PTI David Kaplan
2025-07-11 16:09   ` [tip: x86/bugs] " tip-bot2 for David Kaplan
2025-07-07 18:33 ` [PATCH v6 20/21] x86/bugs: Print enabled attack vectors David Kaplan
2025-07-11 16:09   ` [tip: x86/bugs] " tip-bot2 for David Kaplan
2025-07-07 18:33 ` [PATCH v6 21/21] cpu: Show attack vectors in sysfs David Kaplan
2025-07-09 18:47   ` Borislav Petkov
2025-07-09 15:58 ` [PATCH v7 19/22] x86/bugs: Add attack vector controls for TSA David Kaplan
2025-07-11 16:09   ` [tip: x86/bugs] " tip-bot2 for 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=175225018389.406.12657174970653843515.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=bp@alien8.de \
    --cc=david.kaplan@amd.com \
    --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®