From nobody Fri Dec 19 19:04:52 2025 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2050.outbound.protection.outlook.com [40.107.92.50]) (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 EFC052046B5 for ; Wed, 8 Jan 2025 20:25:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.92.50 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736367951; cv=fail; b=OVx42j3cHC2T6uwbd4L1ltAgcc7yEc5STwB/FyqWc45+FZP4dQ/lDrpeEMueiI71J7bU8DhBNZspGkhKGvDyxat7JyBqAsDadLWmqOr/ZN+ex0762ayhphhqVFof4qBEcLjF6RerS8UhQiWUC77WcmfO8hSehWXk1zuoU1logME= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736367951; c=relaxed/simple; bh=4HdcrdFRg9VTorhE7AsaIGDMJnHfTN4sPMWRGeR1NPw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=SzVnKdHWZHZ1RgZbspSAol40+n8EQMO0CPQ6zi3QUTkB3sPtYfwEvhUOhQDjSuxewGxlc83TFScxCffZYno+TcOhOQy2vu94Zfu/aVvLHFlKzxkspcMP5DE0w7G1lnIBWQZz2JXuaL+rPz0P/iPOjSo2tYkUkEIQnJSQo1gB+8w= 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=d6Pc/z6c; arc=fail smtp.client-ip=40.107.92.50 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="d6Pc/z6c" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=DQefO+0AC5pHWtRHns+nvfARypGNZPhVo6uLWuiY1Ch5b4x+jcr2EOttOHbcnR/Ywqz6Y5xdGl7B+nIqT3ayw3QxRXyELu6YdaYzCCMhpc+ODsKwJqIfoJymLiorhGkkjppDR5jyp/u/xp1qO+E7BIB2YzazHTAgp/UVtk0nhhAvkFyXfpKSjQM03Y+ZOEjlcKwJpIPsvo0AUfj2GI9wPk1+jmKafgrdQI8+NrR6+0EplhNlbulnVgiI6mTrBPHvzSVaKW70hJuucm4x0OEqjRUKxWq3r3rNU0NZznxbdl4z8yUiCsYEiqHCTPRktlkzrPEfwyULPB7zq+nTY9Pqiw== 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=72xs0zn+iEo5hXDJf94HQku5Dl8Mteg16nRIWkuLsmo=; b=vni6UoI7IwDA+3UUbu1lHPixQkRhPM1SpkV1O/obAdyOE1xdMcoFv4nnzccwb3CjmEFxIgihfkEE6N1Mb7TRxxqLmqKboX2HZ610ou8aw+zxqedg2fXVhvY6gZ8pYqIx90pXDugCZk3n3EBQCpWD6+BwMdzBBtkA1X7XZeduBRZhZxGvrfAJMmsv+e7KrMpUEFY2/46iP7VIf2B/E5wBb59NhfqMjk/7vXYYnmXlSpKIIF5Wo8+mYUtkrFM+FBG+Lky1fh2lbg34Zp0ny41APNXpM5UWDg8BwtQM5QkcfIv3v5Vo0YJTVMjGmwSGqkp6jDepVOmmf3mkEYSbaaksPg== 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=72xs0zn+iEo5hXDJf94HQku5Dl8Mteg16nRIWkuLsmo=; b=d6Pc/z6cvkqxSpVs5Jkk1p0gNMDY92ZGxANCw8FUZ0W+uRHRDtk47O2f3X9qGRT6z1aJJQVvxxRu9BbXtcApaKTH6v6VU7nZh7jLLBx4kDj3vnmSEAEQCpzYtPzSf1ykIKkzMwlz0WeD8bB/DZ/NSpk8HRM0+zlmorLtENUNwOk= Received: from SA9PR11CA0005.namprd11.prod.outlook.com (2603:10b6:806:6e::10) by SN7PR12MB7202.namprd12.prod.outlook.com (2603:10b6:806:2a9::12) 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:46 +0000 Received: from DS3PEPF000099E2.namprd04.prod.outlook.com (2603:10b6:806:6e:cafe::fc) by SA9PR11CA0005.outlook.office365.com (2603:10b6:806:6e::10) 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: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 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: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:45 -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 17/35] x86/bugs: Restructure l1tf mitigation Date: Wed, 8 Jan 2025 14:24:57 -0600 Message-ID: <20250108202515.385902-18-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_|SN7PR12MB7202:EE_ X-MS-Office365-Filtering-Correlation-Id: 9ed14aed-97ad-4419-d8d8-08dd3022a223 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|36860700013|1800799024|376014|7416014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?9OQiIcdycV2bU/tIFriLV89PctHrr3qDPzrJI4Vfz+h+TTw79sXhGSMcIr06?= =?us-ascii?Q?S80O407ZzJ1fqcDHZ1odZEnTlWzop9h3xSSS7ENAaxjMTSOX8WueMigfNqGV?= =?us-ascii?Q?/skGfT/rv046IjaEkHAUctnvchODjwBgkrfqY3rGxvMqFZ/qYzYLQzmLo1z7?= =?us-ascii?Q?To53JpEdODYyrGGDZYshteWiJ2ZKDKZhELEIvjqzADaDOCIuX8earDYfzBO8?= =?us-ascii?Q?Pb9LKexemCe1y4WlYtb546AmSKYkCxIhcusuPQGgp7S999QcRSwBVJvsUsVy?= =?us-ascii?Q?5u0vUI5b7wCxRw4zbM+IYEKUt00+YD0NvC65ckqXh2rnt5bd+Z0NF3BJjMcT?= =?us-ascii?Q?iaK0MgFzbGpYCYPKgaJQSWtn/zBrivUzSRsKUW6k29Oxr8sTYHSCurssWgqY?= =?us-ascii?Q?mHPGDTa5Njshq/KKgqEw9Q3WUf5HiMNDFw/6ElvpeCYDaLKo4NpsSZgMESKk?= =?us-ascii?Q?UP25CiFA3BTsdhzfi+bomjdDdutVb37aVVfSs/ZAKrBFp5JP+sdCc12LGydk?= =?us-ascii?Q?Jos+LoRY30dn1rmWuuGYMBOvhPiq3kxEs+y5O1mwJXxqUDLGvdn77/m3v5YX?= =?us-ascii?Q?/eCyS1CWPz5iLMiju8Onr1ABXM7SXoXDV05/qKgAheQmr/S9IoxY0Y9XQaJS?= =?us-ascii?Q?qyWPkMHgz5JylzNhSlKRoiS5bBhES5KsJIZQAnJA31Yx5n+5QTcYGu1/xIpk?= =?us-ascii?Q?EOkRBp9JNcr8cMdMYuHI4uZ/KV9ZQrMBjBMuPwwmMfTu/qmWXu4iMigZib+a?= =?us-ascii?Q?y8YErQ4x0vjM6geCcghqLETNXDW9BoUxcSiskVsQVX4Yb3EAmXRS90KJ5HC9?= =?us-ascii?Q?KBffGtC3fhhglHE6ioFpbYaqs10oiAyl91dkO1t/ufu3uwgXID8TBF1gwopx?= =?us-ascii?Q?i/OIlxqIdzE1jnJt34EMsyxfbA3a+2jI5uEnt7R0GihFuXQMj4UzDGAQK3+R?= =?us-ascii?Q?vovNKM/+W4shZwzdSCo8VWvR20CLCEltELAE2lc4bPDAsClMTK+3WHKtslLL?= =?us-ascii?Q?RXlG8e3xU6q8JImiiFb3y2xr9KruLjkmICX2seoVPmE9BWm2npDVvXXASm8v?= =?us-ascii?Q?LBJ6JOV7EQ6Q0npi1isP6XbUDEtP5pBu5yk8rKfiATguGLtLdmrqI4I0TQDM?= =?us-ascii?Q?0HVlpRL8yvFzZx0AYR5Qas8ku4AM2OizUrSpmoUGjI/PEr65IJO+qSaHwnvt?= =?us-ascii?Q?mNxs0fuzcOlqMRWfGxmp8P4t8ZufSnT6qtqTI7X0K0HvDiQDz35fB05C5RSj?= =?us-ascii?Q?jCFL6LsOqq6HYs8wKkaPWlMydJ+rVFTOWypNLu1Y1IUfJSeLobnVuJFWvGYX?= =?us-ascii?Q?ffOa3Kfxwhd4HtM6wndE75znPSBYS9X/w8LOZUaeaac0OKZZfhqf7c/6u5M9?= =?us-ascii?Q?d3dvSDlZNpN45UA2UxPMYn+YkiyPYcnxtIzr4cgVZMIgP8PNJgTzeKQ3wCe9?= =?us-ascii?Q?SQl8zahj5PD6T45/fJA06+M4ulJzFpjedHGd/eRAdVKEwN/osRgxMwiUYkXp?= =?us-ascii?Q?rj1N3DT9Wvkv/6U=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)(1800799024)(376014)(7416014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jan 2025 20:25:46.2664 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9ed14aed-97ad-4419-d8d8-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: DS3PEPF000099E2.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7202 Content-Type: text/plain; charset="utf-8" Restructure l1tf to use select/apply functions to create consistent vulnerability handling. Define new AUTO mitigation for l1tf. Signed-off-by: David Kaplan --- arch/x86/include/asm/processor.h | 1 + arch/x86/kernel/cpu/bugs.c | 27 +++++++++++++++++++++------ arch/x86/kvm/vmx/vmx.c | 2 ++ 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/proces= sor.h index 90278d0c071b..57760b0d553e 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -746,6 +746,7 @@ void store_cpu_caps(struct cpuinfo_x86 *info); =20 enum l1tf_mitigations { L1TF_MITIGATION_OFF, + L1TF_MITIGATION_AUTO, L1TF_MITIGATION_FLUSH_NOWARN, L1TF_MITIGATION_FLUSH, L1TF_MITIGATION_FLUSH_NOSMT, diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index b07726a8dd3b..08ac515df888 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -67,6 +67,7 @@ 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 l1tf_apply_mitigation(void); static void __init mds_select_mitigation(void); static void __init mds_update_mitigation(void); static void __init mds_apply_mitigation(void); @@ -225,6 +226,7 @@ void __init cpu_select_mitigations(void) retbleed_apply_mitigation(); spectre_v2_user_apply_mitigation(); ssb_apply_mitigation(); + l1tf_apply_mitigation(); mds_apply_mitigation(); taa_apply_mitigation(); mmio_apply_mitigation(); @@ -2535,7 +2537,7 @@ EXPORT_SYMBOL_GPL(itlb_multihit_kvm_mitigation); =20 /* Default mitigation for L1TF-affected CPUs */ enum l1tf_mitigations l1tf_mitigation __ro_after_init =3D - IS_ENABLED(CONFIG_MITIGATION_L1TF) ? L1TF_MITIGATION_FLUSH : L1TF_MITIGAT= ION_OFF; + IS_ENABLED(CONFIG_MITIGATION_L1TF) ? L1TF_MITIGATION_AUTO : L1TF_MITIGATI= ON_OFF; #if IS_ENABLED(CONFIG_KVM_INTEL) EXPORT_SYMBOL_GPL(l1tf_mitigation); #endif @@ -2582,23 +2584,36 @@ static void override_cache_bits(struct cpuinfo_x86 = *c) } =20 static void __init l1tf_select_mitigation(void) +{ + if (!boot_cpu_has_bug(X86_BUG_L1TF) || cpu_mitigations_off()) { + l1tf_mitigation =3D L1TF_MITIGATION_OFF; + return; + } + + if (l1tf_mitigation =3D=3D L1TF_MITIGATION_AUTO) { + if (cpu_mitigations_auto_nosmt()) + l1tf_mitigation =3D L1TF_MITIGATION_FLUSH_NOSMT; + else + l1tf_mitigation =3D L1TF_MITIGATION_FLUSH; + } + +} + +static void __init l1tf_apply_mitigation(void) { u64 half_pa; =20 if (!boot_cpu_has_bug(X86_BUG_L1TF)) return; =20 - if (cpu_mitigations_off()) - l1tf_mitigation =3D L1TF_MITIGATION_OFF; - else if (cpu_mitigations_auto_nosmt()) - l1tf_mitigation =3D L1TF_MITIGATION_FLUSH_NOSMT; - override_cache_bits(&boot_cpu_data); =20 switch (l1tf_mitigation) { case L1TF_MITIGATION_OFF: + return; case L1TF_MITIGATION_FLUSH_NOWARN: case L1TF_MITIGATION_FLUSH: + case L1TF_MITIGATION_AUTO: break; case L1TF_MITIGATION_FLUSH_NOSMT: case L1TF_MITIGATION_FULL: diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 893366e53732..99bdb9341be0 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -273,6 +273,7 @@ static int vmx_setup_l1d_flush(enum vmx_l1d_flush_state= l1tf) case L1TF_MITIGATION_OFF: l1tf =3D VMENTER_L1D_FLUSH_NEVER; break; + case L1TF_MITIGATION_AUTO: case L1TF_MITIGATION_FLUSH_NOWARN: case L1TF_MITIGATION_FLUSH: case L1TF_MITIGATION_FLUSH_NOSMT: @@ -7643,6 +7644,7 @@ int vmx_vm_init(struct kvm *kvm) case L1TF_MITIGATION_FLUSH_NOWARN: /* 'I explicitly don't care' is set */ break; + case L1TF_MITIGATION_AUTO: case L1TF_MITIGATION_FLUSH: case L1TF_MITIGATION_FLUSH_NOSMT: case L1TF_MITIGATION_FULL: --=20 2.34.1