From nobody Fri Dec 19 19:04:53 2025 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2041.outbound.protection.outlook.com [40.107.94.41]) (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 4E4992040BD for ; Wed, 8 Jan 2025 20:25:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.94.41 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736367950; cv=fail; b=mG2h8katqRDRA0Uk33pCYDxSEOjuGDZlg3ZErxbxc1LYuzf+SVt9obTuRRMRjr/IjL+hhjgfVwBPxSOlG0LR8aNlp07EFnChtbR89BuPEskUbG0sjFkRR44TiRdbDolrW5LP8+zR2DNnu6KNQ5mRklHapBoNPZwOZcXdmTXoGjk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736367950; c=relaxed/simple; bh=EGE6KALSx/5HFoVZ1XxglMpWdqpntjLS0WQ5rKnSRjU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=JLDEeLJaxu+D/QxsOMLcYXQ0fvIODt8/ekTLT5JvXON4NJhKfQesD6F0yHtMo9m743ffQuf5Wh1aAt7wkbuWlnz4quCZf+m36TakPh4KR272W7t4zr1/Xu+RFEHy3ma3sGAdbU/8A/bfo50YhJnWXbed8ufemPxRnZrpryiGWRQ= 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=5CMt3+be; arc=fail smtp.client-ip=40.107.94.41 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="5CMt3+be" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=JywbY1Q4EffUpF3vLVmQfbdXB43GJTxzovflcAfJE/r+CGZ0Ku96a2lMeW/1iwlpGLg9HTQSr8kZ9++ZHBgTVDj6ACjyhfpZW4ngIoazR6gHXpVTPagU5G+4NwNXp6/XPIdXO3GXO2RCMrXaCyIF1mq4cCpowJHAYIdkWfot7WVl7aR+od73oZ7HL+cTQxMLiPtVNz+a/zzC/loyaZv2NU8/kMNetgrKj+CGlX1F0Elb3+n8yGpBCsTYTMTfIQgqWdErjtcfJ80X0EGGF/y6qcIxa+QlFT40XKk3FQFjsz50s46aJtrVLhb+woQJRGw6sPGSkS/0Yjw/8mcLiQGpPQ== 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=+fy1R8TQqKTOjwSeDQsUPRwi2nkjGeN9RL51Saprpas=; b=KAgQ9ncjTyjze1pUSSbqUXlR+px2COFxGj4/5i1Tl5V1Se1kKNSrayMmOTScUkH7eGrR71Nnan8RpCYWn9EEgeqyJyODXIkgMDCBea29esbCp+Pn/rY71rE0gf7bdThqpuYF3fB5IIteu1LxLzNtCASthDEHnvtF0x7cr/26Pc6ddYD3Rn5Z3wrPeYHD+7eUgjG1Fe+hbheaFpgNj18Az8TbFfsWPhOXfPh8tdCJabkatEgWGlKXFUTVLWnTKwWWLlDGW3x8Xeq/dd+gZogQzQBKJU5dZ0ehESnLSOH9s97d9wDtXsmOXv53Gp9xdMaim3vrTxfB20KmfDUec76+bw== 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=+fy1R8TQqKTOjwSeDQsUPRwi2nkjGeN9RL51Saprpas=; b=5CMt3+beDS9ZnpyGrgK+y59EButXk6j7OsvPJrRFiQ8YnV/aRfpOGl7x2IBoZmoCcflPADRrO69OX2su09t0jqR9aZQYv2w3g0tWWSVJaBISAL+i3QwQvogs3kxoToH9m1QMKF48Q4KiUrpAlPPZBL1UGnCHP8Chhf2iauQWu3E= Received: from BL0PR02CA0105.namprd02.prod.outlook.com (2603:10b6:208:51::46) by SA1PR12MB6995.namprd12.prod.outlook.com (2603:10b6:806:24e::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8335.11; Wed, 8 Jan 2025 20:25:45 +0000 Received: from DS3PEPF000099DB.namprd04.prod.outlook.com (2603:10b6:208:51:cafe::49) by BL0PR02CA0105.outlook.office365.com (2603:10b6:208:51::46) 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:45 +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:45 +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:43 -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 14/35] x86/bugs: Restructure bhi mitigation Date: Wed, 8 Jan 2025 14:24:54 -0600 Message-ID: <20250108202515.385902-15-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_|SA1PR12MB6995:EE_ X-MS-Office365-Filtering-Correlation-Id: 6d3be825-d73e-431a-c4d3-08dd3022a1bf X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|376014|7416014|82310400026|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?YoN7pA8J2FScW22HQ00V88yhG9BsCtxMLeuw9ZvZ6sN7lw6lwfEu2r9IOtP0?= =?us-ascii?Q?8ZOwPlIapAD+e56ULciL0zxMOHW2sP40CnnA70Dc44pOAa9cxb/55QAJ6aXO?= =?us-ascii?Q?t0MMxwETcf5dSLHZTV/VdHYMpJEy91SlksdNk2Cu2c3eKTCS3703IODf4aI8?= =?us-ascii?Q?9Eu/cLt1Z2EaUiDVFAKB58oCz3OiwmPySYKhGpFbxjOK562c0k1A7nrzW5TE?= =?us-ascii?Q?vtuvwqEOdIYDZPcbjNRiQx6447aNluBLcsPxvIIkXp5RloiyDEoYZiFv563o?= =?us-ascii?Q?wdgBcxvOXvp8peXIUOouXumnzGqqLqyY4WCZSHqx/0qFxgD2f4HKlW0JU7zb?= =?us-ascii?Q?pUluC1oEaEbG1Lh81WScEO0cN4WnL4l5XofmreTqQQnrmvxKjZYfw8hqF6z/?= =?us-ascii?Q?Fw4TWIhMhItL6HIPSwYM3Qs+ej9XRjrIiylfCrBtvhmkB7p471c02DtrmhJD?= =?us-ascii?Q?Albz2kZwI85w9xK/qO7aMjfgwXRmir1LliUBWo27eQaRe5Ao+sduUMp9XErt?= =?us-ascii?Q?ve/RSOGEr+ESFd0QFZ1qoOa1g4/G6QBRqOEKgrNO6fuc6qB52T46sicMWL9e?= =?us-ascii?Q?D7rgMy83vNEHcwvoNoLZWlL+RCoMBqMKa++JbMj+dLJdHkDpS/KtUPgUrISM?= =?us-ascii?Q?dlW8OmPwdkHrZKW/xT9G0pnbf/9I9whaIYoIHTltBvnyKAqqK+ouACksbdhQ?= =?us-ascii?Q?PEPDdufjbmHe4uKXuZQ4Z8E0xNu6X8xfG1/ru7J/V621wOx60bPTw8wORl73?= =?us-ascii?Q?4W4ZWt9SM7zvZ4l4G9CJYq4prR4IjEdXLJwZyu5NJ+vJfsquhsmI9ThPoM3f?= =?us-ascii?Q?eSqirFf63ukkJIjP/d8kQsfX6RS8C2oArUQ8yYJBWAOWQUhHQBWxMOHMQb0d?= =?us-ascii?Q?AJsGDFfXC6T/vh8X3ZEAEzWBjkdDlV8U6nQHDzHqwBLux90FEJdv8kpnxb4H?= =?us-ascii?Q?Fg/BToIBXxDfoe7axqAmY3DIef9fJl+LVGY9zhC5ymntCTTM9V4GosfWbqpD?= =?us-ascii?Q?Tuzi8lp+TWkWndpJ6GveBLMZ14JwH5LfLqev7ew9QRq6056zItPe2X6Ydte6?= =?us-ascii?Q?pudzsiJVZDvR2PijJ9jfM3ewHZfUGcqu70g5moDZ/nDYW4IoahtB7F5fXVCL?= =?us-ascii?Q?/TF8wFXd17cYmIbAyCpmnDercOdT0xUsbc6mcfs2TV5yXsC3s1jbxs32D6zi?= =?us-ascii?Q?okYlT/0EY+Uwmmfo+NBDYt91lu0hRwdm3zRsk9AC78zpErXrc57eJ8y1T16s?= =?us-ascii?Q?Ae2i3/zfLxb0JfdINklUCjytgWIBXnDiYoTSFcD4+uueG1C+0Ar8vEMvDmVD?= =?us-ascii?Q?VjHeUn90/albAjJ04K0RRW+Mt0bf5v0pJQDQbN3FhGxd2CjJtSbqj8WrGtJI?= =?us-ascii?Q?eRLyaRQX1kFLTjPY5ZYpjyDLVJ+QNPs0fbQYNiG+qBe+zkB7M9Nj+BM8WgKs?= =?us-ascii?Q?Tehe6aKjGbiLQCsAUpdqpzQuugTZ+mCG4NYlItTIOjYDTZXCyy7l3Q=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)(36860700013)(376014)(7416014)(82310400026)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jan 2025 20:25:45.6105 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6d3be825-d73e-431a-c4d3-08dd3022a1bf 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: SA1PR12MB6995 Content-Type: text/plain; charset="utf-8" Restructure bhi mitigation to use select/apply functions to create consistent vulnerability handling. Define new AUTO mitigation for bhi. Signed-off-by: David Kaplan --- arch/x86/kernel/cpu/bugs.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 849abdc0da91..fb92344d63cd 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -82,6 +82,8 @@ 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); +static void __init bhi_select_mitigation(void); +static void __init bhi_apply_mitigation(void); =20 /* The base value of the SPEC_CTRL MSR without task-specific bits set */ u64 x86_spec_ctrl_base; @@ -201,6 +203,7 @@ void __init cpu_select_mitigations(void) */ srso_select_mitigation(); gds_select_mitigation(); + bhi_select_mitigation(); =20 /* * After mitigations are selected, some may need to update their @@ -222,6 +225,7 @@ void __init cpu_select_mitigations(void) rfds_apply_mitigation(); srbds_apply_mitigation(); gds_apply_mitigation(); + bhi_apply_mitigation(); } =20 /* @@ -1759,12 +1763,13 @@ static bool __init spec_ctrl_bhi_dis(void) =20 enum bhi_mitigations { BHI_MITIGATION_OFF, + BHI_MITIGATION_AUTO, BHI_MITIGATION_ON, BHI_MITIGATION_VMEXIT_ONLY, }; =20 static enum bhi_mitigations bhi_mitigation __ro_after_init =3D - IS_ENABLED(CONFIG_MITIGATION_SPECTRE_BHI) ? BHI_MITIGATION_ON : BHI_MITIG= ATION_OFF; + IS_ENABLED(CONFIG_MITIGATION_SPECTRE_BHI) ? BHI_MITIGATION_AUTO : BHI_MIT= IGATION_OFF; =20 static int __init spectre_bhi_parse_cmdline(char *str) { @@ -1785,6 +1790,15 @@ static int __init spectre_bhi_parse_cmdline(char *st= r) early_param("spectre_bhi", spectre_bhi_parse_cmdline); =20 static void __init bhi_select_mitigation(void) +{ + if (!boot_cpu_has(X86_BUG_BHI) || cpu_mitigations_off()) + bhi_mitigation =3D BHI_MITIGATION_OFF; + + if (bhi_mitigation =3D=3D BHI_MITIGATION_AUTO) + bhi_mitigation =3D BHI_MITIGATION_ON; +} + +static void __init bhi_apply_mitigation(void) { if (bhi_mitigation =3D=3D BHI_MITIGATION_OFF) return; @@ -1916,9 +1930,6 @@ static void __init spectre_v2_select_mitigation(void) mode =3D=3D SPECTRE_V2_RETPOLINE) spec_ctrl_disable_kernel_rrsba(); =20 - if (boot_cpu_has(X86_BUG_BHI)) - bhi_select_mitigation(); - spectre_v2_enabled =3D mode; pr_info("%s\n", spectre_v2_strings[mode]); =20 --=20 2.34.1