From nobody Fri Dec 19 19:04:56 2025 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2066.outbound.protection.outlook.com [40.107.96.66]) (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 49B5C204C04 for ; Wed, 8 Jan 2025 20:25:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.96.66 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736367952; cv=fail; b=uQDq7VtmsgSYkm82J+G1jRIFLAt42Uj4jpNCNH5gqI62SDKBlLfek60e7aAvWmHFLdgvgM6gzPbcvugdvKzU7tY49T5V2Y2kndphJ6WtiPrC82DEL8cbeEwJI8/NUxjs4cHuNyJVOUHnpkeAVSrVM6ZaxkBIoPCwpSlNUPf6Eoc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736367952; c=relaxed/simple; bh=KZFjJIhL8cN7IGVQezOROdYOD+SJaAO1xYNzHX3M89U=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=mIFAAEM0DHDA5mLMwY+vOicPXEVS63+jI0Gd6KmxOekPsc9TrWqrUDZgRFGAss4lfkB1dKbEkWqsB7WRQ3/UN4JOWOyBR9ITvHNhQsrQpRldcZZs6XF8uKbb8UuPxVsnwHDWMmypL8fmIOhoCEGlFL4Gf08CjrEEl0Y7sGRlq2E= 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=HfLO4X6w; arc=fail smtp.client-ip=40.107.96.66 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="HfLO4X6w" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Lh4g6ejFnbfxFiVcxHt9FHrib+G3VIVxZJcVH/UXJeUxTZNjGkzSBhlUQreW7IzoN5sEpgIQTrL0m95O98s8yxDSnI7l4jC9r4OCR5pQaxPx9kFPfYFf4bjU8VRCaYoPPLd82lVMfobURsqkv5Dk9BUITNlsK+WAzxZqEwVKVkD2xkjJxwZYsyPt0mLopgGFBiPBxQR1uDiPs80oPPDNnQ/zmBHKzw5pxsdJtyrzMd8fGP7Da/vFYvHiDLvSKzC+9xbhBQD1fTvFHtlFoV3EhNfLBMlzj8cwSliEJH798Hy18ENbKTFtIzVNWNd1apsZU3Mx5xfAFznCzkGGmVY3Zg== 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=c/LNyxve6EFJSCS+CDO+YXvY0cmpYC6enRCfNki1ffg=; b=iOrCY24p6uSFQZuTzAl2lvzb9E4W9KRLAoHk+/v44nA7Wugu9bGQ37D74A6ccWYSZSApTiWQizoPv3JskIR3KhVRIX5MaQE9bvqZJQt8yLnK0p8sbWiZd16Sj8zZBPQr9QS6LRgvtxqH3EnOerDk4xs/2qGaaJCHMzVp6pkni5h5uHbGtMTcAhNkzSrqu/Zwe4zcTTWuLF9/pBTFgxE96W0tQpGKAMpJJqi83WUNCWCZwihMIfDjxl3A0RAiyzoDScDB0j6qcw7n1s5vXNZWmXSieA5NtWfzbEzBGRfaIqVIv8w9ll8DFP7swtltFm6xbIepXLSrPHeZXEfoLgWCdQ== 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=c/LNyxve6EFJSCS+CDO+YXvY0cmpYC6enRCfNki1ffg=; b=HfLO4X6w5TZs3d8iGvtu/v2VfpE7iofzB3iz6q/HilgJMBuBLKOujadIaSKZtBM6g59iuNfw1pqjgrf30PK71RmjXsDrJaFFSV1WVvrHb8mFS4IzaoDxGC/AVB6rYXO8v3zP9GMz7hgmAdhXzeXM4eu2MNa3o3FpK+gZtUfIO9o= Received: from SA9PR11CA0013.namprd11.prod.outlook.com (2603:10b6:806:6e::18) by CH3PR12MB8535.namprd12.prod.outlook.com (2603:10b6:610:160::19) 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:44 +0000 Received: from DS3PEPF000099E2.namprd04.prod.outlook.com (2603:10b6:806:6e:cafe::d1) by SA9PR11CA0013.outlook.office365.com (2603:10b6:806:6e::18) 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:44 +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: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 10/35] x86/bugs: Restructure gds mitigation Date: Wed, 8 Jan 2025 14:24:50 -0600 Message-ID: <20250108202515.385902-11-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_|CH3PR12MB8535:EE_ X-MS-Office365-Filtering-Correlation-Id: ae7b9242-25a8-483f-10dc-08dd3022a0b7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|36860700013|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?X8jEFiA4EGMAIJbONj2Tava+TYLXvf5cSX49XSKIEUIGooViKT8X3mhYe82O?= =?us-ascii?Q?J33M2mm16auq9un4zTcMSg+eRag/yCkbvrhViMeB3gMf8nZhw2iPvPTQc8EZ?= =?us-ascii?Q?hbkqsaV6Z8FNVtvsTqPrjvyXZR57SigyrYgnEUPW0Jr9CrXRerYc85p+/6yQ?= =?us-ascii?Q?PovcbmCT8/ScGlgUfpUpc16sx2Felkh9nQ9uKoBlIXPFgVIRTH+MhjaVK8kB?= =?us-ascii?Q?koCGJgNlSrZ437BejSuyhAQeuVZeFVxFJyUVCFhWcE809/s3T7C4o79e5FMV?= =?us-ascii?Q?ed9BlW3MhLFsxKjqQ4tdNAaAJDjwc2ypgCsTp7+JbPpWgFDaiHU8dQ1CnwIA?= =?us-ascii?Q?NYyu00rrNRnA6PNk+vdZ6vnss2TrbEWcxRCQbDXX2oXpGnIUWXSX9QFtlqph?= =?us-ascii?Q?fVZs5lY+7hvznzdaFiNr+4O+oFmvGou+Bw9SMP5tcd76XeA7RehY0x+A44Yv?= =?us-ascii?Q?O/InNX9YqI+8sK0A8y0N5G0ThOuUswQqu5NKeaQuLu/XEE8BqGSjkt7CrCGs?= =?us-ascii?Q?QhlUcuhi7A0moJhjFqOeqYc3g6if/DYa+k3cwCfU8c1/7AHhDxkI+n0R7Zm8?= =?us-ascii?Q?wbqcvQUfkB9CocqAKMBUkimsTGcH1iDZAQZOeuk0yVz3xIGnVlLYCsKRTuhM?= =?us-ascii?Q?lnuzHThD30Y/Ibjsl8lazNwUFKs12HQdNr2W5wbnlu3UneDCaz/AaezcQAkB?= =?us-ascii?Q?aphpipvB8MiQjeRFzCv6V9SYOdITr3X9zww0b2zMidb5Gt98yWLb13HcTtJF?= =?us-ascii?Q?SCgv53y34msyHsd84tmAwy8fL05oQQ/muL62dU+Mkt5ZH13XQ2MS4QDT+Nib?= =?us-ascii?Q?J5DvtQElffnhLS0L/ZysH7icvTQE7WzHNpjV25S4+IwcqCMfjYtI5d6s0lyL?= =?us-ascii?Q?xnS5Ir0/wC6nbc1s2lmoEuSLihJi8uMYXFF7TCmrFQlAn4flEoi8rky62qIh?= =?us-ascii?Q?1f8UqAZ8DTVsujCmyTpeigSDMSV+NVE6t3ratltaHOYeeJMdHfZsCBUXQPLq?= =?us-ascii?Q?PMg50bNXynWwVKZuGoWfMmOmqnVbp9/Xu8OUmVuuGRY6vgBFQJ4mKEpe3wuB?= =?us-ascii?Q?Y+4cUuljanS9VYX4CM8NTgPeLDlft3YeGli5budedIOAPuNz9vviC1d7ahkk?= =?us-ascii?Q?ZW/OeAdp2fUHYHJ3WRQxhOlWVSebMuIspdZqAD6thLJWJNVYw8zp3E/W89sf?= =?us-ascii?Q?hN6G3Mxyg0TYafoVQW/TC6T+I6VENd6idtdjkY8C486prmvz0UAzjgWISmda?= =?us-ascii?Q?0N5xi1GSSDgU3MA2HTxXHh+H/E89HxcAXlKq7d+VYcZtrCcJKb5r/IKNewSo?= =?us-ascii?Q?VFedlsuTTgINi7pjDVK0vkc4oHd/ODzXbGI4o7a3vR5Jv9Vqzf4SA2evqnpe?= =?us-ascii?Q?knFdxGL+34u5u6B8wFxgIrZmDvcWuZXy+f4jTYH+yCw8TFc1i6q7HepauOJ5?= =?us-ascii?Q?87QpuVFMHfqLIUtvD6pkuxEL1ogp8hera1MjDZq1+BO4/ZAzbYHceObVFIT6?= =?us-ascii?Q?iOHtDfEr3+/t3l4=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)(376014)(36860700013)(1800799024)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jan 2025 20:25:43.8601 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ae7b9242-25a8-483f-10dc-08dd3022a0b7 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: CH3PR12MB8535 Content-Type: text/plain; charset="utf-8" Restructure gds mitigation to use select/apply functions to create consistent vulnerability handling. Define new AUTO mitigation for gds. Signed-off-by: David Kaplan --- arch/x86/kernel/cpu/bugs.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index fedd693b2218..58ac99b74bd3 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -76,6 +76,7 @@ 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); +static void __init gds_apply_mitigation(void); =20 /* The base value of the SPEC_CTRL MSR without task-specific bits set */ u64 x86_spec_ctrl_base; @@ -220,6 +221,7 @@ void __init cpu_select_mitigations(void) mmio_apply_mitigation(); rfds_apply_mitigation(); srbds_apply_mitigation(); + gds_apply_mitigation(); } =20 /* @@ -811,6 +813,7 @@ early_param("l1d_flush", l1d_flush_parse_cmdline); =20 enum gds_mitigations { GDS_MITIGATION_OFF, + GDS_MITIGATION_AUTO, GDS_MITIGATION_UCODE_NEEDED, GDS_MITIGATION_FORCE, GDS_MITIGATION_FULL, @@ -819,7 +822,7 @@ enum gds_mitigations { }; =20 static enum gds_mitigations gds_mitigation __ro_after_init =3D - IS_ENABLED(CONFIG_MITIGATION_GDS) ? GDS_MITIGATION_FULL : GDS_MITIGATION_= OFF; + IS_ENABLED(CONFIG_MITIGATION_GDS) ? GDS_MITIGATION_AUTO : GDS_MITIGATION_= OFF; =20 static const char * const gds_strings[] =3D { [GDS_MITIGATION_OFF] =3D "Vulnerable", @@ -860,6 +863,7 @@ void update_gds_msr(void) case GDS_MITIGATION_FORCE: case GDS_MITIGATION_UCODE_NEEDED: case GDS_MITIGATION_HYPERVISOR: + case GDS_MITIGATION_AUTO: return; } =20 @@ -883,13 +887,16 @@ static void __init gds_select_mitigation(void) =20 if (boot_cpu_has(X86_FEATURE_HYPERVISOR)) { gds_mitigation =3D GDS_MITIGATION_HYPERVISOR; - goto out; + return; } =20 if (cpu_mitigations_off()) gds_mitigation =3D GDS_MITIGATION_OFF; /* Will verify below that mitigation _can_ be disabled */ =20 + if (gds_mitigation =3D=3D GDS_MITIGATION_AUTO) + gds_mitigation =3D GDS_MITIGATION_FULL; + /* No microcode */ if (!(x86_arch_cap_msr & ARCH_CAP_GDS_CTRL)) { if (gds_mitigation =3D=3D GDS_MITIGATION_FORCE) { @@ -902,7 +909,7 @@ static void __init gds_select_mitigation(void) } else { gds_mitigation =3D GDS_MITIGATION_UCODE_NEEDED; } - goto out; + return; } =20 /* Microcode has mitigation, use it */ @@ -923,9 +930,16 @@ static void __init gds_select_mitigation(void) */ gds_mitigation =3D GDS_MITIGATION_FULL_LOCKED; } +} + +static void __init gds_apply_mitigation(void) +{ + if (!boot_cpu_has_bug(X86_BUG_GDS)) + return; + + if (x86_arch_cap_msr & ARCH_CAP_GDS_CTRL) + update_gds_msr(); =20 - update_gds_msr(); -out: pr_info("%s\n", gds_strings[gds_mitigation]); } =20 --=20 2.34.1