From nobody Fri Dec 19 19:04:18 2025 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2082.outbound.protection.outlook.com [40.107.92.82]) (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 AACCB207E02 for ; Wed, 8 Jan 2025 20:26:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.92.82 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736367967; cv=fail; b=u1rw4uChxYn8s7SpRfK7GhiBhGaONY9ZcPrYr8VOJyaYiY3uGzaI4xF7UrDSmzK7ybrQQ2h/r4Mqwh3lLh/sicR/cj54QGGKzQ163u+qC2pALtjHDlvjJEOg12nilYLI32m3ouTNepuEcwgjtTCnZQMfG+WsY0ySx2NbdU95UMo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736367967; c=relaxed/simple; bh=ERk4gzeQCYRU2+0qaoPpZVj32zn7KGLfY/i00c9yjbE=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=KZ49Z2o/A9xPSOTWiyRyb4nAWHXk9/A+75ltqf9hAWjeGk86hn5JhaHp1g6TD0Z0V0vdAoUyjjBmVAOSKMraajIzU4Z3PR+g8gK6n48A3fmSRaMyayHjiXb75UwQFTsJuPtL6icZv5jTZCpAH98K7zbAnVZmRyqRy+iE/1rXhuY= 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=Mm3rUiDV; arc=fail smtp.client-ip=40.107.92.82 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="Mm3rUiDV" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=uzXMQ8cWEfLO5BjatZj1jYfN2O3ZmV/OI7Yg7os/cgfFli1pRKUjOoYMFWkShRMO2ntnVsfGzA+x4JTSVHEH01c5yeCooGI8djCD88YZkRzbtygQgGkPsISIKr54XWd1gyw/qf1Df/zFPoYHtpaOVZ2bB79f9TLzhVj/jMfu8qtn+y0+epgKsSxe1/dWeqpgyP+XGWyHE6kRksgL/zGl6lQPBI1OUbciphz8FnhEg7ijiUgYmOmZZANizPJGB1EwfxkmMrDfCT8mqG5eqz83rbt1+kFI8dH0msm/57Ba+ot3cNYjkeAJW0ZQ9A8tp35B1FKDbAdAZTZpPA38B2UuAw== 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=2TMqIhDkeN9qwTEyORIulUXGxmW4N979VGzkS4khWeg=; b=fnFrbgfAUa8C86DEAAidN83PvlU7M9Xo0qSGzp9+QkmUhryg4WIfjleSzYCKflGIQ9ncRzc8U2VBv2cwi3+qrJJSPpUMk60ruvBZVU3U+2Z+52mb0mOn75UalzFltLCuAdK4kjuNr6gBAibqkdPnbMMVZHb80QBLLMFCA3ahOGTkAyAuum0xz7el3egIMAukTSXsLKximtJKdvDBxQSYKKWPTWCou0BW0JCFUHJx2t9VYYZrgQHaLTJ5Lx0wc/vvix3XldtefRtIN1IybpH4KLeuFXcS1LQNpeUJDVXkNqehiYjAySOseooTCx9kwOetIHD8d0p4ATs9vgmJRO+ziA== 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=2TMqIhDkeN9qwTEyORIulUXGxmW4N979VGzkS4khWeg=; b=Mm3rUiDVOPzGKVKrZc5Y16Ec8Lx110Kpfin59oDHzVuI9BflmDUtzbSybMKKuppG7EE0VMn6SSsIqrnpeHXSAyGsBzqDydQsa/pF1R8blEdN0+llXSOZHzfMupp/t5dsAijAsl4ehhu6XPh66coPHGejVReVrUZFSiOiTGZNLbs= Received: from MN2PR01CA0027.prod.exchangelabs.com (2603:10b6:208:10c::40) by CY8PR12MB7170.namprd12.prod.outlook.com (2603:10b6:930:5a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8314.15; Wed, 8 Jan 2025 20:26:02 +0000 Received: from DS3PEPF000099DC.namprd04.prod.outlook.com (2603:10b6:208:10c:cafe::67) by MN2PR01CA0027.outlook.office365.com (2603:10b6:208:10c::40) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8314.18 via Frontend Transport; Wed, 8 Jan 2025 20:25:47 +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 DS3PEPF000099DC.mail.protection.outlook.com (10.167.17.198) 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:26:01 +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:55 -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 35/35] x86/pti: Add attack vector controls for pti Date: Wed, 8 Jan 2025 14:25:15 -0600 Message-ID: <20250108202515.385902-36-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: DS3PEPF000099DC:EE_|CY8PR12MB7170:EE_ X-MS-Office365-Filtering-Correlation-Id: 6c860af9-530e-4529-8bae-08dd3022ab29 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?TKR2wQhJpdVdTVp8G2Vx63dmT1SyDVdQBtstkUuUMqpbSLREEIoqXXs2qDDZ?= =?us-ascii?Q?+TNW/ldMMUfOHJHs76SdxNscw4Rz5L4Fp+wAM+tCobc5oeVlJVqA21zcadjO?= =?us-ascii?Q?HYYjLasxDeG+tJvrCko7DixmGLKMRyEcVgYRcS7jzPfrC0qRk0399OMYyPqy?= =?us-ascii?Q?+Vs77L5CJL5a/fsF5KyJ/zN93tN15ryMsaFKk2B6mwu0TXk0JXdBIMzM2aX3?= =?us-ascii?Q?o5oGPtTYfDnRcJjsHmW5qjQ8RMAnxaoe9gOBYSptrTTZsEH/hnLQiVSE4lGI?= =?us-ascii?Q?ieibIrgtVcDYUzCvQoPCtWCgiJZGhZfC5BvXuq3pVzl0GTizWjQVePzqc9nO?= =?us-ascii?Q?5lRSql9ENh2N+4c6Y1YRJ3KC+FTKR5pQA427DA1A2jjs/Dg1hGMOR/ZPUDMH?= =?us-ascii?Q?Cy9TRpvBeuFTwN7kG6OBarl20mlPfg0YULY98EFfvVBfrb1loXKcPQWRlg2f?= =?us-ascii?Q?ZG3+hRwLkugeQx9BgjZioK7J6TEaztT9DJ9P/g3dqKft72T1RRU1EmKJF1rf?= =?us-ascii?Q?Ez9IjT/d778j8fDgYINM+DGvctzwz3G57+t8e3eXlMshM9xr8HYA1njGaECh?= =?us-ascii?Q?dXGDFKc/slKejAp1QNKLaWATFon9C7DTqGk5M3icwc0vm5c85ACipjDqjkoS?= =?us-ascii?Q?kRgpZcYSBf5eqrYBZjnQnvzSc77cfx6BLU5kslfK3ItHUdO2+OZ3DI9L51ew?= =?us-ascii?Q?GGzbw7Y1Y/3QgoNTu+PvuoQH6Vee8BFtjfa+dznHjr93UCNogQO+s/OnPOK/?= =?us-ascii?Q?ceFoA+7E+F++rkB6oNOzeA4kKy1WMpyxn2YDJzK6Zh3hFhoLGAA4RN5weq4w?= =?us-ascii?Q?q5cuLl1PphKP4LEqFIE1MzerhUujjLtPdlXdXlc4G3kz7SD5r5RaqWE7Crqg?= =?us-ascii?Q?ZbimLKMeXvh7f8K8s+Z9L5RJerA4HO9Z/guDsQuKASD0KNX7JhuxkURg4i+X?= =?us-ascii?Q?e4Ju2XlBeN7oNcyn9mDaCnin2i4cNpgl8kDm3gviiYWxttuJ/xwbtMY/DhwM?= =?us-ascii?Q?cJueiufguCdXfaCDw67oKkJPUX4qQ5o8SQQ/fOBwLcrJS3Rg5zR6B4XHi1gL?= =?us-ascii?Q?kpOQaQJ9UQRnNXNGVQ7artATByqdOBncTSItQ0SBk372YR/aJtPcwQVwLUin?= =?us-ascii?Q?b6fnzz/N4Onb1ncCJKGkpN+14c5C0Nak4WnfdYYj0S04UR+0ECiO5TGbC7mz?= =?us-ascii?Q?Ndw9w0UDXXihBbGfuFkvOyCWo0/IXI3u81bs4Tj+5JGA8xSJpXdwRDim2JaJ?= =?us-ascii?Q?NeU4F9LatxCcT+sDv3q+mzqeeRJCoJMvJQXwtzhkiDgMBQkf0p4lU1uVVC9m?= =?us-ascii?Q?DPstr8OHg/7MFQIl7bFG9uLmvAQWrikS5qKW5eFzXkhDaxgZMBh7QOXNZQyl?= =?us-ascii?Q?lBvs4ZZ+8LmwAY74NLrM1yJen08QIimUs5xna5vHv7xJEiOHm5/hBZYJS4Si?= =?us-ascii?Q?9S4ABxNH+j9MULWE5vd6bEgZv7w3QUio7oQbmNQJegnniwkdwunYQzAxVLM0?= =?us-ascii?Q?ky3rR13xRNArVns=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:26:01.4188 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6c860af9-530e-4529-8bae-08dd3022ab29 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: DS3PEPF000099DC.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB7170 Content-Type: text/plain; charset="utf-8" Disable PTI mitigation if user->kernel attack vector mitigations are disabled. Signed-off-by: David Kaplan --- arch/x86/mm/pti.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/x86/mm/pti.c b/arch/x86/mm/pti.c index 5f0d579932c6..132840528d55 100644 --- a/arch/x86/mm/pti.c +++ b/arch/x86/mm/pti.c @@ -38,6 +38,7 @@ #include #include #include +#include =20 #undef pr_fmt #define pr_fmt(fmt) "Kernel/User page tables isolation: " fmt @@ -94,7 +95,8 @@ void __init pti_check_boottime_disable(void) if (pti_mode =3D=3D PTI_FORCE_ON) pti_print_if_secure("force enabled on command line."); =20 - if (pti_mode =3D=3D PTI_AUTO && !boot_cpu_has_bug(X86_BUG_CPU_MELTDOWN)) + if (pti_mode =3D=3D PTI_AUTO && (!boot_cpu_has_bug(X86_BUG_CPU_MELTDOWN) = || + !cpu_mitigate_attack_vector(CPU_MITIGATE_USER_KERNEL))) return; =20 setup_force_cpu_cap(X86_FEATURE_PTI); --=20 2.34.1