From nobody Fri Dec 19 19:04:21 2025 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2048.outbound.protection.outlook.com [40.107.237.48]) (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 39B63207A03 for ; Wed, 8 Jan 2025 20:25:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.237.48 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736367964; cv=fail; b=qUyjYfyusNAJpC/+L7cozD8fyDPOSwW3ACieAMwaYKR6ux6vkX8vyxIIJAj2LeI237NpISGCXmRfUVnEK07/8OrTlibdAH3KMDiYD2VF24hzup27G+AaWOnhVyNvFJjqI+VGoqh+59yi3ke5ZEJ2oZbNvRVaLO6Ah7MB0E9YaR4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736367964; c=relaxed/simple; bh=sv7oeAjCnGg/ZI3eNJ92Qwng1lXVJLQkM0GwK0XKD8k=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=npt/tW6d3cOmBZCPh5GgS5d6Z9ekmK6r1xwkcQm8rWNCVnxvBSpOFczZHp3YeFx9HSsyJ8kjm9c7DeD07bwkfs5eulp3Lmi0MUirxrt30em5r1lbSoORHZXZB9ItxojeZlFaSwhsGbf/OXaxEo0AKobBMgawY3sxrwyoQ9+thfI= 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=h2SHEs9h; arc=fail smtp.client-ip=40.107.237.48 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="h2SHEs9h" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=AFKdtVDy8e2riat8LjsoOTGg6S283L7ulH5nWbKraqYL7S9+MwkyrFiwZ/EhX/YGhnlIsLJkDqT8rP/5YcBE7+JEMP7SuHDqU4LZnkt8s+RFhjPNjZALOxL8dfnLQ5xhWXqlwPbB03SFfMg1eDeuHBj/q9Jgs0tuFO5EdGZALun7jIVzoxWd3Xx2Ot0dXfHr7x3Qhkujt14ywcc5WAj5/nNgN4EoX54KrVJJVRFTjY16k4qT+TQMjFPI+BksO378Wk0xZL2/cNwcqf+46/TITwdE0NB8/SA6z3StZDguL48BRzn8YIzGwod16U4kA/KRzUQjyQhoZxElHQJv0yDBPQ== 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=sABYYMcJeTHdGSarqoC6fnVRW/2uWgQ3WKSWS0Go4wM=; b=FSkkn4AF/fTR3AgQ1phCFct7MIjBDxqFhccdWZU5shCjN/lC8pYE9uVrwlB591yVqo8skuMQNeJT0pA1IVWxZcy14QhNyfHscVDmXnQPz5sYsvUc0HFQAp7jRvhVA2sy+7rrTRZS07fasPl4XsQySlw98rSgcQQaBk0mcdsEVh1gq4/9ltqhWT0tlDw5VLFDXfHJrEpvzKFMuDpruNYkIjpEPhJu+TcgPx4THQbyW0jdp2NefDW1wCSMEktQxpbF61KSpZQ03/0bd8uIL2qwwUq21YhaomA9tEH2kgXEir+z4DrG8tphIrowSumTRMuL+2tSQVLEzN9YvNeiz3fX0A== 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=sABYYMcJeTHdGSarqoC6fnVRW/2uWgQ3WKSWS0Go4wM=; b=h2SHEs9had7p1/2QqV+2ESUQspUOI3XhZceQmDXXdp894yGg22MnOvYCRS0QqU5KY+/PXEw0AU4U3UNS2NfEVai4LLvgiCeUiqa3dLwVdKCtazO6kRg+2XEen+kmZm5HYJ7FbNsqy7g6bHw+/NhI7GRXZOoOaOb9CSM9dCr00nM= Received: from SA9PR11CA0009.namprd11.prod.outlook.com (2603:10b6:806:6e::14) by DM6PR12MB4281.namprd12.prod.outlook.com (2603:10b6:5:21e::10) 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:57 +0000 Received: from DS3PEPF000099E2.namprd04.prod.outlook.com (2603:10b6:806:6e:cafe::9d) by SA9PR11CA0009.outlook.office365.com (2603:10b6:806:6e::14) 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:56 +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:56 +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:52 -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 30/35] x86/bugs: Add attack vector controls for spectre_v2_user Date: Wed, 8 Jan 2025 14:25:10 -0600 Message-ID: <20250108202515.385902-31-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_|DM6PR12MB4281:EE_ X-MS-Office365-Filtering-Correlation-Id: 18831d7f-9cf1-48a4-2c69-08dd3022a86d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|7416014|376014|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?S8D2ZIfi2cinz/AnSctIVEFaGLIuLQJEUCSJ1hNs7jfcSK8jGrFI4EBwV/XA?= =?us-ascii?Q?stjXN+MrbV2ghIf5i8dmsfpwLr2oBJWjLKLYDm6n90Eth/aRCltIck+z8b5j?= =?us-ascii?Q?HE/xjsfKTrjkyO8YpZBkDjo00+zbRRWKm4X84c5Rgju+teAangX3NLXVGFqj?= =?us-ascii?Q?BurPcXrzNIwqVfgVexmCq4B3Ap/+teyu2OBluEWirbmAkWsg1Ok0YqpoE9Je?= =?us-ascii?Q?urNWFCskocESWT+p9RG38MGeSfrVw5b6d91zajqLgps/8wq+CLBtxgnwMbaI?= =?us-ascii?Q?gOFdpEgBNqv3M9iWcOx+nl5CiFqr0jvTKKG83pDLMn71TdUZrmj8wdVlxbtj?= =?us-ascii?Q?/RzPsh2ACCWgqi7mHfgHSH2UtW6vjEKpVRIhkBEZq9wmSEanWsMkIDI+84pD?= =?us-ascii?Q?M4FTqYuTI8ZQz5GnR4V/g+dWUeyknIgYR+zpja2VskmY14TCtKBWIQFPjyBJ?= =?us-ascii?Q?DzY4xtysB/n47YK82mqkvIvUkLFvaNEqBkmqYx6I6JZBR6JJwLQL5P53Mhnw?= =?us-ascii?Q?PXszqIeYnDRMTM6pLnCbscnmDWqxhtkyKqV88R95NKfh44RDoGn/mF6k4ACU?= =?us-ascii?Q?fGZ8QL6eNbXXQGCA/95iCMneLz2aUhukwKl50fZ4IPpJlShSEYojmTpLXrmV?= =?us-ascii?Q?uPQ6bZXzWteQ2LvgeAwTyo+UDNL8g+dsdnI0CaJCND9jD8O/LtEtlfy9Pbzg?= =?us-ascii?Q?vfQJ3sJla08WPsOuI/VvsJlntCAjlMs+fa4Aswd3UMpqRYcAfeBo7CoJzISK?= =?us-ascii?Q?eaiDjDzK3RAVu0/ue6OtKA8R1byqSLGZ8ay/ybnb/vzEW2asdfqyTz+94rOo?= =?us-ascii?Q?7pK+nFqeyDkBD5SHnqV+iaa5W+03CG4vommsm8GonflLlsmVxrhKSb1yZ4rH?= =?us-ascii?Q?FwETdC70L+5IQTZIPsg9e8L5rSctxl4XujD10mepTPXyTV2YapGl1CTgmeVl?= =?us-ascii?Q?yLhnloTwsTejSiuObEcZ2tL2wli4jo6hrmX7u6Xt1TTsCXT2VmcFC4CDogiZ?= =?us-ascii?Q?nNwhDOX2bhJnhp8by4KdDC+99dEk+TEDMG390VRf9oId8O2PwYzep4a7PZLp?= =?us-ascii?Q?1vk1V4qMGr93cE0nRNTlreaMMySBOzt1JzlJuIaO0cfjwRP3wCHsLVT3iwdx?= =?us-ascii?Q?GqdBc9nC1Tjl5Tu8FzsgP9xJIJilmmCYQ7ZQMbjn7b/6cMsjBG61HET6et9q?= =?us-ascii?Q?EVt+OrAS0Zyk5vXJ+mFfbgjEueVikGbPLkbcs0UrCmi8U10u4c5k4L+rzoOf?= =?us-ascii?Q?Gc8O0z6uImCsueJGH3vqLgh3/XnFlFOk0zb+MN4Mkz+aeLWBCg2fRnNb7fqR?= =?us-ascii?Q?3gnYRBfkhPpagZ1+bH2fwFY1GSFKPy8xR3wKeY74XAvdBUxg9H/VLi/Tm2gv?= =?us-ascii?Q?4WgRX1g0/0sHONdmQ45/cu76e4yEbL4H3e8pDkaKvvv11pwEjKnImk3J6DUc?= =?us-ascii?Q?8OL5wBYunRPyRf+PuYibYngnbhSHTraKAAZZbpfzBX0BF+k0PSiopTuUzUV9?= =?us-ascii?Q?dPGLUkio7Q36BJ8=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)(1800799024)(7416014)(376014)(82310400026)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jan 2025 20:25:56.8133 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 18831d7f-9cf1-48a4-2c69-08dd3022a86d 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: DM6PR12MB4281 Content-Type: text/plain; charset="utf-8" Use attack vector controls to determine if spectre_v2_user mitigation is required. Signed-off-by: David Kaplan --- arch/x86/kernel/cpu/bugs.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 430f89a5f66a..c1b60ffa3218 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -1614,6 +1614,13 @@ spectre_v2_user_select_mitigation(void) spectre_v2_user_stibp =3D SPECTRE_V2_USER_STRICT; break; case SPECTRE_V2_USER_CMD_AUTO: + if (should_mitigate_vuln(X86_BUG_SPECTRE_V2_USER)) { + spectre_v2_user_ibpb =3D SPECTRE_V2_USER_PRCTL; + spectre_v2_user_stibp =3D SPECTRE_V2_USER_PRCTL; + } else { + return; + } + break; case SPECTRE_V2_USER_CMD_PRCTL: spectre_v2_user_ibpb =3D SPECTRE_V2_USER_PRCTL; spectre_v2_user_stibp =3D SPECTRE_V2_USER_PRCTL; --=20 2.34.1