From nobody Fri Dec 19 19:04:52 2025 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2070.outbound.protection.outlook.com [40.107.96.70]) (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 BD136204690 for ; Wed, 8 Jan 2025 20:25:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.96.70 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736367950; cv=fail; b=CKdwn9UoY7ge7z2AY1TQdPv4xBjNXqho/PB/jY5lXcUU/26GaRh0eamu+BBzVBlWGP1yt00zmv2J1KjBQVusRIsV525nbbhKHMA7jzHaYA0kZNsmeoWDDTtAcAusAaT5FG7BkIRuOqs5fio1XKzn/gKB1ok3xsRgjTd7fUyZYUs= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736367950; c=relaxed/simple; bh=q4IMbOe3CPTxBHvFjZOkYmORZGrFFo4roiKYwfDIImY=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=TLhOQtP9tLPDV3U3TyTMmCFNC5S3HNkJiyouv1lNL+NDI/ayBSw7q5LtO7+xWUSEH6NOj65cBKHshxDrBoi1YvMBtGVkoJzNFLGSe9v2iFKyEC/MA5mZiLCaSnINELyJ9g3bTr6chjk4b9p/H07KlvY+CPDasD13a3f0Jo+E5DQ= 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=WQx2x9aV; arc=fail smtp.client-ip=40.107.96.70 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="WQx2x9aV" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=XDjZUUGz70CwQN5UCc8dWeGBCwZ9kuNcDSR2PXEEsY32T1vfrQ9bjgh7qsZHisOocKU9uQbyYsCDjFRDdDEzfcnNJENsG/DQFE0QcxKqFFTG/fhqZ/8YrZQStmnm83KjPHFqzMOJL/ysTaPxqxwXHB/SOGcgHQD+XrE8dyXu8c8svMIa0vLemq1U8Wa3h54Bz/kC+9sXqRHLQRaYT7OFhjHSeKEiMoBfIvUVm1SQm6tBkWvu/VleXL7wvJWu/pltExgDzdTGF4BoMVVz3ATXMRaLNkMqKpstry9Ee2u+K+ZXJMuLZ4J25vopLbU9psBrdPLqN8Pp7P/KRKLrFH8RIQ== 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=BgDteNVfemwREmzKfQY8X61ENCDB2I0OWPrWIfrpcjI=; b=gHpjuPJu74YNTBwC1bnOH3HHTAr2Oq3S9sCsxS4+OFtcGrWTY8bdxK4s+OYEpjyaxFBFyxlovrn+OW2dzcfRMEEBMpMJTlZIp5TgLDNTvQAXWzPdxOUNnXzGp3kCwUzgm7yIRLLeOeWWvjnGI5onKsvHa8Q/KbFV2BASqHJdP4H1u6PwJUQiJhW+RlQ6QlXknx5yfkkhKSkdyWwNMmYACZhuXN8l0A1rqOwg9ExkwwhycFf3cwUtQHDutka3KEyE7RZMz3Su5ZJDFuujMzo3RI3KmTUVD3gC7PXQkwj7BxVK3kJTpBxIC3aOevW2ys+C+UCz/CY+zVWtUE1XxWfUMw== 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=BgDteNVfemwREmzKfQY8X61ENCDB2I0OWPrWIfrpcjI=; b=WQx2x9aVA3mEkhCDk9vcXZnvlVMJ7B9oFMU5mEPmh3h9QTw3wUO2N63ng53T8rKvLUeLh8g70D6Y6FMus3ts1ih9KPqtqGY10vIwFmFXssyZdxLz2efkE2nlj0wufHfQwm/AKDG/fu+H450Eny2guh3HfBTZfmbsCGsJqeWV+pk= Received: from BL0PR02CA0102.namprd02.prod.outlook.com (2603:10b6:208:51::43) by DM4PR12MB6255.namprd12.prod.outlook.com (2603:10b6:8:a4::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8314.17; Wed, 8 Jan 2025 20:25:44 +0000 Received: from DS3PEPF000099DB.namprd04.prod.outlook.com (2603:10b6:208:51:cafe::6e) by BL0PR02CA0102.outlook.office365.com (2603:10b6:208:51::43) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8093.22 via Frontend Transport; Wed, 8 Jan 2025 20:25:44 +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:44 +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:41 -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 11/35] x86/bugs: Restructure spectre_v1 mitigation Date: Wed, 8 Jan 2025 14:24:51 -0600 Message-ID: <20250108202515.385902-12-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_|DM4PR12MB6255:EE_ X-MS-Office365-Filtering-Correlation-Id: b18f0bc5-2349-433e-8018-08dd3022a0d8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|7416014|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?9Md0yCgi22NTtwJXkGmuc2c7c9yQnxfleE7JD9V6Q6WqfWlA6yJXiZIn9NuC?= =?us-ascii?Q?8Q+ZgkDmiN6ULO+ZcHwulsm4LJ6LLTZAZJc86pSz5lRWJOQH4zvTdXVHPYNa?= =?us-ascii?Q?9cudYFB9EQBKN9dnlbTB17aKVm9cAosxBxDaPABt7DhVDFKPD6s3Sb5soy6A?= =?us-ascii?Q?q1zD3B37IBxTGfyJaBTuu66eoA9anojaB19FUFXxkda51EQimOtr4MH+w4J0?= =?us-ascii?Q?blBpkYr5iBWgKSr92BpRBiEMHoWodc8U5JIMHkbI/WGxY+/MU5tYbaDG+k9c?= =?us-ascii?Q?Dril2zs+heyxSTIo2OkohC4FdEWa6V+mysLQ35RZsMo6X/4+bK+N8xiR0xDt?= =?us-ascii?Q?2KvNybENfMtvzO5gsKHSPum3TYbripE8ntNk3bYHOnT2n5XfHrqLF75EID4F?= =?us-ascii?Q?s7CDN+QMUkfjQUjWiYLh/421KdgkhqU1pAdWUGlEIVQ3Fjt56eDODOun19ZS?= =?us-ascii?Q?t4YL9Jcwldc/065M+RznEf5qfrTsFwXk2tu+QXp6j8J14A/qy2R4rxJCfUTF?= =?us-ascii?Q?OCtQuoFwvCABm98brn/ay6XzD1moQ1Hu4PO2YQnFC1t/0yM0hQSbdzHM41Sc?= =?us-ascii?Q?7ODBzxQS+QzHjl9jRbe33hW31hyWLckeqP9xMSJkhl+fjC80Buyv/XcqOHeW?= =?us-ascii?Q?GMpRH8oSvQDEwJggq02jU5RvAANcfG1twrkxlJY99s3/C7URks5O3Q+2J4Kb?= =?us-ascii?Q?2K7vI7QM18ZDeODPDUBeogZBtw707tjJLfj6gIM//sL9wwGcltpNtBHZtTBc?= =?us-ascii?Q?NPDmH+iiNz16xmCVNFKsHxJLBg5bRplwrtvxeFoE41hfCt4vV1ziZibidtVe?= =?us-ascii?Q?BjCRorxd/WlTKTRiq/GofhI+kPLzWTdJPBzjVKLcduuG3TCrqZgHJm2w1aKA?= =?us-ascii?Q?YfmJkafPvcgN2NAC7yq67pdwTQJNW1v5uvCFEEfpB9tExfzO4G9xsPIwX4Mm?= =?us-ascii?Q?eSRpVjl5TIVfq6c3q3MP7kSaJmeNxEQzondtVUAmZmtZoa+AyQFCisQWkADM?= =?us-ascii?Q?sci1WjBnhA4EvBBeuf/OXD7CEBNAFJC8JqO6zHHpvyf4ACSLEc8IObKypoWx?= =?us-ascii?Q?q1w+rnC/oe0P/4hf7nX5iDDuFkyNcw2bg2xs1eALmtHJzDc6Jlln0wgHXfXx?= =?us-ascii?Q?PwDGimJbVeYd7w0sBMX2E2vWY6iGE4s2kKuU/UHpU8b+XJElq+1JH65x8CZD?= =?us-ascii?Q?ONdCII7Y+tjD1KEc+jVX+BhAgKNoD2hf3BYtB8Tfc4delHl8knadNREQzGqT?= =?us-ascii?Q?2wU4mzcgf1++NfgW0cWGYExct0nkFaHju5cVnaTvB4HzmDKzg4Cq1O28TATr?= =?us-ascii?Q?X4USn3zy7sXWtgf9Uu5z2mElzKwZewtnjPkzmycbpH0Z0r60xvq/hN0qU1Tz?= =?us-ascii?Q?jrCFttI7oDCmPu0rdVGSXZaBgtF5I5d9AuLrpkP+0DYcuLENGaBgSBQcsUv+?= =?us-ascii?Q?HLim8dbVhYWtnmXJbNcnrISzwFwCYfGOEaXU3y820JenKPyU1avMMQ=3D=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)(376014)(7416014)(82310400026)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jan 2025 20:25:44.1417 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b18f0bc5-2349-433e-8018-08dd3022a0d8 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: DM4PR12MB6255 Content-Type: text/plain; charset="utf-8" Restructure spectre_v1 to use select/apply functions to create consistent vulnerability handling. 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 58ac99b74bd3..3d468bd9573f 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -54,6 +54,7 @@ */ =20 static void __init spectre_v1_select_mitigation(void); +static void __init spectre_v1_apply_mitigation(void); static void __init spectre_v2_select_mitigation(void); static void __init retbleed_select_mitigation(void); static void __init spectre_v2_user_select_mitigation(void); @@ -216,6 +217,7 @@ void __init cpu_select_mitigations(void) mmio_update_mitigation(); rfds_update_mitigation(); =20 + spectre_v1_apply_mitigation(); mds_apply_mitigation(); taa_apply_mitigation(); mmio_apply_mitigation(); @@ -1000,10 +1002,14 @@ static bool smap_works_speculatively(void) =20 static void __init spectre_v1_select_mitigation(void) { - if (!boot_cpu_has_bug(X86_BUG_SPECTRE_V1) || cpu_mitigations_off()) { + if (!boot_cpu_has_bug(X86_BUG_SPECTRE_V1) || cpu_mitigations_off()) spectre_v1_mitigation =3D SPECTRE_V1_MITIGATION_NONE; +} + +static void __init spectre_v1_apply_mitigation(void) +{ + if (!boot_cpu_has_bug(X86_BUG_SPECTRE_V1) || cpu_mitigations_off()) return; - } =20 if (spectre_v1_mitigation =3D=3D SPECTRE_V1_MITIGATION_AUTO) { /* --=20 2.34.1