From nobody Fri Dec 19 19:04:52 2025 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2077.outbound.protection.outlook.com [40.107.220.77]) (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 B0AFC202F7E for ; Wed, 8 Jan 2025 20:25:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.220.77 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736367954; cv=fail; b=RmP4absnIMR6ZJTBrMYMXcTwopjHqbNyCLFtODJCNPwkUcEsH67JDqUwvwQC+l55ChfKQ3+BpByJM/dVTAAxnm0O1+cHXyLEZBwhnFWWMUGtpkAKu9cc7PFxSlATbDZtJwCt5kZot+E77SRNMIE/4bAuc1KA2gr4hIIwBuxqYb8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736367954; c=relaxed/simple; bh=NQmE5BdtD4cmtQKM5EdMHpK3BoXiX82F+mLezB3lGXU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=nNEfyrNaGPVvQkh5cH8BIuhgUbkgPpaj3qnREVLTK7OLfj6Ql1d6YlM9Q5PFxnCAn+twiCsZx7fsJ2EPQzWY/Z3WvIcpoDdnAK31TeupoZF4QwgV9j5TMMgfyaXH/hH4f4X8nDdpdqhZ8q3vstoxs+tcklmScYMdn3SUOCZ8QgE= 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=yANz5s/t; arc=fail smtp.client-ip=40.107.220.77 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="yANz5s/t" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ZuKYPInK+41VxiGXJ7Jy9nVtr94wqz56UHFm8S910ObkXR2AwF9UO+u2Ku/Rxi6qluxiCE4mqet/iJo+Kc6QCW6NSDCAhliVjPmj/pLvCwEAvQ6hCpmBuL94fBuXCHecgyirKuIndt9y1fgj1mCtKgxrwr88ijpvFGXNaTFmhXY7032Uhr+0W69joKngItCaGggt6tvqwQfKk8Qf+bXSfWd6oXQ2Bm5S6qIEqUXcfpP7q6yD22AAIAazCLUiXAkLE09G5wU0vSPe96OZfTnbSltTdMns4hk5sLkBp6LMfIgCqyPpwUT+9vk+ObmdkCcekQMl9Vu9RMTZSDBn1o7J1w== 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=40ysYLHE5ww0ypx6mYPVpVJpmLxPuV0bAyZy6lu2Qjo=; b=wZjUqvwyJhYcspMKi7AVvUUS68urZxpEcRs0EsEr+O0NojWlNrjT/Ik42YOdheNzUz8VB3xWvvDAX4y1BolCwDz4CuBi08UOqXzrudfEmyTQBem1ikZMJzvLP5OYRh5ss+da1E4OcdYhZep/1C7S2fryPcLG/vDwxgT4lueD2KcMFhLXqGOr5Z1yx9RDpxNze9yG2tFtb4emYd/TWYOoCePHe/xTpbGzNCx3Knp8VCOqV7k5vyG90lEVVvHgX0Irqqtd2hUqVWne7B5s/ewdotekJkTUL4LGPBROpvN01LPUDt2nAkfvfhpSOCPWo6TRWGBOSTDN00N1UNTBJNNMOQ== 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=40ysYLHE5ww0ypx6mYPVpVJpmLxPuV0bAyZy6lu2Qjo=; b=yANz5s/t8b6axgrYe1ZJTovzBc9refBFyDvC5D1x4in64yGyMc7IbXgSnfh0tMUTReHW41O+mrA1ugmWRGYCHB9Y7OdNtF1NSb4JwWCvOos9xy57wXOizm16gT/lLt7bffGFh02BsFEFbFILXwpyJWjS5dhlWrD7VcGRTQmmQCo= Received: from BL0PR02CA0090.namprd02.prod.outlook.com (2603:10b6:208:51::31) by CH3PR12MB8402.namprd12.prod.outlook.com (2603:10b6:610:132::12) 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:49 +0000 Received: from DS3PEPF000099DB.namprd04.prod.outlook.com (2603:10b6:208:51:cafe::4c) by BL0PR02CA0090.outlook.office365.com (2603:10b6:208:51::31) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8293.16 via Frontend Transport; Wed, 8 Jan 2025 20:25:49 +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:49 +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:48 -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 23/35] x86/bugs: Add attack vector controls for taa Date: Wed, 8 Jan 2025 14:25:03 -0600 Message-ID: <20250108202515.385902-24-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_|CH3PR12MB8402:EE_ X-MS-Office365-Filtering-Correlation-Id: 5a24c05e-ffdb-4332-96a1-08dd3022a418 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|36860700013|1800799024|376014|7416014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?d+3k2h2RVnxL3pwa9ZtIZvPd5U/0N13QY5JGeJGbUec4RT9gqBoGen8PDlBg?= =?us-ascii?Q?6eBDvhhV2hKwXpq0VlNAEMtbqjaCU6Z6jZDm2YmD2qGbPxSucKhrViPfVSHD?= =?us-ascii?Q?oU+CTPZrXhLpVnTmxsXSTAcSWHLbpsU9WMV5U9ai5OKn+xhtrBF2Y5a9nZoC?= =?us-ascii?Q?vrwOs5haM88zEtRDYN9vmkNjsieXVKfqk1ARjIrhZD+voTwBcpRZt0K2hAEG?= =?us-ascii?Q?LJ3kTSR+tXo+9XF0TMJSHQZjRitU83mSG6bM9NJbP9yxM3bG/5punqfbD3Tv?= =?us-ascii?Q?anLKo10iYBfg8NN7L1iyTuaV/Jb4u4i5vbHaHlXnUnjvV5hV4hMjsnoP/j3x?= =?us-ascii?Q?ePhJwtHYzolqbaGgg4My6mX1mZbzyYhxYgmymUFpqSJz8IgRkUeEpV3gA4fa?= =?us-ascii?Q?+uFqIawfoPv8T6cA5zIISFJBsK9NaYx6JNTEkHyQqXmpvL98tRMPKtqwpLxb?= =?us-ascii?Q?9O/yLCYW2+SZ9BAQPwbW9NHmL7Be+YcjqxUFBBgRrP2SbCtyjIpLV9WmWxVt?= =?us-ascii?Q?+YqUHhOHK/bB8xTNbH9laJH+aJ9r3xav4o+g9Ufq8a3jn14RIYF76+7cXLLS?= =?us-ascii?Q?grc0DhzHmhTPbfxpv0JB3KNFu0ZwuPrQEGnBx+m4/3llFAJGcrGs2FmnflSq?= =?us-ascii?Q?CmKgoGmcpmyF7vzD9BNKP6vgKsVZ9fZWA+SVEqdTDk2xjepH5f+TYXOQHzfL?= =?us-ascii?Q?nZfpzoku+P71JUxcbhlNbJHXBeAQ9NzANCseaKKuAoI0VBoYA+Za90QX9YwW?= =?us-ascii?Q?JhPvmy/5sAyXZwFLRlzK6ZK9Hicwt/zEynVXl8B+Xy8UQ9JMZeSXQRmmfa13?= =?us-ascii?Q?e2IZSmtwLH08FkwzKfWxySE+I32lQfjjHjbGG+T0i1F3pCOL2iqBRVevFc9c?= =?us-ascii?Q?1C8lFaGxFLo8jIaw8VIPNXq07PutmpK0fz/Z4B8yPQp2KyfeW+6ub6mJRBzu?= =?us-ascii?Q?O4/Y2wrjQ6aiViIwr3eBPxCIBQDGEeKxDzdTNrhF/GeKHDXMdicdLFYu7BPW?= =?us-ascii?Q?QE9yJprTIUdIjBYHUXE7oy/RUVC80OL24NH67HE20bEApPTAi+gwQQC8IjGF?= =?us-ascii?Q?k0cIshgp3shoegWyu/L3v4gjVg2bitUTaWstNzHAsb2yv+M5ElQsCgVSvQA7?= =?us-ascii?Q?9TyI+ck8eeiYC6wQnplYsPdB8vCxjVDBtTZuxNin3jhXiQpbGMfjvv5RtXhi?= =?us-ascii?Q?2vMoo+z84+lS4yrkgJyJJNFpHW1FiciVCIWKWmewT42jxAfxSJ4H77COTmQm?= =?us-ascii?Q?CweYDBjWtlhL7s+dptvxfF1WfTU/OaukJz4tKjUwG9i9OwZCyECDZGX8D3cA?= =?us-ascii?Q?vp+KGY1ciTPxdZBxwPZPwoqoWSXYNDdwFAVpiSUa580bzVBBNB+je6vThvd1?= =?us-ascii?Q?Fep2RJysmqxjBHh2wqlriHTC4o8kaI5SzRvqt/8qWKqeru4vPyO1EmKF8EjH?= =?us-ascii?Q?CsNBip39G8m4xqp0Du0VJFjZYtyLHufFEguKvij6B0nyNaEW0AZOa5AJgk0N?= =?us-ascii?Q?aoTFAT+E1sN7hOY=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)(82310400026)(36860700013)(1800799024)(376014)(7416014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jan 2025 20:25:49.5480 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5a24c05e-ffdb-4332-96a1-08dd3022a418 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: CH3PR12MB8402 Content-Type: text/plain; charset="utf-8" Use attack vector controls to determine if taa mitigation is required. Signed-off-by: David Kaplan --- arch/x86/kernel/cpu/bugs.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 298acb80d126..af5aaa0397c7 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -572,8 +572,12 @@ static void __init taa_select_mitigation(void) return; =20 /* Microcode will be checked in taa_update_mitigation(). */ - if (taa_mitigation =3D=3D TAA_MITIGATION_AUTO) - taa_mitigation =3D TAA_MITIGATION_VERW; + if (taa_mitigation =3D=3D TAA_MITIGATION_AUTO) { + if (should_mitigate_vuln(X86_BUG_TAA)) + taa_mitigation =3D TAA_MITIGATION_VERW; + else + taa_mitigation =3D TAA_MITIGATION_OFF; + } =20 } =20 @@ -620,7 +624,8 @@ static void __init taa_apply_mitigation(void) */ setup_force_cpu_cap(X86_FEATURE_CLEAR_CPU_BUF); =20 - if (taa_nosmt || cpu_mitigations_auto_nosmt()) + if (taa_nosmt || cpu_mitigations_auto_nosmt() || + cpu_mitigate_attack_vector(CPU_MITIGATE_CROSS_THREAD)) cpu_smt_disable(false); } =20 --=20 2.34.1