From nobody Fri Dec 19 19:05:00 2025 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2050.outbound.protection.outlook.com [40.107.243.50]) (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 0616D202F6D for ; Wed, 8 Jan 2025 20:25:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.243.50 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736367945; cv=fail; b=kbeBYi02rtaE+zAJfCop+6RrDvvK5EAidw9jwvyyGZej0x9o4GNCA+RcyGHog9vB+j0RItWUVfJh7vNx9ncDwBIvkX9fvUv8+5DnIs9gJVaGVVeKxKFZeHE5DcDhuFHBEwBBRtZ4qf66+7AIAE1iu7Zy9Jx73ClC/8Ia0HYiz7s= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736367945; c=relaxed/simple; bh=+yL3eif1XNCfcchCTPLyngk+fcFzcpPHTFKiylpXsws=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=POZ94ZaBaA9I2fXwCsfQI/z7xMnYAu27j+lm5VGO8LnzOpsWVaMivrk++lFGL9nQl3MDj1pFv29G/RAPB5xmmHL6KjqWPmbhL7AT4Sk5rl3Ny7z1k0syLc+GIjMgTO/SVkxBxMr15XuC8mSk7y+GdUgWlHQZpt6bRbnsT7oAzrQ= 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=xHh2U/g0; arc=fail smtp.client-ip=40.107.243.50 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="xHh2U/g0" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=qwrGavGgThhwGQjXRYYZ/zdpb3HxtEoT614Q3tlw5JPgj1j/XN+EKBBVP6aiXFTzpu6/wVerR+REg8auQ1wmH8crwrG1r7ignvDonKWkMMPV45tNvuqHzg/qfCY06VkWwhzzdsZvJ1KX5DhWaCd7lqz8Rn1cuT1w8mVSAExkHlY4otdendYETYk4MDOvl5g9f06S+Pmhjk+htfMWkDIkePzzhEo+oOLbaSRe5VJGUngT/OwhWGKz2EL40jvaTRvo2vNGd7fhtf5676m0vNQgmYM+lx8uHMoHeVnazyLdtBWMWGKrjpjTAh9Fli0Fjnd8IeQXjT3cpMZ9tDI1JZOv3g== 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=ZQBL8e2jfE3vTGU+hFATX1tn2sBvYOEA0RiXFwV6L6I=; b=ZrUlCqSt/eyTx7v5QWkMAPi5gpYIHJaOahUGBMqUJ+mcrucG9RIi+Wpw+76KbPK26OA6ZJMKgaLIPJ03MMgait9iSAoU7Dnk9ELgOugmoVe0fR32xQSlp6IDiuadpffOp5Tzrb3yl7lh5k6HJ5ToNDAaHDA4QGwHueTjXkJgnNWAW2BaS4mDcGvzr7zkteCC83/BrFAkIPqHeC9y9XxzR66Sppew/n1sxHKGzY44FfWSwx6kvbfjRgUhqu6B5Kr3cCX8xWeiWGIGYE8ItuIDLSgUNDmsL9cRYHt//yzSYPhwEYTtjuCEbV+C45TKK1vc98UBwkeErvLX6BEvW2REZA== 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=ZQBL8e2jfE3vTGU+hFATX1tn2sBvYOEA0RiXFwV6L6I=; b=xHh2U/g04zgKtOqVrfXg5zZUZkpD9uduG61bAAOpdTX3Z/eo5v0jcME8inJ48y1uSKvv6uOQe4wnv5HcgHDip80bgZi9+ots/iCOC6xwVA+GgLV/CnvGiuIKhZzC38BlTgQJueCUof/Uc6WwBpvmH1WMP7UYTqd9mibUUAIp+aU= Received: from BL0PR02CA0094.namprd02.prod.outlook.com (2603:10b6:208:51::35) by CH3PR12MB9078.namprd12.prod.outlook.com (2603:10b6:610:196::11) 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:39 +0000 Received: from DS3PEPF000099DB.namprd04.prod.outlook.com (2603:10b6:208:51:cafe::24) by BL0PR02CA0094.outlook.office365.com (2603:10b6:208:51::35) 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:39 +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 03/35] x86/bugs: Add AUTO mitigations for mds/taa/mmio/rfds Date: Wed, 8 Jan 2025 14:24:43 -0600 Message-ID: <20250108202515.385902-4-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_|CH3PR12MB9078:EE_ X-MS-Office365-Filtering-Correlation-Id: 17506495-b1bf-47d5-edd1-08dd30229e1d 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?w1wSqxuZkQr96Yk24fHfnmElJ7ClqxNDUcsaArV3pZ2Qztqt6CToXqBV2FNF?= =?us-ascii?Q?X1K2zOH3Zm6sWVneBbz4W+zQ9x/xEmQre4zlK8hXK5nFRTvkpiAgmqzv+9BI?= =?us-ascii?Q?IzLiWiJgxClfoTD+sSa9+WoALMRL2RdMNT4pmgJxoRUArxlyq8MDMrkv9lJk?= =?us-ascii?Q?lOJd/tEgUqPUCwOzxo5/ZtpNo6ajBNv6Ml0v6MiTCzXH4kcR34jwJGZQ25NR?= =?us-ascii?Q?FxIs3qwgFj4l1XRtw9opEjFuyeLkt2G0KtrUVgN3P8fi24drqq2YPgN5q9VT?= =?us-ascii?Q?ErxdBw7YYZUpouBUsZ/Qyvs1Zu1Di8bxH93Xd8vpDfBcF1uTw5apCt6S+fk1?= =?us-ascii?Q?dSb+Vl/gZpPL0gylR92sL9TuwwyR+UFM0APKvuHOTgllMdtz0POc12Btl62z?= =?us-ascii?Q?r7TCg3WWnaEPpf5SjkQL5ouwK9t93N0xkvIYrjHls+2AHOcZVu5da7I7BG/5?= =?us-ascii?Q?5Ift/97osaipmlEAr1yBvQkFJc6EDx1do0/r0HX6HL0yfv/W422o1GZ/cV36?= =?us-ascii?Q?uaIAXEUCDZangXdpSJUFkMLIP/gzxAy5MtsYqZfTuhMhomQThy/uw7lXuHOH?= =?us-ascii?Q?2wpy/0yZTzIZdpH0yxkFlYIIa3Y052SfxesVLi9DgGNyixxLji2tpLR75Wmt?= =?us-ascii?Q?K/U0/heeU2UboALnqAJj6+5jPerIAzRLxgQaddVwrBcf64mTu18Oqu04uLgB?= =?us-ascii?Q?PizOYqIPpcIGS3w2cYe2Zgd4dBHv1L6b9KcqtT7Ui2STKhROga17IqOnoYtH?= =?us-ascii?Q?eTWJEVnyTLENOC9yxwg64OD3AvR0Jt+8BOpjefREbe53jqm8sa27VlWk5J/K?= =?us-ascii?Q?ewczPdI4Y5deMhtojf3ylzAiFHdP1a71MQohwFOgyWjRPo9OhI6Kqk0YK6f0?= =?us-ascii?Q?mzglG+hsyrFSqGXxs6LwNYDPBKRahL7TYEzkdfBAQF1ofliduoNn2IydIZcC?= =?us-ascii?Q?v1gm7AT0awmR9KFD8Hp/bYSt+uYVQS9Y/HBOqOLbtTa9I8WQ7aIO1XBtKZcB?= =?us-ascii?Q?DhFnkbkB1cW+a8nbBDdjcT7QNr95doCucw6eDUSaNtiC0xVDdIePsFHSJ3CD?= =?us-ascii?Q?dhO+fOXZ8iC10EoMHBQ8lq7FS/+8tondqLMDCdDUHElMfrpQIS5dVnfYYsnb?= =?us-ascii?Q?EYSesPcZqR9n+uWG2H6IRRhCtotQd9Y0JiCS6bMrfTPAaXLh3qTZLQjbVnoR?= =?us-ascii?Q?Cq9YYpTnzJmmjNMsbGGOCbVEAOLiyJe4xAV+3Vc9+g+GVkZX8Dz98eRHcbaO?= =?us-ascii?Q?R8oFssvupwuGY8RfbNXGts0/HQN0P/65jq6HKBwPNdjWLM/+ARbpxWIVpIgv?= =?us-ascii?Q?DUjcWhd9x/cnoDDpFc5YqdGAw66W19liybQK+53085rAzE/3zn5wFD3NRfFL?= =?us-ascii?Q?n4MGg1UYDjGCre0ghYdIAGopzIZIr8DoTz8jdJnrRGeWe0GwgEGLN7j7aG7H?= =?us-ascii?Q?EMjTpmYvVzy3k2rFAnztgT9naHUgfOzRe+k+EzkhhTDagYriCyVgzV0VKgBr?= =?us-ascii?Q?ZjScvlmg9mgu2xU=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:25:39.5167 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 17506495-b1bf-47d5-edd1-08dd30229e1d 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: CH3PR12MB9078 Content-Type: text/plain; charset="utf-8" Add AUTO mitigations for mds/taa/mmio/rfds to create consistent vulnerability handling. These AUTO mitigations will be turned into the appropriate default mitigations in the _select_mitigation() functions. In a later patch, these will be used with the new attack vector controls to help select appropriate mitigations. Signed-off-by: David Kaplan --- arch/x86/include/asm/processor.h | 1 + arch/x86/kernel/cpu/bugs.c | 20 ++++++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/proces= sor.h index c0cd10182e90..90278d0c071b 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -757,6 +757,7 @@ extern enum l1tf_mitigations l1tf_mitigation; =20 enum mds_mitigations { MDS_MITIGATION_OFF, + MDS_MITIGATION_AUTO, MDS_MITIGATION_FULL, MDS_MITIGATION_VMWERV, }; diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index bbe4c772e557..592d40551432 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -234,7 +234,7 @@ static void x86_amd_ssb_disable(void) =20 /* Default mitigation for MDS-affected CPUs */ static enum mds_mitigations mds_mitigation __ro_after_init =3D - IS_ENABLED(CONFIG_MITIGATION_MDS) ? MDS_MITIGATION_FULL : MDS_MITIGATION_= OFF; + IS_ENABLED(CONFIG_MITIGATION_MDS) ? MDS_MITIGATION_AUTO : MDS_MITIGATION_= OFF; static bool mds_nosmt __ro_after_init =3D false; =20 static const char * const mds_strings[] =3D { @@ -245,6 +245,7 @@ static const char * const mds_strings[] =3D { =20 enum taa_mitigations { TAA_MITIGATION_OFF, + TAA_MITIGATION_AUTO, TAA_MITIGATION_UCODE_NEEDED, TAA_MITIGATION_VERW, TAA_MITIGATION_TSX_DISABLED, @@ -252,27 +253,29 @@ enum taa_mitigations { =20 /* 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; + IS_ENABLED(CONFIG_MITIGATION_TAA) ? TAA_MITIGATION_AUTO : TAA_MITIGATION_= OFF; =20 enum mmio_mitigations { MMIO_MITIGATION_OFF, + MMIO_MITIGATION_AUTO, MMIO_MITIGATION_UCODE_NEEDED, MMIO_MITIGATION_VERW, }; =20 /* 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; + IS_ENABLED(CONFIG_MITIGATION_MMIO_STALE_DATA) ? MMIO_MITIGATION_AUTO : MM= IO_MITIGATION_OFF; =20 enum rfds_mitigations { RFDS_MITIGATION_OFF, + RFDS_MITIGATION_AUTO, RFDS_MITIGATION_VERW, RFDS_MITIGATION_UCODE_NEEDED, }; =20 /* 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; + IS_ENABLED(CONFIG_MITIGATION_RFDS) ? RFDS_MITIGATION_AUTO : RFDS_MITIGATI= ON_OFF; =20 static void __init mds_select_mitigation(void) { @@ -281,6 +284,9 @@ static void __init mds_select_mitigation(void) return; } =20 + if (mds_mitigation =3D=3D MDS_MITIGATION_AUTO) + mds_mitigation =3D MDS_MITIGATION_FULL; + if (mds_mitigation =3D=3D MDS_MITIGATION_FULL) { if (!boot_cpu_has(X86_FEATURE_MD_CLEAR)) mds_mitigation =3D MDS_MITIGATION_VMWERV; @@ -510,6 +516,9 @@ static void __init rfds_select_mitigation(void) if (rfds_mitigation =3D=3D RFDS_MITIGATION_OFF) return; =20 + if (rfds_mitigation =3D=3D RFDS_MITIGATION_AUTO) + rfds_mitigation =3D RFDS_MITIGATION_VERW; + if (x86_arch_cap_msr & ARCH_CAP_RFDS_CLEAR) setup_force_cpu_cap(X86_FEATURE_CLEAR_CPU_BUF); else @@ -1976,6 +1985,7 @@ void cpu_bugs_smt_update(void) =20 switch (mds_mitigation) { case MDS_MITIGATION_FULL: + case MDS_MITIGATION_AUTO: case MDS_MITIGATION_VMWERV: if (sched_smt_active() && !boot_cpu_has(X86_BUG_MSBDS_ONLY)) pr_warn_once(MDS_MSG_SMT); @@ -1987,6 +1997,7 @@ void cpu_bugs_smt_update(void) =20 switch (taa_mitigation) { case TAA_MITIGATION_VERW: + case TAA_MITIGATION_AUTO: case TAA_MITIGATION_UCODE_NEEDED: if (sched_smt_active()) pr_warn_once(TAA_MSG_SMT); @@ -1998,6 +2009,7 @@ void cpu_bugs_smt_update(void) =20 switch (mmio_mitigation) { case MMIO_MITIGATION_VERW: + case MMIO_MITIGATION_AUTO: case MMIO_MITIGATION_UCODE_NEEDED: if (sched_smt_active()) pr_warn_once(MMIO_MSG_SMT); --=20 2.34.1