From nobody Fri Dec 19 19:04:54 2025 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2083.outbound.protection.outlook.com [40.107.236.83]) (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 56F3D205AD9 for ; Wed, 8 Jan 2025 20:25:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.236.83 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736367958; cv=fail; b=P+W4jZUdAsx/GwBjVT4MszvBjcAKPSYc3I+xHxJnQ7hmxd9vL5OjTbOD1vvgDBSSYkL/9KZc5AqkUDiNKM0q5faaTJAhKyI4izwLImWQYdyXteZ40E2cJ3xC686HHRZq4ck3HZkwhcN/s0TL37M3c/wqgfkdy7uo5q90pdVDs6w= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736367958; c=relaxed/simple; bh=08eIX8WQBoFkF63LnD/rESY6J+lHoqnMvYv8Oe7ha6M=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=LSkIWVNJmr0qv8DWOcXUvX4NT2kC12M2IxSv362fek8KgtGDqmTRQOUyI0rKhCfgbN4lvSWo+u50BSCJhxpkY5/CCaeyZXsRaiIOkQ24k9g0305RpE/bgnZVKxGsuFDGxs9feMz/eSmdh8hkCpSs19KZrVzlM7ieziheAp4KPrw= 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=0YLBeOg2; arc=fail smtp.client-ip=40.107.236.83 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="0YLBeOg2" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=JnNZ2Ri67mudHxTNqFjzVbPumKsqukR4upXw64ouWXZ/Wt72X4E1jTw5QgPBeeiPKUq2cLjpPBrSjoFdb4yj4R5xCidsN+XOU88YvdDiWjZnqIcXraj09U16FuxUFQCDYxuK0zNLsWs1Jy50Yd1PIUCxFAPbYF7dkIijAEBikjIyazJZWEgr1P0bEkr1yQOuLWRzHEfLTd50EpS1mMk8yP02sNv0bRjsTaHX6VzeTu+HQF1nZTiLc6NV2o6B46rC2aif789NlKOE7UMjG6C6cbl6LeZJZ0VLKnzTByxyu89GgK8+MVOUTK1LEl+UPrwUP03rIY5PGaDDdTc2HS0W+Q== 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=KlF+QlRgIBNLpN3OS4NNpQ0AqKMTcTzUE26psRABnuk=; b=X2AaGQwbiXW70iqJjkpj7jdN674XDLrvKqU5oyGAJdejiyFu/JZRUm9q3R5LM8q9VjpIzhJpGNqPLBCx0cyOJEBTE7C1YZge+9zRTvlyrgqh77/mp3htohbEvSVv74DekFRWT9JyYX8JCWTRF5440JQQVaLdDWMnIGYbasgR4sUexXD++z9/cUogUnK/rXd5jAA2WUbbXFBf9AEv0FCyb1Rss/tULZjZfnHxgwTTgCjE0MS3TqFpzoiNV9+3G3Csst2w3RytBPYTkkJaPMw5a+YJ3HzdurpNIm9w+U11lJbOF72mQTYoTauaJ++noiSTvkGdvyRu5KJufiBYYWvKeA== 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=KlF+QlRgIBNLpN3OS4NNpQ0AqKMTcTzUE26psRABnuk=; b=0YLBeOg27WyXgM07SlHrTygYRsVJo5YzKBueML8L/1LR4sMqEh6CI2t3ko5dLyRZsjvDDxzQNZF6w7NTW7TYIkEsU0k/8GgySzqW/R9pIMdsVHQV+RK2NVBlDmtVLdcAVOVyUWQ8xPxE/ZXvGvAYDnrByAlP/WxRS7jko/NXtJs= Received: from SA9PR11CA0014.namprd11.prod.outlook.com (2603:10b6:806:6e::19) by DM4PR12MB6229.namprd12.prod.outlook.com (2603:10b6:8:a8::16) 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:51 +0000 Received: from DS3PEPF000099E2.namprd04.prod.outlook.com (2603:10b6:806:6e:cafe::e3) by SA9PR11CA0014.outlook.office365.com (2603:10b6:806:6e::19) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8335.10 via Frontend Transport; Wed, 8 Jan 2025 20:25:51 +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:51 +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:50 -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 26/35] x86/bugs: Add attack vector controls for srbds Date: Wed, 8 Jan 2025 14:25:06 -0600 Message-ID: <20250108202515.385902-27-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_|DM4PR12MB6229:EE_ X-MS-Office365-Filtering-Correlation-Id: a47df253-9e6c-471c-8e08-08dd3022a523 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|82310400026|376014|7416014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?6QAyCnF/U8DRH3hR72PITwgtCwhOxz+iPKEjxuRFQJ/Ze1M8jkGuhQxsIuHJ?= =?us-ascii?Q?v0UoZb5XLFeoPLYKhxTOAsIABZZPsD+ZD+B3U3ZAu5Iu7pBtHSkt2cwC0abU?= =?us-ascii?Q?xXB8akqZB2tBuKHotQedTKX2HEmUeThXK9polwVX18vXTZC1b5gSDEk58HXp?= =?us-ascii?Q?JB+K/jhszzeWLwyTwW0f3gcRGaLBFJKBR1NJRoynWT2lit6IdlspYDIabibD?= =?us-ascii?Q?zpNrvE58CJMoqF3hwQPSJS7itFJmRU60oq2NByXfFgtq54URbjPlo31QZsAJ?= =?us-ascii?Q?DT6LdLyPQ9xzUlwYxGD6Ojrgravu4mosBhizGPCtZsRNNfr+/y6VnP7tC2v+?= =?us-ascii?Q?8jYslkhaNfDsE2Kal8PX3sNvE3NmMtaqqgXNQqlDXMq78vaBUuGPizXjV+r2?= =?us-ascii?Q?lMWDhTZhylX/CdBDcw863WHVs4v5SjkYKYzGgYTZxxB/bC7TYBG0Yu4BHsHy?= =?us-ascii?Q?hgi5g29/6EfuFOwoYuV3EyrJSNpYSg+HRbvYZ2KUi0PjcQ9eltX863TvXsvD?= =?us-ascii?Q?nLAOBZ/Z70xVyZFLKr5wzatNhHT7XTjXprQ70t+OpFtqrrEdnxwpe5uF0S4Y?= =?us-ascii?Q?14wljd1GRCbERRZb6rSAXIgx6Gw5ETf1Ijs5vQte9D0k7rKpAnHP59a0jrfQ?= =?us-ascii?Q?/AUcbU1CFVgPGDy14lV45mc554cR7W0H/zr4XCjq6MvCrK6mUuSolfQa0qlf?= =?us-ascii?Q?rOhAO6UjAA66t7gRU4M8gjGRb5w4VJm60YCmrHa7BtTK8lweGYOz+F0PbuPC?= =?us-ascii?Q?zQgZUDA7VYOoWRyZqaXiYwzFrM0+05e0ZdrLoOGhdagGBlJ+B6se4kvPkSoC?= =?us-ascii?Q?w/1SSXpaE14TJH0YxFFw8IeQg7Dg6ctEzaLxRyywp7ABkcaZEcqcnAb0/ooY?= =?us-ascii?Q?/XdPUC5/iQ09jujrgyqi+m4/pqB6DTZ2cuZ0PNOeE6TX7NnZctsRE0+H3r9l?= =?us-ascii?Q?O4UVFyhLB9XvwtMA/a4iEQwFhBpA4jYOvujgOpTHxLxoumHrLQw28cqAKsAG?= =?us-ascii?Q?ZVfRfseboRRJREF3ROd4hm3IRavpc+sdIfFoGLBEYVJpo6+y5Gv8Z8hiOCVm?= =?us-ascii?Q?FypmcrMdjTDIKC9SFk9vlPfOmdOKkkRMUjyKZwpbIhhqX8aX+1KVhFzzMv3W?= =?us-ascii?Q?oG0H2Xiga4k8vX8cah3o2mAdePbEhqhW7Yir4LY2AKq9WoFHHYqcYSbLocxX?= =?us-ascii?Q?1JRUQx/WNVH8BQggeUU3VZLnfdFILG9KiRbxJdS5NeluEYJG9E+2jzeHCeZ1?= =?us-ascii?Q?bVSz/wE/QcpF4v6AFMNjpRoxb/1eWfT6oUCq//kTcl0TsfOD7KF7G5Q9h0BO?= =?us-ascii?Q?bHGq1Eb+tBH/TpgZEo+MKxM6mwjwHxrD3iuKjEQfm98TbFl4Zi7r825smQKW?= =?us-ascii?Q?840mVtxC61DG2qAW+Eade+I+CNewE5k1UsudPst5gF6MAaXgAQ7l/Ivpb9+K?= =?us-ascii?Q?Psy811jwkV6ire31io+amcVA3/2evW4jH9aNgppBnroh1a2O2+rEMAwHnfkO?= =?us-ascii?Q?axM5kqa97p5c45Y=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)(82310400026)(376014)(7416014)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jan 2025 20:25:51.2976 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a47df253-9e6c-471c-8e08-08dd3022a523 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: DM4PR12MB6229 Content-Type: text/plain; charset="utf-8" Use attack vector controls to determine if srbds mitigation is required. Signed-off-by: David Kaplan --- arch/x86/kernel/cpu/bugs.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index d9b12c706fc0..c6b395608c3f 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -897,8 +897,14 @@ 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; + if (srbds_mitigation =3D=3D SRBDS_MITIGATION_AUTO) { + if (should_mitigate_vuln(X86_BUG_SRBDS)) + srbds_mitigation =3D SRBDS_MITIGATION_FULL; + else { + srbds_mitigation =3D SRBDS_MITIGATION_OFF; + return; + } + } =20 /* * Check to see if this is one of the MDS_NO systems supporting TSX that --=20 2.34.1