From nobody Fri Dec 19 19:04:19 2025 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2045.outbound.protection.outlook.com [40.107.92.45]) (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 E85EA20766A for ; Wed, 8 Jan 2025 20:26:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.92.45 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736367965; cv=fail; b=ofOH/57cOaneROVWGFdbdsbeY1oG39Et508XXS03nFIp7E5MoNvCqn23gUvOSziqeL+1o5uwZF/WrVSIhVv1xaWED0+7MbGVmZnwAgMp6/yezGJtZkLbyBJXfqpXPjFxSKXSDyHSfQcuEwGyVhcTqc9EeNDWQ+XSUeoDwjy43OM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736367965; c=relaxed/simple; bh=V4FIhxJcU074jNQ72b57VQXWyk3HJ7XRd1jBhy6ySKs=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=I+LKgC6ZxSy+HsxBL1JXi+mOJ222vTeyFe/EiDU8ENjlAFgf3V9UCZT5LjolibWHI9kU6kFz5DJIfnBPkFUMgb7agn8wtkI1C0bMEfgNQaY2bgLlEfa79tmxdlXEHUIzC8dYQ/QT0w5bSKUajft1miMoOaS0DPlxRTblaMiZVks= 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=AXVVsb/V; arc=fail smtp.client-ip=40.107.92.45 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="AXVVsb/V" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=l9OkuQR9aSMJRHOPzX2/GY3Dum+WXifRN8NVD7Z1gFKBpnMrlEJXKLyUD2jZXn6i1Evc55FBhJkQX5W9t+gQiWyobkCB7tCqHDbY+/YM9mD5Xz4Jn69krWaHXC5pLz7Ul1j9ZgFAY1CXLN07GsszCSJxMfeuLyXd64Li+AOADWHxl7cLyhXkoTEMDEbKJ/ajTCA5glniiYcbZqA/NpCMLHuvZhC6QOboqPFBNaIAOY5lpS07A0KrJvVF1XgpaQKGxbIj2xQt/HUmxiSPSOD53MF6Fhr8zEhaNMbO8lyvBtnWnLUA3+RCEksy/5lQbt1K2iEGvdNaCvYKPPrhuLrvPQ== 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=d53hF4jT/foRzL7BA8cbVctanTV7XXBW89R4+QxyCgs=; b=C5/yX/62kvggGnV4Pb+OmSwbXCMaXdG0rPbJIaGDRhqJX8/FA8PEBhtuheMLKD1KkuOzZ4ekLqKga51eY/hNWwZEGBCQZYeYvwpjemWqahkg7D1URyvO/fJzSE+YhiCeDJKaKEllMkOUDuFMXc4DBEeyzWoQePcVpedfaGo3RzwC3+oq0XVfveBxf4Ot+9JQ82ecMeUjlrFGYK+VrBymYZveZNEErYg8NkUOb7hcrEXQWpYFGCmE4oKVf8WkIpqosdWYXzAlLH1jRN9Oe9IJfw5yvhKOfAGETS/iY200Q6daurXhMcyqVFt7kRRCpL/aPGw7q3WEGPKNvnH1q3Nmfg== 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=d53hF4jT/foRzL7BA8cbVctanTV7XXBW89R4+QxyCgs=; b=AXVVsb/VM0ZHnLb3m+G7zQlpGupuBhr/fgMzWj7mfIbNn7MVKt33++VfmYC92XP5TYrnrQ6PxDjFxjdG/97HFZCwVi/WJJj0EE70nhiH+Jbm5Q6IzL2kQVyxU+XD14PCFUzvwiS2NxVCkTGAmVFYqoyI8191fMkBb1AwMhfVUO8= Received: from SA9PR11CA0022.namprd11.prod.outlook.com (2603:10b6:806:6e::27) by IA0PR12MB7556.namprd12.prod.outlook.com (2603:10b6:208:43c::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:59 +0000 Received: from DS3PEPF000099E2.namprd04.prod.outlook.com (2603:10b6:806:6e:cafe::1b) by SA9PR11CA0022.outlook.office365.com (2603:10b6:806:6e::27) 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:58 +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:58 +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:53 -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 33/35] x86/bugs: Add attack vector controls for l1tf Date: Wed, 8 Jan 2025 14:25:13 -0600 Message-ID: <20250108202515.385902-34-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_|IA0PR12MB7556:EE_ X-MS-Office365-Filtering-Correlation-Id: c624d6df-0daa-4021-f705-08dd3022a99b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|7416014|1800799024|376014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?3wiqpQmfZKoa+Wes/n6mKUwWJNor52Hm7r+e1UuksST+C+F992fUZPaN/Z+Q?= =?us-ascii?Q?isV7G9ilPY0wqSS+iVwur1c5c3P+fo6Lv0yOOS2tNauIo+0o7pE244ot43hU?= =?us-ascii?Q?S1OxS6KycsMMPLXiuVqUF3vJlbSpdeLO2AeXtFT6XV7ucQ/0LkLz0NAYT8yK?= =?us-ascii?Q?gdF3CSdGizdzBQySc1jsgF/Xan7qBm4PDxTP0cKtLZeSQiFCQifuxKphDAEG?= =?us-ascii?Q?+V+NSgD/JQHUzOTp66gOsKiQNXXfZbPmnVvJ6nTIDD3960vYXFTEPdP4t+ZY?= =?us-ascii?Q?KTkohBSE2Tw+lYe+RsGcCJUWmOS39uR6yUsaniWoNG1/3dN2XYAAAni+b4tH?= =?us-ascii?Q?bLBvv8Q8eiMBYY3IB0wN47v77LZXIUGwjw/PMXDjybVz3UTl2VedqLyS27hg?= =?us-ascii?Q?LwPePuEnXuNtpJrM70MWyFwBQvM/FT+YZiufgUUvkAGc0UJnSMbGRNlFE+qZ?= =?us-ascii?Q?RBvsEK2J9bb0U2Tx937Tl1xI0FZnpC8BCNU459vRJCI9r/rykSekUkS1J0q6?= =?us-ascii?Q?NIYBsJAoodHy8MNkC/XsRyoIsDt/qD5z7JkZoiwB6eSqc04+BhYnkW5kzHnl?= =?us-ascii?Q?Kld7KadcJ3AjNMl5iowGaFG9zBMq/arwUGaHcFJmCctxRJYYXzBwSaZjNUW4?= =?us-ascii?Q?erlubh8E+zyX5YQEXbdTnaMRCMn06nwvYPVyj38BwMj26G2idPHNaSY0mlrg?= =?us-ascii?Q?iswsLq3pJf+i/I7hpxmc9F+Azq9UhPDlKvm0h6D4SsJAjlVxYE6icakIF1cL?= =?us-ascii?Q?2Y3Y75jA863cTpRALoHccV6dIs8s1M5kkMkaJrkrjYrtgpRtYRYV0sDq9fOU?= =?us-ascii?Q?4qBYT+Thpwo4K/sEg+ic41yD0N+uWGc9FogXz187NCmjdXTmNaRgTINlgEMb?= =?us-ascii?Q?rFXKmAfTK/jgP4LFidXAHKcn/QOLRiwKKmfgd+g7Usv5xDiY+3vv2F5yaKGt?= =?us-ascii?Q?B0jCb7O2BtSvfgsAxQRtGpjoYZ4246VO5zjyuKtAU21ItfFuCnwiQgMG7euT?= =?us-ascii?Q?EyYXGWtzsDwCWC2poAb5vs8u183EuNgzfQGHJMwwVD4mFl7Yum2OvdAOGBDt?= =?us-ascii?Q?g814WlWh+cACMwU9ZiyFFgWdPVbKDYnGvAx9/wUUlMBB521ByS0qru7Yj7dZ?= =?us-ascii?Q?+uWNXQdTfBJ4YuH1YfUvSkTtO3Vxuk6xatumnEW9YGYFlu62/HOPbMZByJQb?= =?us-ascii?Q?RsaX78uCs3YVh7Dyaj6k2mLxZs256IYHQ70UFSLIhTHidGmurooMXgy4GKx8?= =?us-ascii?Q?nG7aUWqmZNDLjHj94oX00EBYD23g+4V9meOfkZh1ehj7HDGlIncwBJzIEDIv?= =?us-ascii?Q?Z/3BSibXLjK52jN+gVNUgxIRt9yhz8WHy92QeB9uc/cn87pVGWWKP0JnDiKf?= =?us-ascii?Q?5bl/NYJrxl3aIE0im4wdH6mRRpNCqm7dqVfm819Cu9st+Axk+Jt4Zt5HFJAy?= =?us-ascii?Q?lvgzchk2OPFWhIZNJDQUwfLNYwPxGVO2wUhpFCpR0ffs0e/tNWwk9eUp07Y2?= =?us-ascii?Q?8gaDMjadcucn+8Y=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)(7416014)(1800799024)(376014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jan 2025 20:25:58.7976 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c624d6df-0daa-4021-f705-08dd3022a99b 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: IA0PR12MB7556 Content-Type: text/plain; charset="utf-8" Use attack vector controls to determine if l1tf mitigation is required. Disable SMT if cross-thread attack vector option is selected. Signed-off-by: David Kaplan --- arch/x86/kernel/cpu/bugs.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 662573ad3e51..2e3b4d768d6b 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -2780,10 +2780,15 @@ static void __init l1tf_select_mitigation(void) } =20 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; + if (!should_mitigate_vuln(X86_BUG_L1TF)) + l1tf_mitigation =3D L1TF_MITIGATION_OFF; + else { + if (cpu_mitigations_auto_nosmt() || + cpu_mitigate_attack_vector(CPU_MITIGATE_CROSS_THREAD)) + l1tf_mitigation =3D L1TF_MITIGATION_FLUSH_NOSMT; + else + l1tf_mitigation =3D L1TF_MITIGATION_FLUSH; + } } =20 } --=20 2.34.1