From nobody Fri Dec 19 19:04:59 2025 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2088.outbound.protection.outlook.com [40.107.244.88]) (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 D1AD9202F61 for ; Wed, 8 Jan 2025 20:25:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.244.88 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736367945; cv=fail; b=cHaRf3dN4eQ138K2vHgzLraqPn1TYsC4i0YB7VAkzek4IksWfOmeBeHteETuqMglXhqnA9X9gs7GuVrhE1qHAHDioSRUWDZUAAx09m2viZQtbKguCCWh6Adgnfb8vIEqV9aPzlhyWfZPuefOqyrfko3AbGjxCTPp2Z2SCyKKe+Y= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736367945; c=relaxed/simple; bh=RV2e8VF59hXMTQLnoPvMAnSH5bbm/YBYkSG3AmrYf1A=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=W3mg4CbYKvifO3QN/Xds/xbC3qmB23uNWDWmVwDbZfzIoMOti6bGsUzTElBjDKY5BnYPDauKxf3aRUM3kqWlFrw2TT+dpvs/AuMiBkPh2UzM6hRjzdGEgUH/a3O1aTbV77Ey6akzAVtXzJ3ZyiD3vBhbKFE5cGMFIX3Ln63K23g= 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=FauGaAmn; arc=fail smtp.client-ip=40.107.244.88 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="FauGaAmn" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=W/H59BbBMbytmJRk0S+y3jDsf8pq4vw/cbxOixuFvYH1f5hSu5Q2KSngVduncm2ySuYiXfs4mgIGePk6Hp63uBMUMVM+X+5G2uEjJZ6PdfmURdX+eRt6MvX0fe3P8moOULajhi08OQBRg6QmBNbVsIXwg3oo3/nWD5y7+OnEAQ5I2mUYrBB7+ckx3uRyO2eh5opB66gvQj/FTr+1xobQY2q78ekB72sZGW8yiG0e4twF0uWE7hSr+RNWvfKRdTMvhg2wjJc9RUrG5nKOOxJG1EEHHgsE9B9EF0JlNJqrCAugSGsimEcGu8/UX4RuoxAOA5CG1+V92tlG4Q1LHJjvdw== 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=eTqT39aLn6vAV7GB0VbJaj/6S5Hwc2gxjw/AvrjXsDk=; b=Rw6RzWCPbiXHSpi9KVac0lN1C7hqN8JPvlsA8COpAcpU5VJ7dwIAb11ZcKASspUlgFXtwkn8Sm6UW2uD0fcCsBmRWIOGVI3I5A6R7BYa5Q3NtR46ILscY6jQQm3XU58BVDUvou/Q4iTRj4QRSVMGjIawrLdexLtVj/7gXHfl8PqzTa6irWaUVP1XQlv6FfEMQwKKdq/3U4vhqgiBFDNJnK6NUFx3NLH+OzrRdXPNz//Y9phBWYC6ecKgH4MvtpeYW6XqJeWs/KNmH8HDL2zyBQblEe+E9u2eTqNe6PielrV24NQq1VUsIgeGo85dqT1EoEPJiGBiFubu/qIGek9Hgw== 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=eTqT39aLn6vAV7GB0VbJaj/6S5Hwc2gxjw/AvrjXsDk=; b=FauGaAmnQJ22y7eTFmSQ+m/8SCsAM1qSwxlgi3OuTaGNQsIhEeX4TI0Z9P0ICSCosNc/+3ogUMX/VcT2N1RSQi7lchdVxSyoUBodcXH2fVff/09z/MQliBOZpjFpR4PlFd7EvkEudLzW3GTSlSuPMp5bB5EZTs7NJ/2JWmBMK4M= Received: from BL0PR02CA0079.namprd02.prod.outlook.com (2603:10b6:208:51::20) by MN0PR12MB6001.namprd12.prod.outlook.com (2603:10b6:208:37d::6) 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:39 +0000 Received: from DS3PEPF000099DB.namprd04.prod.outlook.com (2603:10b6:208:51:cafe::7b) by BL0PR02CA0079.outlook.office365.com (2603:10b6:208:51::20) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8093.24 via Frontend Transport; Wed, 8 Jan 2025 20:25:39 +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 DS3PEPF000099DB.mail.protection.outlook.com (10.167.17.197) 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:38 +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:36 -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 02/35] x86/bugs: Relocate mds/taa/mmio/rfds defines Date: Wed, 8 Jan 2025 14:24:42 -0600 Message-ID: <20250108202515.385902-3-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: DS3PEPF000099DB:EE_|MN0PR12MB6001:EE_ X-MS-Office365-Filtering-Correlation-Id: 39c2b17f-469f-402c-2d21-08dd30229dbc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|36860700013|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?53Fo2uwVJqMCU4HC7eY1+eGZkZJwNXVWGx5AHodA//0/T6r/Q5uQ2dhFSKVQ?= =?us-ascii?Q?yIWtNbzL4PCM7VnidyAhGPZxtaAXNL+ObfDb/LlT3b5DyR6pM3R5ApvWvXsg?= =?us-ascii?Q?5UlxPLLhwn4Tjw19BFB7z5+g96M836oUoobUmFBxnnZErhbAmoeCKHwkZRhI?= =?us-ascii?Q?zBpHqISGVHJ5EEFzwcQhfsCpQaZ8SQrFt/Ne1F01P92euOASG67kxgJzvGki?= =?us-ascii?Q?KmPcwPwxjCRalNv56cy3mTOke/9Yd5SNduniN4EVcqnGayIKagcIemGcHvpO?= =?us-ascii?Q?YInMEyaNb00hKZ52aEWNl0YTamsopuPG+o1MOf2kaNXV9jbCoYHVfuc2A6VG?= =?us-ascii?Q?kPAnho+nIYfbO/XE1lHHsj9nXQLC4v/UXZfYs893711F1dR7vtjNmQ6Hpjn8?= =?us-ascii?Q?dQwUIkTZmoDwpGYqCOt0yZDAuP3eY7t4ZOw/6qK/tKEzKLdtL5kCUz1OeTTV?= =?us-ascii?Q?hJcjYyfjLV4vtpusYcooZXoCTrxfO7/Y3qWVqnu+AhNQl/4JzJqx2re3rEWd?= =?us-ascii?Q?Ruo1xbLcNp/4c9o4WmHImXdgVWv0ENJFTIn37X3VcX5mKQ+YOZpVSAeLW5sE?= =?us-ascii?Q?3THgOWyOznjK1JAeqERe2OTxwSaJiFIKgqpf2J/TJejzyHHZZiMSDHZgX5F8?= =?us-ascii?Q?nuTk0B3f/sLMRxXyTC40zOoiYpxZcf6mO7qHRhyuzzXTRIOB8zUA7cNu+vFL?= =?us-ascii?Q?qO7TxOmqbwwIdlibdcM+Rt1XFnyPBZVrJ4zbDhjnfaXtVyAYEjVOU3ryvo6P?= =?us-ascii?Q?A92fUhK41qBJzHn+C4Zukh/Q2g4u3X77EgIb05PgxPXyQTquF8C3yLuL/A6T?= =?us-ascii?Q?VZk8zqeDaEuw868JWLKQndhGUCadliep8QqWsP76Qum2RmpPz/ZXhzMXlRBO?= =?us-ascii?Q?EjNwKYpg7cpCzt3TVl5Rj2ohZC+RIlHh8ZRvrl+n3cpOz3EeHhkMFPhmletH?= =?us-ascii?Q?fOfccg2NFnLk6LXL40GLF7HwRp3EKxYZah5N0t73C13MnV1b4ar6ZtDAurQD?= =?us-ascii?Q?0Ht9RKfFyVqj26dtMXb1SvxZ/Q4WcaiOgsBXC99Kp8bkpXB+D0Umb/GZe3ke?= =?us-ascii?Q?uVeaMMa65YEY1YLYqdVm0ky95rqYLDxB4kjiRoNm3L/ELj1UvlByiDoYFUR1?= =?us-ascii?Q?wz1uVQfWysg8flr++ZnD52YAfiOnVF0eqrUK80vQa+WwNa7lfCXANwW8iOYI?= =?us-ascii?Q?nUkSTUJaKTbUyYSc1C9ltf6T3wCC0UR+pLzeLnJi7ulwdaujRvk79WzOPFCp?= =?us-ascii?Q?2/z31OWIi6VM2fi4Sz1aU0Y2HtectADwztwOiK7C0RkTdexhSsBn8NGqV0HW?= =?us-ascii?Q?68i8HcAlMqpWynUm5o095ic9zxl5CfOHRjS8teRVRs+miMv/yG2OWyh/6znc?= =?us-ascii?Q?HuyxgLhntwEnakwBI4qbmz4vHE65MTERNydzngPKdXWY0SaUCN7fq/pysj4p?= =?us-ascii?Q?CSiA1z7O/S8s3a0EGzI49XLhf+k2GZwph5XQA98KWT6gX6AUO3zO0tYcqII1?= =?us-ascii?Q?aIsNAheALkzfneI=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)(7416014)(376014)(36860700013)(1800799024)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jan 2025 20:25:38.8136 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 39c2b17f-469f-402c-2d21-08dd30229dbc 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: DS3PEPF000099DB.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB6001 Content-Type: text/plain; charset="utf-8" Move the mds, taa, mmio, and rfds mitigation enums earlier in the file to prepare for restructuring of these mitigations as they are all inter-related. No functional change. Signed-off-by: David Kaplan --- arch/x86/kernel/cpu/bugs.c | 60 ++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 5a505aa65489..bbe4c772e557 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -243,6 +243,37 @@ static const char * const mds_strings[] =3D { [MDS_MITIGATION_VMWERV] =3D "Vulnerable: Clear CPU buffers attempted, no = microcode", }; =20 +enum taa_mitigations { + TAA_MITIGATION_OFF, + TAA_MITIGATION_UCODE_NEEDED, + TAA_MITIGATION_VERW, + TAA_MITIGATION_TSX_DISABLED, +}; + +/* Default mitigation for TAA-affected CPUs */ +static enum taa_mitigations taa_mitigation __ro_after_init =3D + IS_ENABLED(CONFIG_MITIGATION_TAA) ? TAA_MITIGATION_VERW : TAA_MITIGATION_= OFF; + +enum mmio_mitigations { + MMIO_MITIGATION_OFF, + MMIO_MITIGATION_UCODE_NEEDED, + MMIO_MITIGATION_VERW, +}; + +/* Default mitigation for Processor MMIO Stale Data vulnerabilities */ +static enum mmio_mitigations mmio_mitigation __ro_after_init =3D + IS_ENABLED(CONFIG_MITIGATION_MMIO_STALE_DATA) ? MMIO_MITIGATION_VERW : MM= IO_MITIGATION_OFF; + +enum rfds_mitigations { + RFDS_MITIGATION_OFF, + RFDS_MITIGATION_VERW, + RFDS_MITIGATION_UCODE_NEEDED, +}; + +/* Default mitigation for Register File Data Sampling */ +static enum rfds_mitigations rfds_mitigation __ro_after_init =3D + IS_ENABLED(CONFIG_MITIGATION_RFDS) ? RFDS_MITIGATION_VERW : RFDS_MITIGATI= ON_OFF; + static void __init mds_select_mitigation(void) { if (!boot_cpu_has_bug(X86_BUG_MDS) || cpu_mitigations_off()) { @@ -286,16 +317,6 @@ early_param("mds", mds_cmdline); #undef pr_fmt #define pr_fmt(fmt) "TAA: " fmt =20 -enum taa_mitigations { - TAA_MITIGATION_OFF, - TAA_MITIGATION_UCODE_NEEDED, - TAA_MITIGATION_VERW, - TAA_MITIGATION_TSX_DISABLED, -}; - -/* Default mitigation for TAA-affected CPUs */ -static enum taa_mitigations taa_mitigation __ro_after_init =3D - IS_ENABLED(CONFIG_MITIGATION_TAA) ? TAA_MITIGATION_VERW : TAA_MITIGATION_= OFF; static bool taa_nosmt __ro_after_init; =20 static const char * const taa_strings[] =3D { @@ -386,15 +407,6 @@ early_param("tsx_async_abort", tsx_async_abort_parse_c= mdline); #undef pr_fmt #define pr_fmt(fmt) "MMIO Stale Data: " fmt =20 -enum mmio_mitigations { - MMIO_MITIGATION_OFF, - MMIO_MITIGATION_UCODE_NEEDED, - MMIO_MITIGATION_VERW, -}; - -/* Default mitigation for Processor MMIO Stale Data vulnerabilities */ -static enum mmio_mitigations mmio_mitigation __ro_after_init =3D - IS_ENABLED(CONFIG_MITIGATION_MMIO_STALE_DATA) ? MMIO_MITIGATION_VERW : MM= IO_MITIGATION_OFF; static bool mmio_nosmt __ro_after_init =3D false; =20 static const char * const mmio_strings[] =3D { @@ -483,16 +495,6 @@ early_param("mmio_stale_data", mmio_stale_data_parse_c= mdline); #undef pr_fmt #define pr_fmt(fmt) "Register File Data Sampling: " fmt =20 -enum rfds_mitigations { - RFDS_MITIGATION_OFF, - RFDS_MITIGATION_VERW, - RFDS_MITIGATION_UCODE_NEEDED, -}; - -/* Default mitigation for Register File Data Sampling */ -static enum rfds_mitigations rfds_mitigation __ro_after_init =3D - IS_ENABLED(CONFIG_MITIGATION_RFDS) ? RFDS_MITIGATION_VERW : RFDS_MITIGATI= ON_OFF; - static const char * const rfds_strings[] =3D { [RFDS_MITIGATION_OFF] =3D "Vulnerable", [RFDS_MITIGATION_VERW] =3D "Mitigation: Clear Register File", --=20 2.34.1