From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2063.outbound.protection.outlook.com [40.107.94.63]) (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 DA6E9204C16 for ; Wed, 8 Jan 2025 20:25:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.94.63 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736367954; cv=fail; b=t3SiEv90lmEAV7I76HfYmRUU7n8rrx3b05YYjt1mpb1b0HEFH4jrx3o6WRABJUhhP9qG40TfgPwpgLPPwPrS8Vd4p1cz+vjTpdwVB+uLim3kV6OZEG0UhFyMZu81Q5XnL8igkpsroqgGGW8ROgBQdTQNo1RMJAQMak+wV6W5JVs= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736367954; c=relaxed/simple; bh=VnwAg9lEInBhiOCex/n35PSZZpsbopiEOPD5hj7rZQ8=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=SIrIZ/La1/Xs8h5CWDZE9GYsVtzms1DnrmVUSLmBa/ekQL5wZ+4wdlPhsxwakV7N1H/KFy3msPqRvKDD1m0gcMAgdUu/EVbfTJCuoBqJXWnpuEfBJVfXqEDepjF4E42NuhGwyHtZaBYVGo3fK3gzcN2ivth144X6u9Hji5ILxH4= 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=pWXFqEp0; arc=fail smtp.client-ip=40.107.94.63 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="pWXFqEp0" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=lXfAK3nQCtD4rRjJ99osqxjDvwKBZTTE6ZRaejePm+42Xipuu+UrAP7VV4PuAzvrkvOTl7qE2kLIk8fPaFWMOjhJCY6iIFDNwx+gXzy47DxQxVMGkt0kS9ugPThJ5UCqIcQ2lQwVu4Mem14Ze2qhPFd98MRVC4je5RaZZRcHrBt+qDEe2WvdVorJ5fNv/7jLAyXxRMlhdZXLRi1wbJNcX01YXMxzNRZ87Ogoh3hMvr6eHVFaozoyFptJX+u9ZCL4vAcBRxYyRwEERjBl4vUP6ydT5Yu2zGP2V1I/vep7JxIzgOad9cxgRX7dsYteIa0eZdmYN42XM6qKXgTf2xEbTg== 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=gOy7q0bz0jEeuZbSHqxzNEs8CqCB+lKKOgYFDB+v1io=; b=jmc2pE61s8mMrKOHLkf9f4Upcxb9QWqIZJbirGN0kR2BbcRfApJZmmT94L8Rq5oCnociajyIlai2ysoAUc4AoHFe6cGg7UicMDLlhms/7dGSZ8mh+xrm91O7KanzosIasl3AmhalcJozc2LlnbwNZOBITau/XIO1Gbe9hh+idqqaZe7wMP/0X3OaI4irlUHz/SpB/XNrfelNM2OeqEJnqbI3W6aMzSG5uNyd5VKEYL3n4EMAK8Yvq8Y/xWY99bFg9X9W05O74LoHIb+DeaC+G+Utz+R0a5Zi9Ku5KipFGJDardsCM6CGsQC5SD8G3T63nPYp2Cx+JQJu197/rsLWbA== 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=gOy7q0bz0jEeuZbSHqxzNEs8CqCB+lKKOgYFDB+v1io=; b=pWXFqEp0glVpg5rDlr4peXAEiS9BS9UNL+8AU+RGY6s0xD/TRx/gmOwg09Xms/FOT+oK/+S8X4Qz7dqH0JEoWRzaUGGI7DrPG8/hZZrlK3AIgl5vKR3Hhv750M5snU72rXgdviHhSLmadgRj9GsnVnoVTfaSIYfez287r8gxx3s= Received: from BL0PR02CA0102.namprd02.prod.outlook.com (2603:10b6:208:51::43) by CH2PR12MB4133.namprd12.prod.outlook.com (2603:10b6:610:7a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8314.17; Wed, 8 Jan 2025 20:25:46 +0000 Received: from DS3PEPF000099DB.namprd04.prod.outlook.com (2603:10b6:208:51:cafe::e3) by BL0PR02CA0102.outlook.office365.com (2603:10b6:208:51::43) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8093.22 via Frontend Transport; Wed, 8 Jan 2025 20:25:46 +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 DS3PEPF000099DB.mail.protection.outlook.com (10.167.17.197) 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:46 +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:44 -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 16/35] x86/bugs: Restructure ssb mitigation Date: Wed, 8 Jan 2025 14:24:56 -0600 Message-ID: <20250108202515.385902-17-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: 8bit Content-Type: text/plain 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: DS3PEPF000099DB:EE_|CH2PR12MB4133:EE_ X-MS-Office365-Filtering-Correlation-Id: 2408e37f-8912-408a-e7c0-08dd3022a223 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|82310400026|1800799024|376014|7416014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?tPNUSUfLw/pMo2NUZktAnO9geKUjvTyyib5/2MBaNkIk1zwhPfX9NoECTYuE?= =?us-ascii?Q?jgkbr9PT8KMNEHHqYQC1GBOnl+W0BAGRzFgu+yN5ZDCUhyQXNGKdSbFp5xbr?= =?us-ascii?Q?II9LyHwvQrXzd9Zc2nFHrW8coipU5WbUUnC5H7UvbjMvk2f+/jagVTCgqOTn?= =?us-ascii?Q?dlfd43wWYd5aX7EAOpzn5vHY/LK2MIfTiCv7rSaj22sg4T+bQ0Ks3xBw03zs?= =?us-ascii?Q?iBBn1U2c3TIr5SWuN89tjUrD1xhsU23vubhD7DwBzegRr5U2JwKzEIigVF+W?= =?us-ascii?Q?NukELk3pGDzNrE6LP4BiWfGLmR/zgCZYefs0A+yqvJ25MPL9voZYev0B+ilM?= =?us-ascii?Q?7gqvT+PAI0JsrAWwx5IIPhg5hQFAqVGQXFdwC2i6ZMOZXBohh+gjyLOh3ZG5?= =?us-ascii?Q?n9LxeZfpbS4/ZOM3LbDEJcCVEEpj84O9gQX+CTgPhBeux0uOB+giF+J1KFjD?= =?us-ascii?Q?QTTHbNxfy9/XFX8SB5udC24ZykAdX+xSlM5QagpGkSlVvn4/i/TtINfzN8eX?= =?us-ascii?Q?jfAf4IM0sHu9bSVjLH/UdWww5xJoQmaSgu/DUsF8hj+1RKepRBYgzkg6HZJU?= =?us-ascii?Q?mKLcLlaLblBKccWytimCRmq3X3DFIzUbbilDsy9MohEK4NyiLCX98HcIvmU7?= =?us-ascii?Q?XsLBURx+MNr3Iy0OzjsBDY2qPv98Z2lkD0wUcQK/mvX5MlCCgFIDHh+7Y9w6?= =?us-ascii?Q?q94cPmG5AYPUjNxNxuVA1+oKsP0YbLm27PRTcT9ZKys+7hNVJomn/vGearW/?= =?us-ascii?Q?rhPKxLazC69tXjWwQNauMb8jtKOSBj4uZWpP2n+5Iof1qZI7QFottJk2iZIk?= =?us-ascii?Q?m4KIzwToxdJCeY5HTR4H7785ZQWlwlqOgOF46TBuLOuM0oL3s2kELgCBZLBh?= =?us-ascii?Q?O1Z7iDkgHFckiDdXkxzvBLZjFS6030uNVbTSZk3Z8n7JO27X8ljq4evag4k3?= =?us-ascii?Q?0pL9gM1oJ/9otHpD5twA4J+yJk/itJWu8B33QHrdbXaliOL8LvgqM1iUtUX1?= =?us-ascii?Q?8+yGWj23h6hHRG4xSwzBw9oMCoBFmovFXZN+EAHJ1sUERnxEiB5KU0vqLRu4?= =?us-ascii?Q?b8f62sAvLfFo6F7O6+aG2EHrI3VDh+wBcUIUAW0Z39F0i4Z3DUB64xwIKONc?= =?us-ascii?Q?y7+QDIWBG99ivEPwuKkNQADPk2pT8dKqqSTaGy2c6XgDZK1MimcDfAf39Aht?= =?us-ascii?Q?7L9pLicIXRGFeDWtt+D4TmpBqpyuJr3huu4D86Zhx2m49rS4gQrDqZgbsUUV?= =?us-ascii?Q?KMjLDdYt1+aZtDY9myDKJM0hdwvZQDe0MNG4OZmyhhzePaaHqgUtoY2JQIsU?= =?us-ascii?Q?k20y5oITRkF8BBB6U5Xp/Tgag/lfg4gki5OaQlYq1L+1Zm1hvkx0JmJuYM1N?= =?us-ascii?Q?ygdJEApp06jdI6C7hYQ0bDUNFaworpPc5nDE/sTqIo0vM8uWhUaf51BdYMA8?= =?us-ascii?Q?lbb5drEsZ3M2PBkwUHPKE4mhvvPjL0Hrcs1Nb7IuyGgDfLW+kMTiF41xJnKt?= =?us-ascii?Q?NMf+D2X9s6CIbCs=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)(36860700013)(82310400026)(1800799024)(376014)(7416014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jan 2025 20:25:46.2668 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2408e37f-8912-408a-e7c0-08dd3022a223 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: DS3PEPF000099DB.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4133 Restructure ssb to use select/apply functions to create consistent vulnerability handling. Remove __ssb_select_mitigation() and split the functionality between the select/apply functions. Signed-off-by: David Kaplan --- arch/x86/kernel/cpu/bugs.c | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 440fe9ee1c63..b07726a8dd3b 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -65,6 +65,7 @@ static void __init spectre_v2_user_select_mitigation(void); static void __init spectre_v2_user_update_mitigation(void); static void __init spectre_v2_user_apply_mitigation(void); static void __init ssb_select_mitigation(void); +static void __init ssb_apply_mitigation(void); static void __init l1tf_select_mitigation(void); static void __init mds_select_mitigation(void); static void __init mds_update_mitigation(void); @@ -223,6 +224,7 @@ void __init cpu_select_mitigations(void) spectre_v2_apply_mitigation(); retbleed_apply_mitigation(); spectre_v2_user_apply_mitigation(); + ssb_apply_mitigation(); mds_apply_mitigation(); taa_apply_mitigation(); mmio_apply_mitigation(); @@ -2215,19 +2217,18 @@ static enum ssb_mitigation_cmd __init ssb_parse_cmdline(void) return cmd; } -static enum ssb_mitigation __init __ssb_select_mitigation(void) +static void ssb_select_mitigation(void) { - enum ssb_mitigation mode = SPEC_STORE_BYPASS_NONE; enum ssb_mitigation_cmd cmd; if (!boot_cpu_has(X86_FEATURE_SSBD)) - return mode; + goto out; cmd = ssb_parse_cmdline(); if (!boot_cpu_has_bug(X86_BUG_SPEC_STORE_BYPASS) && (cmd == SPEC_STORE_BYPASS_CMD_NONE || cmd == SPEC_STORE_BYPASS_CMD_AUTO)) - return mode; + return; switch (cmd) { case SPEC_STORE_BYPASS_CMD_SECCOMP: @@ -2236,28 +2237,35 @@ static enum ssb_mitigation __init __ssb_select_mitigation(void) * enabled. */ if (IS_ENABLED(CONFIG_SECCOMP)) - mode = SPEC_STORE_BYPASS_SECCOMP; + ssb_mode = SPEC_STORE_BYPASS_SECCOMP; else - mode = SPEC_STORE_BYPASS_PRCTL; + ssb_mode = SPEC_STORE_BYPASS_PRCTL; break; case SPEC_STORE_BYPASS_CMD_ON: - mode = SPEC_STORE_BYPASS_DISABLE; + ssb_mode = SPEC_STORE_BYPASS_DISABLE; break; case SPEC_STORE_BYPASS_CMD_AUTO: case SPEC_STORE_BYPASS_CMD_PRCTL: - mode = SPEC_STORE_BYPASS_PRCTL; + ssb_mode = SPEC_STORE_BYPASS_PRCTL; break; case SPEC_STORE_BYPASS_CMD_NONE: break; } +out: + if (boot_cpu_has_bug(X86_BUG_SPEC_STORE_BYPASS)) + pr_info("%s\n", ssb_strings[ssb_mode]); +} + +static void __init ssb_apply_mitigation(void) +{ /* * We have three CPU feature flags that are in play here: * - X86_BUG_SPEC_STORE_BYPASS - CPU is susceptible. * - X86_FEATURE_SSBD - CPU is able to turn off speculative store bypass * - X86_FEATURE_SPEC_STORE_BYPASS_DISABLE - engage the mitigation */ - if (mode == SPEC_STORE_BYPASS_DISABLE) { + if (ssb_mode == SPEC_STORE_BYPASS_DISABLE) { setup_force_cpu_cap(X86_FEATURE_SPEC_STORE_BYPASS_DISABLE); /* * Intel uses the SPEC CTRL MSR Bit(2) for this, while AMD may @@ -2272,15 +2280,6 @@ static enum ssb_mitigation __init __ssb_select_mitigation(void) } } - return mode; -} - -static void ssb_select_mitigation(void) -{ - ssb_mode = __ssb_select_mitigation(); - - if (boot_cpu_has_bug(X86_BUG_SPEC_STORE_BYPASS)) - pr_info("%s\n", ssb_strings[ssb_mode]); } #undef pr_fmt -- 2.34.1