From nobody Fri Dec 19 19:04:57 2025 Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2072.outbound.protection.outlook.com [40.107.100.72]) (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 BDD0A2040B0 for ; Wed, 8 Jan 2025 20:25:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.100.72 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736367949; cv=fail; b=lxvUs6WqO5iLiUBzSVatavDXxuJbGA263GQKyZI5JXI9DCxYTMxu4b6674g2JqMR+Fu8vkoa5Z2/iI9eTWF/bQ1EjtCrxFCNQD3PbQ0DwTSz7BjsHVyuAYkv38Mm4JPFDfk1Djgltz5y8XaWirY4bK2lOUwaYShfUdJrGpaOG9k= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736367949; c=relaxed/simple; bh=g9L7Zrhe2MhSeHwrJFTIRAs72qCwPTNFRYYm21+MZEE=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Vwnttayo4NKD3UXtjfrhQaNBrm4IZnlS0ZAvT4EVOamhljG2n2qnbYrsYrqRG2i63xzRJOr73IKi6GCopyIbSn5fRv+Fv9dGdKoiKEzJutsJLnTN8h5nfg+RXLeysVEr9WOXdVCfC38iRALRePgQ5/9JeKMm6sn4Bupo1i+7WgE= 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=jeS9nTWV; arc=fail smtp.client-ip=40.107.100.72 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="jeS9nTWV" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=IumMey5jqFZP5kCAtqTadwq8ML5aBOmUPLxP4Br7chJWctalMgwi++S4Z8LOHODQrO3ZYrXMDwJjKZ+EApmYuNnT2FgjKl8hQJFbqhseLO30vCKBocy3+b6lD0oR/skrHtqtUlfXVc14kzw4UZ/6BVlV3CbzORrsmgxahKLp/BPVd/dWYdceLCpO2G68zRCAXUOgJTTnHGb6H8ATsNPJqguzap34yMDNVfudZ0kiffapIbOV9khIt8E7b2KISCwxQvMMac84eDT41EgDbZcEMPvlqIJkbSM3kKcDwUluIoRRQd9OsgnmLhDln3ds6RZ07SsI0DKouSbbAEdjrdmFGA== 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=n7KdHr7YkHG1HQxcDomJJmLyoAHnMhX5okizTzwfE/w=; b=jQfqmXon8vJ2yZTJ0jPNDfP2gWqQbQ+Z29ZvBqEToaaHm8sG+VK9KnU6noTMAcAltaQSvKIRH9Z6eGjfKMaHqSvXebbAloiktGCR0xZor9OfZlF+0aK8fAYmhf7SADfAZXX6PmEc+dQS+fDgfzWtsrQgPnwpcB4kXWUAIXi2Wk5Qh9WUMSCtJQQ8E8DDUtHFTBWtZ/M5pHPVINL2zWKeKO+uBzaoxC0mRUpmhk9KjCU9hmkM6ALZU+r9daqkect93ygvmsDiidAsNM9P6a917FdyMvu0eTXH2JphzyOYlG+pkgevAZaJQF5BBjODwEgGhtVkCL+B5mIryCRllh+HMQ== 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=n7KdHr7YkHG1HQxcDomJJmLyoAHnMhX5okizTzwfE/w=; b=jeS9nTWVZrQRdFd9nRl6qSZYNClPuJojdL19Rb7v/h9w33r2XXDCLsydrxbeZ5lRHD9OB3vUXlvp0Ej8Qk55WA1vETRqeKpfSo109Gd3HxCxy69D/B/glh/O+x2A88iXbaVspPY4gJeMm4nraarNYTdc9daniMRNgv4w/5GQM5w= Received: from BL0PR02CA0075.namprd02.prod.outlook.com (2603:10b6:208:51::16) by SN7PR12MB7420.namprd12.prod.outlook.com (2603:10b6:806:2a7::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8335.12; Wed, 8 Jan 2025 20:25:43 +0000 Received: from DS3PEPF000099DB.namprd04.prod.outlook.com (2603:10b6:208:51:cafe::9e) by BL0PR02CA0075.outlook.office365.com (2603:10b6:208:51::16) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8272.22 via Frontend Transport; Wed, 8 Jan 2025 20:25:43 +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:43 +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:40 -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 09/35] x86/bugs: Restructure srbds mitigation Date: Wed, 8 Jan 2025 14:24:49 -0600 Message-ID: <20250108202515.385902-10-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: DS3PEPF000099DB:EE_|SN7PR12MB7420:EE_ X-MS-Office365-Filtering-Correlation-Id: 48b633b1-53da-405c-e96b-08dd3022a03f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|36860700013|376014|7416014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Ihx7ty8OCpY2BhRyfGHahtBTVpd7uZh4bNaPzRqyTQSfbvzg99IMZ0mtACC1?= =?us-ascii?Q?m+wxGsCvVnouvugLI4rX8zd5+Y4fXo1f42wL8zKLO0323LwjOQ9oe8ilg2q8?= =?us-ascii?Q?L6Li0S0WdsMP95n3ygWStMLofIRLRoicVgSlncsZl15+Pk4XeuFhIutJfHZL?= =?us-ascii?Q?ElygxD3r0b+Wb8Gjr2dfeP7XvhcepFgqbBXqaYomkE0O6WXQcnhb+ikLc+KU?= =?us-ascii?Q?gD7oHtHpfarI6xOQJbp+Dd07hR69MCCDWomZDFIhx4+Xbf+BBtocAReh9r4n?= =?us-ascii?Q?52a8L2uYfHj9Fufw8sKFKS8bZtHX+Q0y2IpsZws2Gh4hjg4fxCbDAIzs0aGh?= =?us-ascii?Q?DAu+o2fAmtJhgbZ9AKTYYFJzkhdyThiv1c1uAMSYJ2fOOJ7PQb1BM1H9Ygis?= =?us-ascii?Q?yOsZunmbNv9m+G9/3HBoNL2smQH0AfWNMlioC2fJLgvdoj4/XVVEg50O1z3a?= =?us-ascii?Q?KwKYGM4MNs7cjYwEeCsBQXTAGT9B5sLXEKQA4c9Flz5w+oVj6VSX8QR+/am5?= =?us-ascii?Q?bE3xY1wTsIQvHHe/ITRortYXXLG7wJgQ9iuOeodNJgaSOvdcCUlZbMt/IcNG?= =?us-ascii?Q?WRuVdlwJivvZ20s98JUFJOHN73NwUnEwiB3ixgPduMbHzctfLI/GQMStOXyO?= =?us-ascii?Q?iWGBMtr/WBamQsUkQFpeGem/8lGy9e6xjrXvU9v1adrdLi32kixBnR3f7Nny?= =?us-ascii?Q?Tdc0f7htYMBLoojOc5otX0223TGHrz2ceL2iISNGwLUjAn22LauQsZ5p/S1X?= =?us-ascii?Q?R9EZdzGlLpBE+lfmD+HVDalUP+Ozcdpv+mp9MUS5j5pr3UJhEYUE+jCwMtOE?= =?us-ascii?Q?L9rjWcMazxguyqP1AsSd2fnIuVtP06R+NKs+F9EElfndvoq+SSdQLMcP0vV8?= =?us-ascii?Q?zvM6kR6M1fKg6VD0XD4Xd62SxAJXe1OOYD6GOnqawUtaGGX6MoDHckpjw0J2?= =?us-ascii?Q?A9xhkz8h+6p1hhQHVezJx2glVpkYDvKF7z+brU3zUFA25c3jaNxTqtMcjR2c?= =?us-ascii?Q?nvdfgSFHpDs4HzCc7zv6bIygu5fC96bfzm1rY8EzLgh5eDaVjIgWN1uyVT+H?= =?us-ascii?Q?UeKYI3yi04vL9OqOejgPV+gZkDGcFNSaxk8yDL2RcNfVI9CFlTY1gydO478n?= =?us-ascii?Q?8681jUrld5HvdpMgS1JrGwPuwHsbeQXuZrHgxpdyf02KfzaKOZYNp2G/rqm8?= =?us-ascii?Q?blYvqGyK+6YihkyeEScPi1ugMn7C4pVIGm39YsOt3urg8tz+/fJIqsdIPQuX?= =?us-ascii?Q?6Dce3eThCSKpJRNvDeDxu18LJUrkLjIAj23QZqKz0L7gLqnBCPJ81+X36srF?= =?us-ascii?Q?Qz7t5qlUaNFXDCe2Vb8c9XegqkMiUADHLaMVZkoSB3VEOKO116GgjfgOX69O?= =?us-ascii?Q?JNj3ikXjNknUwwXVBk11J3kUHchMU6UoMM+D4CDm23fZx1FF9Q/tycR/GUeT?= =?us-ascii?Q?bG04m246ClmQcx2uxaLYo+FFXbyF8kz3mx7Q7QWcCXFlvkRgCiMM2KDKrdYX?= =?us-ascii?Q?ODQ9kDwSwpFQr0E=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)(82310400026)(36860700013)(376014)(7416014)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jan 2025 20:25:43.1105 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 48b633b1-53da-405c-e96b-08dd3022a03f 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: SN7PR12MB7420 Content-Type: text/plain; charset="utf-8" Restructure srbds to use select/apply functions to create consistent vulnerability handling. Define new AUTO mitigation for SRBDS. Signed-off-by: David Kaplan --- arch/x86/kernel/cpu/bugs.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 6c6a42b2dfe9..fedd693b2218 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -72,6 +72,7 @@ static void __init rfds_select_mitigation(void); static void __init rfds_update_mitigation(void); static void __init rfds_apply_mitigation(void); static void __init srbds_select_mitigation(void); +static void __init srbds_apply_mitigation(void); static void __init l1d_flush_select_mitigation(void); static void __init srso_select_mitigation(void); static void __init gds_select_mitigation(void); @@ -218,6 +219,7 @@ void __init cpu_select_mitigations(void) taa_apply_mitigation(); mmio_apply_mitigation(); rfds_apply_mitigation(); + srbds_apply_mitigation(); } =20 /* @@ -673,6 +675,7 @@ early_param("reg_file_data_sampling", rfds_parse_cmdlin= e); =20 enum srbds_mitigations { SRBDS_MITIGATION_OFF, + SRBDS_MITIGATION_AUTO, SRBDS_MITIGATION_UCODE_NEEDED, SRBDS_MITIGATION_FULL, SRBDS_MITIGATION_TSX_OFF, @@ -680,7 +683,7 @@ enum srbds_mitigations { }; =20 static enum srbds_mitigations srbds_mitigation __ro_after_init =3D - IS_ENABLED(CONFIG_MITIGATION_SRBDS) ? SRBDS_MITIGATION_FULL : SRBDS_MITIG= ATION_OFF; + IS_ENABLED(CONFIG_MITIGATION_SRBDS) ? SRBDS_MITIGATION_AUTO : SRBDS_MITIG= ATION_OFF; =20 static const char * const srbds_strings[] =3D { [SRBDS_MITIGATION_OFF] =3D "Vulnerable", @@ -734,6 +737,9 @@ static void __init srbds_select_mitigation(void) if (!boot_cpu_has_bug(X86_BUG_SRBDS)) return; =20 + if (srbds_mitigation =3D=3D SRBDS_MITIGATION_AUTO) + srbds_mitigation =3D SRBDS_MITIGATION_FULL; + /* * Check to see if this is one of the MDS_NO systems supporting TSX that * are only exposed to SRBDS when TSX is enabled or when CPU is affected @@ -748,6 +754,12 @@ static void __init srbds_select_mitigation(void) srbds_mitigation =3D SRBDS_MITIGATION_UCODE_NEEDED; else if (cpu_mitigations_off() || srbds_off) srbds_mitigation =3D SRBDS_MITIGATION_OFF; +} + +static void __init srbds_apply_mitigation(void) +{ + if (!boot_cpu_has_bug(X86_BUG_SRBDS)) + return; =20 update_srbds_msr(); pr_info("%s\n", srbds_strings[srbds_mitigation]); --=20 2.34.1