From nobody Fri Dec 19 19:04:17 2025 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2064.outbound.protection.outlook.com [40.107.93.64]) (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 0C742207DF3 for ; Wed, 8 Jan 2025 20:26:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.93.64 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736367966; cv=fail; b=H9SGjAewTuVUBxb2ewOfteB2zwmkRLjM3IeCimXa3OfgSOJdNxfj0CxDcdGAiGRgg+7JzCvg7YyxA3rGKdGOtoswdXjKg6TJkbLVydwLC/aisS1S9wTPvwkPv5l78rfJIJYzFYDtnhZtUuNFaUxkel3w0LFbhmPqbEe8NcrxOAg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736367966; c=relaxed/simple; bh=0/z4mPc4UNoXTkVUFcnM4fIS6UQt05GfGBqW8pyUB38=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=aZLW4QsKnt5xX2ZjZlP97Kw7T4hprqni0LXhvdSO8L4469XGhF6QmEvk6ROmERNqIFcyBh1qQHlCg6D/OGjB7PZn3ZmLyALvFkHCKpL8uuRAiD+XVtNKUwjq1RE0a6USEvcdvmJOxz+5EI6AMlSguou8XbF+OugpO/IGb3PTcow= 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=yrPCfKnz; arc=fail smtp.client-ip=40.107.93.64 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="yrPCfKnz" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=zLNiBFZeP+uMOv7RgWfDIiY0CaZpFdjCQWx7LWQ8rpo96Cd746QUGFYgWemoBxutwt1YpxM8x2FYaYnpeMlVMRKjyWtlnV3I5XMYJCez17La5AKPyQHljiffJTpi3QDRvHkBESyVUZri+l2jWSjV2ctXvjpdfahqbFvwf1FnGUeDNtb5nTd1qKn2bmrnao2qsb1dF/yQx7BSj25I2VKlgqYAmHtAxNHBjCFX40MCHZh7C6ouvPzZsDV34rEQycTiqnMtGtQ8OdjgOAbXYeMqVo8yh/0KZKeX1Wu0O8zrcXDWQ7SMkMKTgS/0W3chFDCAskpz9iF9aDNNC+1U1J8Qww== 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=GkJjDEPNBYXgrGl2WzyilDsupbATh4fW+dJ+sKu9yv0=; b=k9Hwh1rPs1FEKZstE3jHem6hkRZcvHODNnzRn00oVq+LDqfJ/ONjUM2UGFmFHuDZrxbAMT7RIbqWzBr0wXKs8qqaq+RUvPfcdVCelMAJflBy4U65E6fVjAPet/AMfb0VYNpomcPn47l5JCB8QHwtlT5QA4nqCbeicMgPiE76KIOYfOwxCVywjT+i3QSw0DD+WloIBHRspE3P3X/puuyHKLBErA1W55dXeo57CBTMf0XQEJIYhdZYfTEJWDav/VFH1KbryFNILQKFaivH7mrhHAUlhKGFiP9CXLTLwdQXJm8dTS4hZbQ88knmcFDwQTL/uOmWPIA0aSaGkbTXXyHM7Q== 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=GkJjDEPNBYXgrGl2WzyilDsupbATh4fW+dJ+sKu9yv0=; b=yrPCfKnzhp8GJ4e+Gw82cxV/Osal6XjJFZ6gDwWtIaq/f0I+tyIISSXF3G/NZ5PUnS6WrDC4Y/jrsYid7lsTECLQz3PSwqZ/GrSp5XwVWk/qqibjKF6bIyHRMeO/kdyRRgk66PaVQ4InNIZe77QTE5TTAYcxIQbOtwmR2JiFsb4= Received: from SA9PR11CA0012.namprd11.prod.outlook.com (2603:10b6:806:6e::17) by PH0PR12MB7487.namprd12.prod.outlook.com (2603:10b6:510:1e9::5) 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:58 +0000 Received: from DS3PEPF000099E2.namprd04.prod.outlook.com (2603:10b6:806:6e:cafe::14) by SA9PR11CA0012.outlook.office365.com (2603:10b6:806:6e::17) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8335.11 via Frontend Transport; Wed, 8 Jan 2025 20:25:58 +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:58 +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:53 -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 32/35] x86/bugs: Add attack vector controls for spectre_v2 Date: Wed, 8 Jan 2025 14:25:12 -0600 Message-ID: <20250108202515.385902-33-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_|PH0PR12MB7487:EE_ X-MS-Office365-Filtering-Correlation-Id: 78f35c6d-0ada-4d78-7220-08dd3022a935 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|36860700013|1800799024|376014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?fCS7Ne4k8VhRiRmRvbKqYud4mxZDpIq5nu/AJbzblzOkMi2KyRd1QV1ctR2g?= =?us-ascii?Q?9UMgEPPkckDMMNz5/ZBNjrJbme/blTrabLchgwTmdtHRzFbkGd/+/i4sLr/C?= =?us-ascii?Q?d02rqsKdvDpvxhda6RMzTBGB2r3DTc005WvY8GDa2XKgmiKaAg/f4zQ68P6L?= =?us-ascii?Q?3zt0YxsRTNysPaGts1WQaRvz4HaOQNg3yw4IDUIpjaEWqT7zvGZekXjwTTlA?= =?us-ascii?Q?0EhjYooFC3bjw2ZMPw2SiQnoKWQe9L8IWbb33OhIpBw/Nh7KvbWLSHAB7f0a?= =?us-ascii?Q?9GnsjiGcqfMzWlPYPSqMsG1psJ/b4fy7JdGrSAlxivrDW6OqpWP2TUtoGGYB?= =?us-ascii?Q?zt/XYXqLKtNr4wRCFtuKYmMp/nppW3ALFw6mNaUp1Ig5te1FNZEMtbkk/8lR?= =?us-ascii?Q?fzAxfk8cdvzHEb0gKVg39oomROjPOchSpAJ786F1MlRkW6cWK3nK/6P7iUbM?= =?us-ascii?Q?BP9mq6uE4iskfBR0LXqHoqoo0lG9tonIFmf3wsAYOpYjfVt49xf8/Z97HzJh?= =?us-ascii?Q?t8hqh+clJNmUHkEYFHxBSmIP34Xj7iJJ0P1GDkX6LOHYx118Auy8ASKLHit0?= =?us-ascii?Q?QXkkb6tuulRE9JlLH9D9Yccx0MbNJF1+eTQMgOmxZt3ylXfE6JkFzvIoy/fD?= =?us-ascii?Q?IGyaBhFUqONfzxTpBsbzXSTP/UgdpG4nNa68mh7S2Bs3wANsqN63v2gHHsfP?= =?us-ascii?Q?GynrZETFcWnxc09qYa/gfZSA2w3g72yoV+Hi1VdgYmuBOIgpdaS1yZHRT2NV?= =?us-ascii?Q?iL2dkja+MQZNU9mb8TLHJmnvwtaATEKp4Xg6PKJpsmkD4ypHFxWpdPONXZpb?= =?us-ascii?Q?kD3k9gg9xJbmGGZVxgjQQR0EmL5lOBRUOeZa90KD7lsV00btj/BiAONk4w9M?= =?us-ascii?Q?z8spvEiztHZymd7a2Y/kOxDp9ovQq31T6DTgWmFmY6QnFORJU/Gh5e70tEoF?= =?us-ascii?Q?CvsAY7lzmZaWFuHrHAGaQud/r7IUKYPNOTBKXrlNBGrr/q4uhLT3SHfP3OWt?= =?us-ascii?Q?VZgn0f8SWoKduv6ILSrkcM07hpn9/UD6Q/AOQfirLJzbc5CDLI98P4LYw8vQ?= =?us-ascii?Q?dL+DFgPiZkguRrG9zJT4hEr+sMOlIac3/4jHW8NrMr4gqF7ITFnYWkPvHLbZ?= =?us-ascii?Q?8KBjpDqR1rjRmACaoMXf8VnOxgcbnC4+WCQiv/WBVbWIQlH7DftCxrjRKPH3?= =?us-ascii?Q?OVKhsLqwTe63eas3zn+wjiRSHyyENGz7qIiWUiEQ9Ru5MAhxQlkeYZLWc6xf?= =?us-ascii?Q?RHAw3FRNPaf3Q97k2qbrGF3FaFYwUDAUYSEophYScLrGN1ijtEHVDX81M3pd?= =?us-ascii?Q?zLw1ExlEZcMptN6fKXy/qiEN9H/cu0Wn7IyKgH08BR+Sh4ltgIdhI7NjqOVT?= =?us-ascii?Q?zeafM9wSs+MNoVWtwcSF6gFmvyQAxNiKn2T2hTvRSkLnfGEfB3MYHbcgLRkM?= =?us-ascii?Q?dPmU3yiO53qkjSzh2iqgPzxjOqzM6EhfdlY/HAfid9nGo5xtOsWzc9PjZY8V?= =?us-ascii?Q?SM0TMC0yoBYHDKo=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)(36860700013)(1800799024)(376014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jan 2025 20:25:58.1258 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 78f35c6d-0ada-4d78-7220-08dd3022a935 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: PH0PR12MB7487 Content-Type: text/plain; charset="utf-8" Use attack vector controls to determine if spectre_v2 mitigation is required. Signed-off-by: David Kaplan --- arch/x86/kernel/cpu/bugs.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 57c762d86fca..662573ad3e51 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -2041,13 +2041,15 @@ static void __init spectre_v2_select_mitigation(voi= d) case SPECTRE_V2_CMD_NONE: return; =20 - case SPECTRE_V2_CMD_FORCE: case SPECTRE_V2_CMD_AUTO: + if (!should_mitigate_vuln(X86_BUG_SPECTRE_V2)) + break; + fallthrough; + case SPECTRE_V2_CMD_FORCE: if (boot_cpu_has(X86_FEATURE_IBRS_ENHANCED)) { mode =3D SPECTRE_V2_EIBRS; break; } - mode =3D spectre_v2_select_retpoline(); break; =20 --=20 2.34.1