From nobody Fri Dec 19 19:04:48 2025 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2081.outbound.protection.outlook.com [40.107.212.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CC119205519 for ; Wed, 8 Jan 2025 20:25:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.212.81 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736367956; cv=fail; b=sBYItL516Y9X6ap8AeR8E3CEGdxIAI9ehzyPTixFD2auWBSMBi4MW1MKEOeyoPsuRWzGmTktc7N1Yyz9yGWHu9pBIudYk/+qyz5teRLP3FK78jMC0M4mr6jsKeSOh0oawjWQc3L7zQ0NrL9Uq6oVGsmAILRlw/MP6ri1EpBmCtU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736367956; c=relaxed/simple; bh=JlI+6Z3An3b2yJXiqdG+JbtP7FpKPwdPGrASH0YPHt8=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=rUYAyDUN6nkaFKe7hNoI/JlKGtuEx4c+GM+/zl2F4fQ9m1J84EO2j0EojvdZ120q4rTxUGgbibCDMO9vbHwpaYSMGUPxVXaqxfBKYGqPUiwDqt0VDY9J7E9NpdcsOzWXttK8iaPwbRgE6XrRpPGPNL7HAk5zbscIwK5xJp61fkk= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=W5PO5WHZ; arc=fail smtp.client-ip=40.107.212.81 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="W5PO5WHZ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=HCHY9UCl/ZFMBZxhaASsF65+C13gfIdODEcz+ZVI0NPYzwe+/CAltSsDFlIv06T7CuEloyKNTSKWDvPcJBHCoAskvpUqQ7SuxGgQPTZONDJjPqYuRu7t4tTu9i8KOwvxLzI99/QkRBwN6lWvEFQ2S2Qve07NLPZjbkkbhSXrjiw+1LGBniwldOHPR20v1VZgbR0V47R/cTyze6Xps0Yg9La6iUwje0MSqPQkttdC/GvuzWPT3Kz0Nwa4sjx0N+R/tqXUq3umGUf62U9jKe1Mw1lMQdWrLnJTy7giM0W/QSP8uRLDuvcFT53PX2Z36IAhB4+oAjom1iBp+ZMpwRMpvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=tmbWFoPDAHbLvJG5J8w8lBxJoecMHVyNuiGdycjNmZs=; b=M6c4pZleBNne3DcpaI9HoqOtx0ukcctgtjC8TqhbCXX0XNoEhBdXjvyvmceT38DhITe9O9bGurRe+tgApvMpPUdojdH41ABCouCTIisO3C/aKXjy/N4e/FeRvp6b1fQMGYJQav2VBl5OWLgj3cLLJDeObWzFuJUXYhOucKalM6FeSVi83V2EjJrLgCfU/cFV6kl9BKD7YO1R606LzrfxMPhCrIDy2kTyyYlnPwpKJJfUH3Yhlw6fUx+dm7tH5XPqCM3vMldlF75aQdZyKjmiKKZG96IUA32eZ1lQqde0awp6CItw0HbxeQlPGL99fHBJcQCb+wjiQ5sifEGrTBXdjQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=linutronix.de smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tmbWFoPDAHbLvJG5J8w8lBxJoecMHVyNuiGdycjNmZs=; b=W5PO5WHZW+iBB2gWHcbC3KM3X4vf+xMb51zc7hwvVSnKJtyu6CUpqzBZB4j4BI2qBrUsfD0842tI+gYvFPXaEXocHKuvvKeolHbspCegllaJO+99/U5fy0Q63aBw6YdF2jeoDjffm6U7o25VOQ6nCtvDkKWZr4642hE31Cg2YIA= Received: from SA9PR11CA0030.namprd11.prod.outlook.com (2603:10b6:806:6e::35) by MW4PR12MB6850.namprd12.prod.outlook.com (2603:10b6:303:1ed::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8335.10; Wed, 8 Jan 2025 20:25:48 +0000 Received: from DS3PEPF000099E2.namprd04.prod.outlook.com (2603:10b6:806:6e:cafe::60) by SA9PR11CA0030.outlook.office365.com (2603:10b6:806:6e::35) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8335.11 via Frontend Transport; Wed, 8 Jan 2025 20:25:47 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DS3PEPF000099E2.mail.protection.outlook.com (10.167.17.201) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8335.7 via Frontend Transport; Wed, 8 Jan 2025 20:25:47 +0000 Received: from tiny.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Wed, 8 Jan 2025 14:25:46 -0600 From: David Kaplan To: Thomas Gleixner , Borislav Petkov , Peter Zijlstra , Josh Poimboeuf , Pawan Gupta , Ingo Molnar , Dave Hansen , , "H . Peter Anvin" CC: Subject: [PATCH v3 20/35] x86/bugs: Define attack vectors Date: Wed, 8 Jan 2025 14:25:00 -0600 Message-ID: <20250108202515.385902-21-david.kaplan@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250108202515.385902-1-david.kaplan@amd.com> References: <20250108202515.385902-1-david.kaplan@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS3PEPF000099E2:EE_|MW4PR12MB6850:EE_ X-MS-Office365-Filtering-Correlation-Id: 43fcc973-7f74-4bff-f5ec-08dd3022a303 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|1800799024|376014|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?ZvQDxf3W070zffBKhLECeuiNzTPuQgJi8z+W05bEqX4rs0mNh5JNCrKa7e5c?= =?us-ascii?Q?JC1Cs1LH8A81gb4dbss43Seehw8Mg0YC0ylOq8S1WrkA0Jnp9/U0yY3FLKvJ?= =?us-ascii?Q?IKdodN1fp5Nmm41YAmyoSMPn6OFYaMdj3BLuFm2pedmXsOpdOLHZt5tInweW?= =?us-ascii?Q?pR4+/OHKycJkGcgmdW5GBzjCNB3Y3okaRp1bGaSXgc67eYqoZu4axQMngbmB?= =?us-ascii?Q?mIvuvsEGIKU4YH+Uz+FotzZDgmLcwvkd3P2SA5EqUaBUxYzN5hbP038ALaDV?= =?us-ascii?Q?kqWXq3YfbVUzxLjVPCkiNGXyXyRyKvsaOdzooIqWir3SdU9R9612vmEiCfi1?= =?us-ascii?Q?q/ESKhbtBPCfHliLuDrTzvI0yYtuIWYkPgwhFdG+KPPwVoRVPsjNfOcCspAn?= =?us-ascii?Q?SzUq99+FlhTJtE23S1SXBq1Ksf/NQgGPL/6weZN3+pQpt8KsyH1Opcd9EWRO?= =?us-ascii?Q?rhcmzKs2qUobNVcngUyVCMaf0rRn41A33Vy48lN5HIiH/eiL+FRyweDaluTt?= =?us-ascii?Q?h62ZzoMvQtaY4pAP+fVXR2/AUQHU4XRYZR0lG34LiTbCntkNFFkrvLKO91gD?= =?us-ascii?Q?ygHKEstIljCvAHMktOq0BY+wuo//uW4GFuc6TtnhpwnMZWNEBlVVBrf8d+Pb?= =?us-ascii?Q?oMkgAXwhLFdNWRUMgqp/FddB95eiJ45AOVtYtBmejEZ1b966wIYOEAYS08Ci?= =?us-ascii?Q?hri7RzlGOaz4qfA42dhlVoK0I/gBjIMS5SfP9U21wHCVQkKQgbDnRkea/2Oe?= =?us-ascii?Q?ayZNAMWcUrYaBXrVc5gRkipMYWfJBJjIgSrOujcYm6pnLbSdKl5GD+TxhtVB?= =?us-ascii?Q?nAF/T9ScTUTx5DlMsxY0Fmo9dI6lnABaFlL+JnJS34cGqwT6H+IoK7v72sRK?= =?us-ascii?Q?+S+XlXgnBHGOEb41nBBJJ0VqQrectz+RnO64qSaPfg8/SDn4SoKj6qcjwkk4?= =?us-ascii?Q?8jGhmGqiNQwESwL03mxuoA0Mi44mhq0w/nuUBM0zecx885i+1+9/E4Yp5l3c?= =?us-ascii?Q?lGvCtlMg6clUaTpH3azW4XDEOrPySB+ZvQQW5WYhogz0swN0RtUI9+fdwYxh?= =?us-ascii?Q?K05JF/v/YwyMJwEBk2y0IoCB75YUJh0Obe1WDlKWefn/BESGR0f0V5m5/jKs?= =?us-ascii?Q?cGxkuuTXLJQQ30OSsDIJO1L3lSDZPqRSSKl5tOiIaKh2EU4A64lJd8TOH4/3?= =?us-ascii?Q?2FfhfGUjWowgw6r/ahzWlLONuLwchh78QNE6P5KFfuX6gJe+jSqPNbJkYsNF?= =?us-ascii?Q?aOKFvENeUHKn0buOSnOmVEDMMOg4Q4SbfJ4ZC7JC7d53XbM0LDn2XmDfXCGz?= =?us-ascii?Q?YBuE4vSS4d+JEGksGXGjs+BPsslhKLcG9+Q9aSuAJ1i9gxa6VaOJ3ebbyhkE?= =?us-ascii?Q?nlU+xZcgFPjJCRn5tsLnmWVF9OaUvs5bHLwpn7urs9eh3BAyNxtDAW0AqQd9?= =?us-ascii?Q?b1MTiYIVQ9HI3M0yw/+chNzGWynxgbKmjUu5A5lpnRO94q4WHDwMTA=3D=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(7416014)(1800799024)(376014)(36860700013)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jan 2025 20:25:47.7351 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 43fcc973-7f74-4bff-f5ec-08dd3022a303 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS3PEPF000099E2.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB6850 Content-Type: text/plain; charset="utf-8" Define 5 new attack vectors that are used for controlling CPU speculation mitigations and associated command line options. Each attack vector may be enabled or disabled, which affects the CPU mitigations enabled. The default settings for these attack vectors are consistent with existing kernel defaults, other than the automatic disabling of VM-based attack vectors if KVM support is not present. Signed-off-by: David Kaplan --- arch/x86/include/asm/bugs.h | 11 +++++++ arch/x86/kernel/cpu/bugs.c | 60 +++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+) diff --git a/arch/x86/include/asm/bugs.h b/arch/x86/include/asm/bugs.h index f25ca2d709d4..354d04a964f0 100644 --- a/arch/x86/include/asm/bugs.h +++ b/arch/x86/include/asm/bugs.h @@ -12,4 +12,15 @@ static inline int ppro_with_ram_bug(void) { return 0; } =20 extern void cpu_bugs_smt_update(void); =20 +enum cpu_attack_vectors { + CPU_MITIGATE_USER_KERNEL, + CPU_MITIGATE_USER_USER, + CPU_MITIGATE_GUEST_HOST, + CPU_MITIGATE_GUEST_GUEST, + CPU_MITIGATE_CROSS_THREAD, + NR_CPU_ATTACK_VECTORS, +}; + +bool cpu_mitigate_attack_vector(enum cpu_attack_vectors v); + #endif /* _ASM_X86_BUGS_H */ diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index aee2945bdef9..88eba8e4c7fb 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -169,6 +169,66 @@ DEFINE_STATIC_KEY_FALSE(switch_mm_cond_l1d_flush); DEFINE_STATIC_KEY_FALSE(mmio_stale_data_clear); EXPORT_SYMBOL_GPL(mmio_stale_data_clear); =20 +#ifdef CONFIG_CPU_MITIGATIONS +/* + * All except the cross-thread attack vector are mitigated by default. + * Cross-thread mitigation often requires disabling SMT which is too expen= sive + * to be enabled by default. + * + * Guest-to-Host and Guest-to-Guest vectors are only needed if KVM support= is + * present. + */ +static bool cpu_mitigate_attack_vectors[NR_CPU_ATTACK_VECTORS] __ro_after_= init =3D { + [CPU_MITIGATE_USER_KERNEL] =3D true, + [CPU_MITIGATE_USER_USER] =3D true, + [CPU_MITIGATE_GUEST_HOST] =3D IS_ENABLED(CONFIG_KVM), + [CPU_MITIGATE_GUEST_GUEST] =3D IS_ENABLED(CONFIG_KVM), + [CPU_MITIGATE_CROSS_THREAD] =3D false +}; + +#define DEFINE_ATTACK_VECTOR(opt, v) \ + static int __init v##_parse_cmdline(char *arg) \ +{ \ + if (!strcmp(arg, "off")) \ + cpu_mitigate_attack_vectors[v] =3D false; \ + else if (!strcmp(arg, "on")) \ + cpu_mitigate_attack_vectors[v] =3D true; \ + else \ + pr_warn("Unsupported " opt "=3D%s\n", arg); \ + return 0; \ +} \ +early_param(opt, v##_parse_cmdline) + +bool cpu_mitigate_attack_vector(enum cpu_attack_vectors v) +{ + if (v < NR_CPU_ATTACK_VECTORS) + return cpu_mitigate_attack_vectors[v]; + + WARN_ON_ONCE(v >=3D NR_CPU_ATTACK_VECTORS); + return false; +} + +#else +#define DEFINE_ATTACK_VECTOR(opt, v) \ +static int __init v##_parse_cmdline(char *arg) \ +{ \ + pr_crit("Kernel compiled without mitigations, ignoring %s; system may sti= ll be vulnerable\n", opt); \ + return 0; \ +} \ +early_param(opt, v##_parse_cmdline) + +bool cpu_mitigate_attack_vector(enum cpu_attack_vectors v) +{ + return false; +} +#endif + +DEFINE_ATTACK_VECTOR("mitigate_user_kernel", CPU_MITIGATE_USER_KERNEL); +DEFINE_ATTACK_VECTOR("mitigate_user_user", CPU_MITIGATE_USER_USER); +DEFINE_ATTACK_VECTOR("mitigate_guest_host", CPU_MITIGATE_GUEST_HOST); +DEFINE_ATTACK_VECTOR("mitigate_guest_guest", CPU_MITIGATE_GUEST_GUEST); +DEFINE_ATTACK_VECTOR("mitigate_cross_thread", CPU_MITIGATE_CROSS_THREAD); + void __init cpu_select_mitigations(void) { /* --=20 2.34.1