From nobody Wed Dec 17 08:54:38 2025 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2087.outbound.protection.outlook.com [40.107.92.87]) (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 867E02367B1 for ; Fri, 9 May 2025 16:28:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.92.87 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746808137; cv=fail; b=OtLCk0ywc1Q9rnm90EFEgV0ObLwnkK27Jm3Ook8DKklkdU7rv2Xekvcjr5E2iRku8kQxt//pzrozi4umRvqIWbMkJzXdI/ty8KXQG2jOQKRroueaCQU3M7nzTcRoTC/rFiC0nGj9DeEnp79It3rwkv+kG3UAlOPbp5MSUtr1Bis= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746808137; c=relaxed/simple; bh=jYcssKKBXnZTUIw5OqYH9PKS0jdygOWEc3YSudjHe2c=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=JB2ghj+B/QT2UMHxgHcbbouB6QgTN/St+dmErJaNC4++rIWsTpdUbe9ihKuEVQ9cwzkztPMgEuYOogYx9NXfEd6lasf7ocV1/HAiFkjB88fikcuyzqv1YBQE4PIFOK24bvW+6kfv7+tYws9d2ter0eWk3pbGOf2YTSbnRYo1gH0= 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=LxHljjBM; arc=fail smtp.client-ip=40.107.92.87 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="LxHljjBM" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=MvgeMQkVA0JnOQr1C0B8AE2rmUtDDYW8JJS12n8tGyLm4jxGdQwvoPNFG0Kwx5wQDnBzcffWSZ+iH81y2uCFd2vjeKkye3zuiK9n5oIQujHeT1PY7zKyR+2RqWMFts8C+P3cTWg0hMvfD+KTZ2PXWDw1w2Zm4fOJyF4ZGJEW590XHB74w+TQCPWmFNT8J2BqPiz4EJvrvcnyy+RGHqdElOMcEcdvWUlgHdrqecWWcZY7SA16QC9lh816NqcgqqHI4j0pT/0ZWlpvcK+r7RZWlWPh42j7VAipkkblGActTrQ83wxNiJNm+5+rX4oryB0D8dwZN0Qhbw64aYjBwFocwQ== 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=vvD1aVn2SBy0hpGCh8CWS+D+NofeJTTE2OS4zMeoulc=; b=Txvj0ZNSlxDLZEI13ZKYnkK5oOn0aPzswpL5kezc8cRKccVDlDOY7tOZMemaLe602SySEmSF6o5VtLY2lqd/CC59+bOxWSzzL9wik7xMcyqsrTcQudh6qq76h3B14Ge2FZxMSS7QaSnwKzaPCztPE09yQ5i3AdrXxHFEP0EyPHFi/5TdWkyh/x1V5IdctAnftb+zLBXCd/5Cw6Ah4X0Nkb6tByCfhB9yfv3Jy5/o5TnOjjcNVnVdPOHXSWX8lymbLoMmiYE+5GxwjiRElSuU29hKcFz/TUZLbf/eWCk4/jYsB5vgYq7xiI+RvMWwiXB5dJvfUyKlbJZy3PM/14Wa+w== 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=vvD1aVn2SBy0hpGCh8CWS+D+NofeJTTE2OS4zMeoulc=; b=LxHljjBMoJe0mKu+gxqZdoTuFNnrqCv2K1gHJG6oPiNnm3scFAY23hzP9T/gDELSLF1eIiux238HF5tuRsV5Htw8Ik/eBOKiJABI8+xK4DEEThCtXapL+SB5PZQ7uPpoOmsDxXYW0wSuX6Ru3NLeZFYTEXnAcrPS1x49QFandAU= Received: from BL1PR13CA0111.namprd13.prod.outlook.com (2603:10b6:208:2b9::26) by MW3PR12MB4475.namprd12.prod.outlook.com (2603:10b6:303:55::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8722.20; Fri, 9 May 2025 16:28:51 +0000 Received: from BN3PEPF0000B074.namprd04.prod.outlook.com (2603:10b6:208:2b9:cafe::4b) by BL1PR13CA0111.outlook.office365.com (2603:10b6:208:2b9::26) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8722.20 via Frontend Transport; Fri, 9 May 2025 16:28:50 +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 BN3PEPF0000B074.mail.protection.outlook.com (10.167.243.119) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8722.18 via Frontend Transport; Fri, 9 May 2025 16:28:50 +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; Fri, 9 May 2025 11:28:49 -0500 From: David Kaplan To: Thomas Gleixner , Borislav Petkov , Peter Zijlstra , Josh Poimboeuf , Pawan Gupta , Ingo Molnar , Dave Hansen , , "H . Peter Anvin" CC: Subject: [PATCH v5 01/20] Documentation/x86: Document new attack vector controls Date: Fri, 9 May 2025 11:28:20 -0500 Message-ID: <20250509162839.3057217-2-david.kaplan@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250509162839.3057217-1-david.kaplan@amd.com> References: <20250509162839.3057217-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: BN3PEPF0000B074:EE_|MW3PR12MB4475:EE_ X-MS-Office365-Filtering-Correlation-Id: be62daf6-b6dc-4d08-1dcc-08dd8f1694f8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|1800799024|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?yD2FYX3b5J2SmRLAA+IT2KdQExE8UvGzC6NXUbIl6Bxw1GZaJBI1p9YWWYMp?= =?us-ascii?Q?mprol5NsZbpq8fhyRvIrDVw9fvZR8Hxbr4YWniFxQSPjI239BIkCx2LVd8kV?= =?us-ascii?Q?jSlKJahVRlcdKXiilka2S4rmDXzW0yJSRsD8cd9iHVxaeVhYtKP+Z4HWv+Tu?= =?us-ascii?Q?MR4J4745GGLeCaj+ehvo0iz8FWZsHpSgp3KgrJlXYKH75S85uGXbcsSsJQbE?= =?us-ascii?Q?9OaJpzyDWKBqrMY9G6O2ZkA+1zo26Pzv6M+PYp2QJOj/yrL3DCeDqe+RPVvl?= =?us-ascii?Q?rDDtTdzTdSBOn1DMlFkf4D8U7gZM2TNv0xjnjn9JaS9829c1bVp7wSvbMgjN?= =?us-ascii?Q?x2bh+Z1UZ60e4p/W0R3nxX3PnlcX86Jwm6IvZ0Xl77tNWuBlflRpSYUsuasK?= =?us-ascii?Q?sbp0vUz6amrT7DyMMR1oYwX61bdvIeTdWtf8imXOvvc/2rmTiVAArbc/5bj/?= =?us-ascii?Q?RbXtPAlRY+vH1KObtVKKhddnN9dxSPLcFXL9S3A4pdL/WH+NQbBJLsKgeOpy?= =?us-ascii?Q?Dz8KhLg11iYzEvblOjTA5toFL35kFP6eX2st/gvG01mFdTU6DZZSqGj4cG0G?= =?us-ascii?Q?BkNxZkwa4Wz3oL5i3+nPiNTf/lqNaDaA9qVVYrNr4hac0DRF8p9XxpgGrj76?= =?us-ascii?Q?EpWHwEY9f1pD3Zb+JX8+CYaMkiPDJe3aiaKxsDDYWQwejlGRvDcG1N0c6uNE?= =?us-ascii?Q?efRj5wnHG7e3Y56lLxytB6eheg7CdLQSosdC1XdNiGMYwm13DYhR1D/N+YC6?= =?us-ascii?Q?qw9IsxWDPv7cgDTu9j8LwK13uBFBAyEAhD0vUf47dwB26lEmV9zFn8B8E78t?= =?us-ascii?Q?qrtTVV8AaTn+D/RIfdV3+HknXLHdYmoOo3CtsTlPBMYQ/WUiLZ/wGe9cKMjT?= =?us-ascii?Q?IFPJ5M/B26jLyQDm2SQMG6+sMOr7LiR70IPZmPesAhw4FMsDvi0rrMYA6vEI?= =?us-ascii?Q?27qqg1sfjEhH9zaelfYCzFfqJmUmCjFsKANxWIWgE/lVgZfAxgPwEJO+PD+U?= =?us-ascii?Q?2TSLhFcY9R2dEwOkYnDBarRrPnXE6dzhnneDexZRhptvTv+yoDBANDmshDts?= =?us-ascii?Q?6hLZHljrbnNn+sX6MdLQuKJ4RrETJcKggWfHx0wTbhMXz/cetfuIMCnsexSp?= =?us-ascii?Q?roWETcFxvu44xs7ZE7Dtu7ojwGwt+qBXq/3v/MTh6RMd6mxf3gM6NioD90fK?= =?us-ascii?Q?fcx8S6iUt52mTrXzkVPfyThvN5XGxutCTd6Ewx0/kD/0dqO9yWdi1WTeaeVn?= =?us-ascii?Q?cq76n7t6e/f8i/w9fGsGADD9U55IEC+9GOkrg1u7f8Zeww8h+Q5/E55cUnsE?= =?us-ascii?Q?xpf8Dpu75dUGpFyjNpbWgt1Cw0aIRpKZQWm3t4EjWw4jN4RcBVt7NtO/vx54?= =?us-ascii?Q?RdLd1i0LqXQTeSbfeMfq87GdERiBFZ/AmY7YLHYDXaKqGQacA1sQhzIWAvir?= =?us-ascii?Q?TJ38Y1smk4nHxfOi/SwWhxGfyD0plG4GBZnI6yCNj6nJ5YTWYJVkY9XvAdHM?= =?us-ascii?Q?XNx6EkX6kyHasRNDtO7p2VcBpKxACIf5nCF9?= 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)(1800799024)(82310400026)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2025 16:28:50.7309 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: be62daf6-b6dc-4d08-1dcc-08dd8f1694f8 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: BN3PEPF0000B074.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR12MB4475 Content-Type: text/plain; charset="utf-8" Document the 5 new attack vector command line options, how they interact with existing vulnerability controls, and recommendations on when they can be disabled. Note that while mitigating against untrusted userspace requires both user-to-kernel and user-to-user protection, these are kept separate. The kernel can control what code executes inside of it and that may affect the risk associated with vulnerabilities especially if new kernel mitigations are implemented. The same isn't typically true of userspace. In other words, the risk associated with user-to-user or guest-to-guest attacks is unlikely to change over time. While the risk associated with user-to-kernel or guest-to-host attacks may change. Therefore, these controls are separated. Signed-off-by: David Kaplan --- .../hw-vuln/attack_vector_controls.rst | 236 ++++++++++++++++++ Documentation/admin-guide/hw-vuln/index.rst | 1 + .../admin-guide/kernel-parameters.txt | 4 + 3 files changed, 241 insertions(+) create mode 100644 Documentation/admin-guide/hw-vuln/attack_vector_control= s.rst diff --git a/Documentation/admin-guide/hw-vuln/attack_vector_controls.rst b= /Documentation/admin-guide/hw-vuln/attack_vector_controls.rst new file mode 100644 index 000000000000..d4ab8b3fe52e --- /dev/null +++ b/Documentation/admin-guide/hw-vuln/attack_vector_controls.rst @@ -0,0 +1,236 @@ +.. SPDX-License-Identifier: GPL-2.0 + +Attack Vector Controls +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +Attack vector controls provide a simple method to configure only the mitig= ations +for CPU vulnerabilities which are relevant given the intended use of a sys= tem. +Administrators are encouraged to consider which attack vectors are relevan= t and +disable all others in order to recoup system performance. + +When new relevant CPU vulnerabilities are found, they will be added to the= se +attack vector controls so administrators will likely not need to reconfigu= re +their command line parameters as mitigations will continue to be correctly +applied based on the chosen attack vector controls. + +Attack Vectors +-------------- + +There are 5 sets of attack-vector mitigations currently supported by the k= ernel: + +#. :ref:`user_kernel` +#. :ref:`user_user` +#. :ref:`guest_host` +#. :ref:`guest_guest` +#. :ref:`smt` + +To control the enabled attack vectors, see :ref:`cmdline`. + +.. _user_kernel: + +User-to-Kernel +^^^^^^^^^^^^^^ + +The user-to-kernel attack vector involves a malicious userspace program +attempting to leak kernel data into userspace by exploiting a CPU vulnerab= ility. +The kernel data involved might be limited to certain kernel memory, or inc= lude +all memory in the system, depending on the vulnerability exploited. + +If no untrusted userspace applications are being run, such as with single-= user +systems, consider disabling user-to-kernel mitigations. + +Note that the CPU vulnerabilities mitigated by Linux have generally not be= en +shown to be exploitable from browser-based sandboxes. User-to-kernel +mitigations are therefore mostly relevant if unknown userspace application= s may +be run by untrusted users. + +*user-to-kernel mitigations are enabled by default* + +.. _user_user: + +User-to-User +^^^^^^^^^^^^ + +The user-to-user attack vector involves a malicious userspace program atte= mpting +to influence the behavior of another unsuspecting userspace program in ord= er to +exfiltrate data. The vulnerability of a userspace program is based on the +program itself and the interfaces it provides. + +If no untrusted userspace applications are being run, consider disabling +user-to-user mitigations. + +Note that because the Linux kernel contains a mapping of all physical memo= ry, +preventing a malicious userspace program from leaking data from another +userspace program requires mitigating user-to-kernel attacks as well for +complete protection. + +*user-to-user mitigations are enabled by default* + +.. _guest_host: + +Guest-to-Host +^^^^^^^^^^^^^ + +The guest-to-host attack vector involves a malicious VM attempting to leak +hypervisor data into the VM. The data involved may be limited, or may +potentially include all memory in the system, depending on the vulnerabili= ty +exploited. + +If no untrusted VMs are being run, consider disabling guest-to-host mitiga= tions. + +*guest-to-host mitigations are enabled by default if KVM support is presen= t* + +.. _guest_guest: + +Guest-to-Guest +^^^^^^^^^^^^^^ + +The guest-to-guest attack vector involves a malicious VM attempting to inf= luence +the behavior of another unsuspecting VM in order to exfiltrate data. The +vulnerability of a VM is based on the code inside the VM itself and the +interfaces it provides. + +If no untrusted VMs, or only a single VM is being run, consider disabling +guest-to-guest mitigations. + +Similar to the user-to-user attack vector, preventing a malicious VM from +leaking data from another VM requires mitigating guest-to-host attacks as = well +due to the Linux kernel phys map. + +*guest-to-guest mitigations are enabled by default if KVM support is prese= nt* + +.. _smt: + +Cross-Thread +^^^^^^^^^^^^ + +The cross-thread attack vector involves a malicious userspace program or +malicious VM either observing or attempting to influence the behavior of c= ode +running on the SMT sibling thread in order to exfiltrate data. + +Many cross-thread attacks can only be mitigated if SMT is disabled, which = will +result in reduced CPU core count and reduced performance. + +If cross-thread mitigations are fully enabled ('auto,nosmt'), all mitigati= ons +for cross-thread attacks will be enabled. SMT may be disabled depending on +which vulnerabilities are present in the CPU. + +If cross-thread mitigations are partially enabled ('auto'), mitigations for +cross-thread attacks will be enabled but SMT will not be disabled. + +If cross-thread mitigations are disabled, no mitigations for cross-thread +attacks will be enabled. + +Cross-thread mitigation may not be required if core-scheduling or similar +techniques are used to prevent untrusted workloads from running on SMT sib= lings. + +*cross-thread mitigations default to partially enabled* + +.. _cmdline: + +Command Line Controls +--------------------- + +Attack vectors are controlled through the mitigations=3D command line opti= on. The +value provided begins with a global option and then may optionally include= one +or more options to disable various attack vectors. + +Format: + | ``mitigations=3D[global]`` + | ``mitigations=3D[global];[attack vectors]`` + +Global options: + +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +Option Description +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +'off' All attack vectors disabled. +'auto' All attack vectors enabled, partial cross-thread mitigations. +'auto,nosmt' All attack vectors enabled, full cross-thread mitigations. +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +Attack vector options: + +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D +Option Description +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D +'no_user_kernel' Disables user-to-kernel mitigations. +'no_user_user' Disables user-to-user mitigations. +'no_guest_host' Disables guest-to-host mitigations. +'no_guest_guest' Disables guest-to-guest mitigations +'no_cross_thread' Disables all cross-thread mitigations. +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D + +Multiple attack vector options may be specified in a comma-separated list.= If +the global option is not specified, it defaults to 'auto'. The global opt= ion +'off' is equivalent to disabling all attack vectors. + +Examples: + | ``mitigations=3Dauto;no_user_kernel`` + + Enable all attack vectors except user-to-kernel. Partial cross-thread + mitigations. + + | ``mitigations=3Dauto,nosmt;no_guest_host,no_guest_guest`` + + Enable all attack vectors and cross-thread mitigations except for + guest-to-host and guest-to-guest mitigations. + + | ``mitigations=3D;no_cross_thread`` + + Enable all attack vectors but not cross-thread mitigations. + +Interactions with command-line options +-------------------------------------- + +Vulnerability-specific controls (e.g. "retbleed=3Doff") take precedence ov= er all +attack vector controls. Mitigations for individual vulnerabilities may be +turned on or off via their command-line options regardless of the attack v= ector +controls. + +Summary of attack-vector mitigations +------------------------------------ + +When a vulnerability is mitigated due to an attack-vector control, the def= ault +mitigation option for that particular vulnerability is used. To use a dif= ferent +mitigation, please use the vulnerability-specific command line option. + +The table below summarizes which vulnerabilities are mitigated when differ= ent +attack vectors are enabled and assuming the CPU is vulnerable. + +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D +Vulnerability User-to-Kernel User-to-User Guest-to-Host Guest-to-Guest C= ross-Thread Notes +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D +BHI X X +GDS X X X X = * (Note 1) +L1TF X X = * (Note 2) +MDS X X X X = * (Note 2) +MMIO X X X X = * (Note 2) +Meltdown X +Retbleed X X = * (Note 3) +RFDS X X X X +Spectre_v1 X +Spectre_v2 X X +Spectre_v2_user X X = * (Note 1) +SRBDS X X X X +SRSO X X +SSB = (Note 4) +TAA X X X X = * (Note 2) +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D + +Notes: + 1 -- Can be mitigated without disabling SMT. + + 2 -- Disables SMT if cross-thread mitigations are fully enabled and t= he CPU + is vulnerable + + 3 -- Disables SMT if cross-thread mitigations are fully enabled, the C= PU is + vulnerable, and STIBP is not supported + + 4 -- Speculative store bypass is always enabled by default (no kernel + mitigation applied) unless overridden with spec_store_bypass_disable op= tion + +When an attack-vector is disabled, all mitigations for the vulnerabilities +listed in the above table are disabled, unless mitigation is required for a +different enabled attack-vector or a mitigation is explicitly selected via= a +vulnerability-specific command line option. diff --git a/Documentation/admin-guide/hw-vuln/index.rst b/Documentation/ad= min-guide/hw-vuln/index.rst index cf1511145927..11a3d0240c66 100644 --- a/Documentation/admin-guide/hw-vuln/index.rst +++ b/Documentation/admin-guide/hw-vuln/index.rst @@ -9,6 +9,7 @@ are configurable at compile, boot or run time. .. toctree:: :maxdepth: 1 =20 + attack_vector_controls spectre l1tf mds diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentatio= n/admin-guide/kernel-parameters.txt index 4568572205ee..f02993bc5b02 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -3737,6 +3737,10 @@ mmio_stale_data=3Dfull,nosmt [X86] retbleed=3Dauto,nosmt [X86] =20 + [X86] After one of the above options, additionally + supports attack-vector based controls as documented in + Documentation/admin-guide/hw-vuln/attack_vector_controls.rst + mminit_loglevel=3D [KNL,EARLY] When CONFIG_DEBUG_MEMORY_INIT is set, this parameter allows control of the logging verbosity for --=20 2.34.1 From nobody Wed Dec 17 08:54:38 2025 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2041.outbound.protection.outlook.com [40.107.237.41]) (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 B796C23BCE2 for ; Fri, 9 May 2025 16:29:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.237.41 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746808144; cv=fail; b=J3jhfRjIX+X/oDNFKbnU1oAa8dOI7NIk06aP88ykk41eC1ad2619pQiWRwU/bbaspFMP6sad+y8JXYMRezG8wR4Y+FYCb2C1KUkHTipcJhG9oVBcbmvHt15xxwY6lcD3lp0l3QGjaOwMiEjMgPToxhnNJ0rEgZj3igdeCrmrpak= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746808144; c=relaxed/simple; bh=0sii+TXCMUqOoBkEcKsunQWNFbjrTK4fd5fhQuh5IEQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=tulE22UXlEeC3wJ3ATNYGW2Pn5/u9jY8ZUIZ4lfh41pl68qOjYB9bYDbceSYS3yoaQrf3HlQPMY7/ur8zuDo853ZPU4PfcyQBVMJ5apBOWt/+c4RhiybtfsNmWVhkoA/u5X88XXrAVSszJQIdS6SVEUorLWaJYZZNsIGibFrQSk= 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=iFgL8UlI; arc=fail smtp.client-ip=40.107.237.41 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="iFgL8UlI" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Se1IJ1Iy1i1GkNLva2qT5zBuNDNSSquLh0caiVJfKkVoMllWvhyPMHA7cQ7Flmj0HGBVhi229cDIth1dl/8Zdgarv+BNwDPTPu9R+vt8Hm2YgVRf+pBGiizw6UlGZXj4aZNqU6srH1ZRSrGS4oUURpKGg3M3qunwxwhGgJ/LtrZYcCDmp7zJPVqnSIr+vMPN97n8uD8ydzCL+3rKR5nFZe7S8Nc42yY/sKfHj2j1VGyO39sXtVge2HAFX/bsd3jKYqzXuVmeZ1lYbnLl5HXA0GXP7dNI5hnyOFgKE4Rlc+ePG2Upv/DPvpQZ+Ro+emmZngQjjWrbpwOu8wtCHA/QbA== 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=G/LZBs0NujhNhY7Gxc2mi9tUaLuLbCjcPlDSsxe2zLs=; b=XCF4Cyqqnc1LmlzU8ovwTyG4jTE9tGYWffMEBzC/1rW+XHTz7KPFjSKCoIPGv87v1e4wMy96lkLNEjn/uCZKME8Jj77voBJ7fnbKioU5cl2O1u2j+KfB3pPOLcnEfN/5Vk+ZckC3XsG6yOFAhyWo/ff8muFRVDtYBGlaGBcfp3aDo9ChuiuUCcPCyvWih3n5+VmHLeBR8K+LxHbM5EEPB72pA80i1u1yA0MhbSIeFicgo2HRxltoOAhMoocJC5wU1YF37KwSQHXPbDmN4k0WIrc8duAvK21RV65eLmP7P7P++aJxH69Clx3U4qN1PsEXKBlu4QRVnaoEl48vT7UfyA== 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=G/LZBs0NujhNhY7Gxc2mi9tUaLuLbCjcPlDSsxe2zLs=; b=iFgL8UlIjH/NPrL3Owtwibr+3VNGNAAGW+FrMaFgPvyGv1v4u8dUXVtGbtJBQNfFFbno5E0DWRLgEHs/7getujYu1ti2eywSdVuXYs9PsYK/SS/HPlMT4qM2bJ1pQt7UMWokG05PXaroutYuY90JSgcFeZGbQDrAJoGya1e6hi4= Received: from BL1PR13CA0101.namprd13.prod.outlook.com (2603:10b6:208:2b9::16) by DS7PR12MB5984.namprd12.prod.outlook.com (2603:10b6:8:7f::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8722.21; Fri, 9 May 2025 16:28:51 +0000 Received: from BN3PEPF0000B074.namprd04.prod.outlook.com (2603:10b6:208:2b9:cafe::5b) by BL1PR13CA0101.outlook.office365.com (2603:10b6:208:2b9::16) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8722.19 via Frontend Transport; Fri, 9 May 2025 16:28:51 +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 BN3PEPF0000B074.mail.protection.outlook.com (10.167.243.119) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8722.18 via Frontend Transport; Fri, 9 May 2025 16:28:51 +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; Fri, 9 May 2025 11:28:50 -0500 From: David Kaplan To: Thomas Gleixner , Borislav Petkov , Peter Zijlstra , Josh Poimboeuf , Pawan Gupta , Ingo Molnar , Dave Hansen , , "H . Peter Anvin" CC: Subject: [PATCH v5 02/20] cpu: Define attack vectors Date: Fri, 9 May 2025 11:28:21 -0500 Message-ID: <20250509162839.3057217-3-david.kaplan@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250509162839.3057217-1-david.kaplan@amd.com> References: <20250509162839.3057217-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: BN3PEPF0000B074:EE_|DS7PR12MB5984:EE_ X-MS-Office365-Filtering-Correlation-Id: 6d9f71d5-7768-4f3a-0ce4-08dd8f169585 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|82310400026|7416014|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?IX1+b11+b6Sz+L7yuCH+eE97ULmD0TxpVA6Dq7kQ7sZjYw3HpN4twmfk/tu/?= =?us-ascii?Q?tmsMtNvLw8ZaPFJtlJq+lmuQgW3bUU+bXcLTwv8Xlere49pYCHAK3IzrT+4o?= =?us-ascii?Q?B9RbT4StbRE0YOTevGZou40HFeYsZsExVm+lDlEvFzRiKiizAVj46sT1yLmy?= =?us-ascii?Q?UfdNrCk5uTVYYox/n/u+viA0dOT1o7OZocg+wE6glE5osEQWcMBB7U3VxzcQ?= =?us-ascii?Q?REjC8WOFAMyxv46lRLgGyRpMkihBqNW4N4Y/ds1QSc3cX1/nHLBpcpahIaa3?= =?us-ascii?Q?rCPv9ev1nyC3hZnjUuLUPVX93esjFLWd6QlyYChOcX8L6E7NHO5rAnzW5VDU?= =?us-ascii?Q?ApjiNyq/3q/JQuE9BNZEVOI6xyeqk4UPLeBbVHMUTuLHCz5ACqcINHb3Yrl5?= =?us-ascii?Q?gjj+jZtBb1RANv5FQJVQHe7LcDnvF3L7uVqqcydgr7aXXSCNAuyildKoYOso?= =?us-ascii?Q?Wli0GKIreSmbxmyM+3+h3dR2XbPj46GYstRUwiKMPv22ALpZCde619OQkNAM?= =?us-ascii?Q?CMcL5GfLcLi9EHBl/7AaqBukeKeK5EGJMKaHk+YMoEEmCR77ImixNDVUnHQJ?= =?us-ascii?Q?4aJcxMMBkRJKsddVXFDijgqCanMOoDDEMM5Qpach/TuZd8KrJRMK5UdiGorh?= =?us-ascii?Q?goSloG9kt9geI1RD1qyfHFguRokeSmWuielyKx8Ow7Clvh8oBlPD2acsYSz8?= =?us-ascii?Q?t15KAkx0W4xvv8BkV+x/pOJtXSMNIoM3ezfHsdxO1Ts+AsGw8vJoYJLd2H0M?= =?us-ascii?Q?ACKxgD5pjlPEtWfN8+WqiTvKyob8dMi6kMy7o7RX6TwjUXN2iOoGmnyJvw+J?= =?us-ascii?Q?DmaarW9kRRkQo6+hAIDJeFrQT0LqwvKhjFGZiDKO1FRTir3kM/skDPy4JDkb?= =?us-ascii?Q?Asi2VRJdK+46DRjrNIIqwU/bfO0aljloCucZcqdL1LiIMBaTE/hCkP1mmWre?= =?us-ascii?Q?E724I/vH+EYtM6RNvXxklOXOK7FJJnUil2D1GVTQ2tUJARcYF0XmSTR3W94b?= =?us-ascii?Q?DHLCSdB5D+NvPJ8bMKtowJsE1hJOUO8KtyeecikwJbA+6i3A0LLhVvf9BrQG?= =?us-ascii?Q?wpYwgiPW0OHPeG4RhCnppwEuhyN3geFb3WMbF8PVBKnJO9iSFeBT0xtdNGxf?= =?us-ascii?Q?mRckFmoL7uag18qVyhz/7z/VN2gw1hLQCiS9wAvsc20py/LrB8aG5qCX0Urq?= =?us-ascii?Q?ItX5WKGnwOTeEc6CP0HVJ+lc+u13U63/7vFvkU2stfeKhNRn6fJel53KKsJO?= =?us-ascii?Q?Mmzj+Mn+wm+uiGIXeejVJsLd6YDWc4aaZBDSqJxsraVBemZ+xXKK9fdNlFTn?= =?us-ascii?Q?dV0oo5khiDAF7c7D66o1C9AZXBmt0kbtH0N5GSfYusIrqzs09auOjxkbDSbE?= =?us-ascii?Q?Y+Yk1Y9KEJx16vHpB8QSpJyzMH2knC9P3g7VvnE5OYYhRqPhmRCa69hN6FKe?= =?us-ascii?Q?01QVvR/zDjv0WW58tNjpSsO248klA8Ch1MhTamq9l+RYJTjrJfQE/WEtrbSS?= =?us-ascii?Q?ErzlK2Pn0w7dk+MMBU9FeTas7gvMZJhsBku8?= 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)(1800799024)(82310400026)(7416014)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2025 16:28:51.6628 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6d9f71d5-7768-4f3a-0ce4-08dd8f169585 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: BN3PEPF0000B074.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB5984 Content-Type: text/plain; charset="utf-8" Define 4 new attack vectors that are used for controlling CPU speculation mitigations. These may be individually disabled as part of the mitigations=3D command line. Attack vector controls are combined with glob= al options like 'auto' or 'auto,nosmt' like 'mitigations=3Dauto;no_user_kernel= '. Cross-thread mitigations can either remain enabled fully, including potentially disabling SMT ('auto,nosmt'), remain enabled except for disabling SMT ('auto'), or entirely disabled through the new 'no_cross_thread' attack vector option. The default settings for these attack vectors are consistent with existing kernel defaults, other than the automatic disabling of VM-based attack vectors if KVM support is not present. Signed-off-by: David Kaplan --- include/linux/cpu.h | 21 +++++++ kernel/cpu.c | 130 ++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 140 insertions(+), 11 deletions(-) diff --git a/include/linux/cpu.h b/include/linux/cpu.h index 1f5cfc4cc04f..ce98c66a7fc0 100644 --- a/include/linux/cpu.h +++ b/include/linux/cpu.h @@ -192,9 +192,25 @@ void cpuhp_report_idle_dead(void); static inline void cpuhp_report_idle_dead(void) { } #endif /* #ifdef CONFIG_HOTPLUG_CPU */ =20 +enum cpu_attack_vectors { + CPU_MITIGATE_USER_KERNEL, + CPU_MITIGATE_USER_USER, + CPU_MITIGATE_GUEST_HOST, + CPU_MITIGATE_GUEST_GUEST, + NR_CPU_ATTACK_VECTORS, +}; + +enum smt_mitigations { + SMT_MITIGATIONS_OFF, + SMT_MITIGATIONS_AUTO, + SMT_MITIGATIONS_ON, +}; + #ifdef CONFIG_CPU_MITIGATIONS extern bool cpu_mitigations_off(void); extern bool cpu_mitigations_auto_nosmt(void); +extern bool cpu_attack_vector_mitigated(enum cpu_attack_vectors v); +extern enum smt_mitigations smt_mitigations; #else static inline bool cpu_mitigations_off(void) { @@ -204,6 +220,11 @@ static inline bool cpu_mitigations_auto_nosmt(void) { return false; } +static inline bool cpu_attack_vector_mitigated(enum cpu_attack_vectors v) +{ + return false; +} +#define smt_mitigations SMT_MITIGATIONS_OFF #endif =20 #endif /* _LINUX_CPU_H_ */ diff --git a/kernel/cpu.c b/kernel/cpu.c index a59e009e0be4..be25543567c0 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -37,6 +37,7 @@ #include #include #include +#include =20 #include #define CREATE_TRACE_POINTS @@ -3174,8 +3175,38 @@ void __init boot_cpu_hotplug_init(void) =20 #ifdef CONFIG_CPU_MITIGATIONS /* - * These are used for a global "mitigations=3D" cmdline option for toggling - * optional CPU mitigations. + * All except the cross-thread attack vector are mitigated by default. + * Cross-thread mitigation often requires disabling SMT which is expensive + * so cross-thread mitigations are only partially enabled by default. + * + * Guest-to-Host and Guest-to-Guest vectors are only needed if KVM support= is + * present. + */ +static bool attack_vectors[NR_CPU_ATTACK_VECTORS] __ro_after_init =3D { + [CPU_MITIGATE_USER_KERNEL] =3D true, + [CPU_MITIGATE_USER_USER] =3D true, + [CPU_MITIGATE_GUEST_HOST] =3D IS_ENABLED(CONFIG_KVM), + [CPU_MITIGATE_GUEST_GUEST] =3D IS_ENABLED(CONFIG_KVM), +}; + +bool cpu_attack_vector_mitigated(enum cpu_attack_vectors v) +{ + if (v < NR_CPU_ATTACK_VECTORS) + return attack_vectors[v]; + + WARN_ONCE(1, "Invalid attack vector %d\n", v); + return false; +} + +/* + * There are 3 global options, 'off', 'auto', 'auto,nosmt'. + * These may optionally be combined with attack-vector disables after a ';= '. + * + * Examples: + * mitigations=3Dauto;no_user_kernel,no_user_user,no_cross_thread + * mitigations=3Dauto,nosmt;no_guest_host,no_guest_guest + * + * mitigations=3Doff is equivalent to disabling all attack vectors. */ enum cpu_mitigations { CPU_MITIGATIONS_OFF, @@ -3183,19 +3214,96 @@ enum cpu_mitigations { CPU_MITIGATIONS_AUTO_NOSMT, }; =20 +enum { + NO_USER_KERNEL, + NO_USER_USER, + NO_GUEST_HOST, + NO_GUEST_GUEST, + NO_CROSS_THREAD, + NR_VECTOR_PARAMS, +}; + +enum smt_mitigations smt_mitigations __ro_after_init =3D SMT_MITIGATIONS_A= UTO; static enum cpu_mitigations cpu_mitigations __ro_after_init =3D CPU_MITIGA= TIONS_AUTO; =20 +static const match_table_t global_mitigations =3D { + { CPU_MITIGATIONS_AUTO_NOSMT, "auto,nosmt"}, + { CPU_MITIGATIONS_AUTO, "auto"}, + { CPU_MITIGATIONS_OFF, "off"}, +}; + +static const match_table_t vector_mitigations =3D { + { NO_USER_KERNEL, "no_user_kernel"}, + { NO_USER_USER, "no_user_user"}, + { NO_GUEST_HOST, "no_guest_host"}, + { NO_GUEST_GUEST, "no_guest_guest"}, + { NO_CROSS_THREAD, "no_cross_thread"}, + { NR_VECTOR_PARAMS, NULL}, +}; + +static int __init mitigations_parse_global_opt(char *arg) +{ + int i; + + for (i =3D 0; i < ARRAY_SIZE(global_mitigations); i++) { + const char *pattern =3D global_mitigations[i].pattern; + + if (!strncmp(arg, pattern, strlen(pattern))) { + cpu_mitigations =3D global_mitigations[i].token; + return strlen(pattern); + } + } + + return 0; +} + static int __init mitigations_parse_cmdline(char *arg) { - if (!strcmp(arg, "off")) - cpu_mitigations =3D CPU_MITIGATIONS_OFF; - else if (!strcmp(arg, "auto")) - cpu_mitigations =3D CPU_MITIGATIONS_AUTO; - else if (!strcmp(arg, "auto,nosmt")) - cpu_mitigations =3D CPU_MITIGATIONS_AUTO_NOSMT; - else - pr_crit("Unsupported mitigations=3D%s, system may still be vulnerable\n", - arg); + char *s, *p; + int len; + + len =3D mitigations_parse_global_opt(arg); + + if (cpu_mitigations_off()) { + memset(attack_vectors, 0, sizeof(attack_vectors)); + smt_mitigations =3D SMT_MITIGATIONS_OFF; + } else if (cpu_mitigations_auto_nosmt()) { + smt_mitigations =3D SMT_MITIGATIONS_ON; + } + + p =3D arg + len; + + if (!*p) + return 0; + + /* Attack vector controls may come after a ';' */ + if (*p++ !=3D ';' || !IS_ENABLED(CONFIG_ARCH_HAS_CPU_ATTACK_VECTORS)) { + pr_crit("Unsupported mitigations=3D%s, system may still be vulnerable\n"= , arg); + return 0; + } + + while ((s =3D strsep(&p, ",")) !=3D NULL) { + switch (match_token(s, vector_mitigations, NULL)) { + case NO_USER_KERNEL: + attack_vectors[CPU_MITIGATE_USER_KERNEL] =3D false; + break; + case NO_USER_USER: + attack_vectors[CPU_MITIGATE_USER_USER] =3D false; + break; + case NO_GUEST_HOST: + attack_vectors[CPU_MITIGATE_GUEST_HOST] =3D false; + break; + case NO_GUEST_GUEST: + attack_vectors[CPU_MITIGATE_GUEST_GUEST] =3D false; + break; + case NO_CROSS_THREAD: + smt_mitigations =3D SMT_MITIGATIONS_OFF; + break; + default: + pr_crit("Unsupported mitigations options %s\n", s); + return 0; + } + } =20 return 0; } --=20 2.34.1 From nobody Wed Dec 17 08:54:38 2025 Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2072.outbound.protection.outlook.com [40.107.101.72]) (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 40E86235059 for ; Fri, 9 May 2025 16:28:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.101.72 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746808135; cv=fail; b=M2WUuDR/X/XOcYPpb3G1Zg0OQ1oK2IFh+fr+UKUsP0+UMhQE604EfHHvdonOXKqbzel6zIaSx29W24EXqA3+Kwp4E+m85+ipDi2LQ01dzqiO+2WKOKzFMf3vXPlo8NyMAE9yEZc3PVaRyaO62eEcMKOTeN7FxrgV9tXc8I420js= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746808135; c=relaxed/simple; bh=lDJwdN6FpWr2CYimiAJ0LT+Q5Qt+ziXpIImnAFoy8TA=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=bHLOpVVPzXD5/rfg+G+q/3zZo4Xk4XLaEIpWpZp2nr2Ldlp1Jw9OJIJJSyMt9Bkh6/lMpJn6mjWvQtJnwyTRJkUMp2AN+7TF1dntzsQTdujNQ+RXGbWk092iIm+/a1E2xBDhN/Y3gTQZupuZn/UjyC4MzhS/wFv5AcWWdqE+G4Y= 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=W1RXO0gK; arc=fail smtp.client-ip=40.107.101.72 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="W1RXO0gK" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=wLK9qG8CUA4iJ5ZZXIyjgG8PehnmD0PFnhyRBqiZKJCYSx25zYpt0DeSfejk4YDKfUiv6Yyi843P9P7eeRNz1O0E7PdqbDc82jYNz6NAWYpYwVuZTIEHr+zCC7faBNyCO0SCSIRI/0+m0OXU3Ukz+Kf2uO4bTvaSUzZAmloYNIxG6vqB5JGcZoh9bM2I+kgu7ZOhJR4Hwf62oH8b+xJvA7YWFeYAFyG1t8ZFHsRMHRLDInoBQJPXe+Nnsuo7Mkrn9X1DAZOcyZj/jsWVhoMvGOIcn04BNiMpgU8cBVWqmOaSBzZtwy32XFg08P2OZl/jgIKNpHPQArsQh1M1lRZ0gA== 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=fySsKOCqkIIh01NJVkR0I/ghRtxCo0vK49cfgTJbOb0=; b=qvk6g5M/0BjJt3n+IxeDajRAAaM04tjHzN0oaPrvOdQA+6AEEEIwUmNjYbVfRb33X6ourwaof4ZyFCEBRlLyn5/MGb0UaaF1rOEBxOIhMRQ8pZz5AILanlYeqWe2rwRDMrEjnIIk56QotKML9k3tjzZSyPrTov5SnckJthRqdhTvzLWOT4xAECMMlxph/zY1H0+2ea3P4cBtuK2Nkl1CUKGzO18k2MPaCw7Lz0tcgubxrzRMKUirzY7j9EDKDHvenAtxqorXCSeBnhBuJZ6VeCt7sXWxkI41ywJ75fmbbHwczVINhTr/agoVEBL9dBDFQfjw+obmwAiKy/YQycj6XA== 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=fySsKOCqkIIh01NJVkR0I/ghRtxCo0vK49cfgTJbOb0=; b=W1RXO0gKofA2WAeLt0Yr9x6PGfnvVXzFBDoAaFplyoNgPs7N+lVRtXaH/olyBDF9ltvG+omfXHTIGkR3Ae1iYiUF04PMcsJpHBRfrjM9IfV2+GHSBf5eVee9MX8zfJ19V3DQLon1ouZ0wsiJOsPhnJH7wRAtebJ2prssvNXF6kM= Received: from BL1PR13CA0100.namprd13.prod.outlook.com (2603:10b6:208:2b9::15) by DS0PR12MB8526.namprd12.prod.outlook.com (2603:10b6:8:163::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8722.20; Fri, 9 May 2025 16:28:52 +0000 Received: from BN3PEPF0000B074.namprd04.prod.outlook.com (2603:10b6:208:2b9:cafe::21) by BL1PR13CA0100.outlook.office365.com (2603:10b6:208:2b9::15) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8722.20 via Frontend Transport; Fri, 9 May 2025 16:28:52 +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 BN3PEPF0000B074.mail.protection.outlook.com (10.167.243.119) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8722.18 via Frontend Transport; Fri, 9 May 2025 16:28:52 +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; Fri, 9 May 2025 11:28:51 -0500 From: David Kaplan To: Thomas Gleixner , Borislav Petkov , Peter Zijlstra , Josh Poimboeuf , Pawan Gupta , Ingo Molnar , Dave Hansen , , "H . Peter Anvin" CC: Subject: [PATCH v5 03/20] x86/Kconfig: Add arch attack vector support Date: Fri, 9 May 2025 11:28:22 -0500 Message-ID: <20250509162839.3057217-4-david.kaplan@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250509162839.3057217-1-david.kaplan@amd.com> References: <20250509162839.3057217-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: BN3PEPF0000B074:EE_|DS0PR12MB8526:EE_ X-MS-Office365-Filtering-Correlation-Id: 2762ceba-c60c-4a07-d1f2-08dd8f1695e2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|7416014|376014|82310400026|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?xEUlRnMI2l8EQbW3qtdfwI53k5gTd5o96r0yCSpTk0o92794mCZpSpWStfde?= =?us-ascii?Q?YGINz14ND23LMlFXsC5nJZaCPzmp+zQQAsHcGlODBtYALBF8nHBoHI1o0ip1?= =?us-ascii?Q?w6XbAVUid37VoTZKzE2f1UWevZ41bc27oXsBy81laeuvpq2V1wgIv3l9Ik72?= =?us-ascii?Q?ygqUKjPJLnaDvIIJy/Di9NszOokkB3vBZtlowYjdwWs38UNURwSQTayV+oKL?= =?us-ascii?Q?36sXJZpHZAZSz3Th+rsuhSYYm9RfkIpa2DfyjOAme8erqOB2uNrszdYxCtat?= =?us-ascii?Q?BgJutyNilNS6kLSAoR8PHPACy9X9mIbnv4lp6wz1JRuA7qqfVNMdU90+i6Wu?= =?us-ascii?Q?r4XsiKPDc4eCsdHgCCS3Ad9Vpa2tVnAautFEVzRC7hft7vlYbi+rncwwZoPv?= =?us-ascii?Q?ZVZlcCmxzWJ0W4THcCE5ZneD9iIIPsp66z1d4UK3pvb/AP7mLtZVwbJgEupu?= =?us-ascii?Q?MapuEEcDNCVtB+dq+zQ1rPXKVZZlvKNrsfOK5+1imlUYTNXq8SsHrr/kM3aw?= =?us-ascii?Q?g4GO2GjRcTt8SJIPsus6ZZbW9EV65u0foncNEWxNcMifMinZ+QJ3yWulth7+?= =?us-ascii?Q?V/exWafEswzR2aqX52rwXhzwi1JI1UenlQpj333j2d6lBui8iO9CRQOUMDyn?= =?us-ascii?Q?Nzub58qTdceYnhCIuKZnma6ZGWDBiAFb3z7c7LcfNbPolkXqj/h4oF2pjht1?= =?us-ascii?Q?1VvHYUgGzmgZou14qRx98+OUzXXjlvMiQW4hDQ5lNFuOqJjEoPSLtgBWZVN3?= =?us-ascii?Q?Oh0Qb6Z5E5yx0qmGktvDyrgcihAjhQeA2eF608Xh4bTJ79ZfZrs96WKxBaDH?= =?us-ascii?Q?buXRiE8UTfglRw7tKpzVlNuCjDkfKd+v8hE6yA4/cVboIpUvl6trIzqPzzwn?= =?us-ascii?Q?mMJm/IJGWxnEksshe3Y/ih4jrlRgNV4Oq/WQvsjXp2zufHhQuSoa8Jqv6c2/?= =?us-ascii?Q?mQ+3tRSzYLkf4AO8IEfKo82BpH+dxBs5e+keGW1iGy3AFU3uOFZjXAZLbIrq?= =?us-ascii?Q?GYCoEgLl6pFzLvM/Fhk4YqhHSfJjLGoOYhNER2yjbTcLrqTXyB5UaYEpAIEC?= =?us-ascii?Q?bE4mmRJl8bSTyy9cz+OYii5rYYXAgx45qBvOVVvWU+7P/jvYTDApt+h+UiDs?= =?us-ascii?Q?lBApYhJwIZPydQ9vUlTjPAbTAepRnaMOjIb7cKRguvIbPw+VFtpqdy3UxWyJ?= =?us-ascii?Q?wm690iF5lTfaUVTVrkLyP9PPcTmAf6X5miYzep368GLVeHpkatgK8ialuCQW?= =?us-ascii?Q?cr42IS0S/zvNBXyBEPE4u94lnp5dsVSLg/6e076fypY7E7tPKFsdRuX13Qhr?= =?us-ascii?Q?CukRWTbiBxUPz6TQZ6V4M19OLbELEKJRkqWkuhQ/NUta63h/569GQeme+/ER?= =?us-ascii?Q?NVpvvD1JIC0q6nGzuMg+XpJT2TeNu2VG3bgDVflWaVHqPfjkNQk2BoZlai4y?= =?us-ascii?Q?7aDHwyoIStECLAkZcup4ehVNeg4uha4IdIdzGNZXgKFS4rfy7dWaPSpGxXwa?= =?us-ascii?Q?8oQiGAoxWti12rqjrSEpWLQ9xVeTXQkGy1Wj?= 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)(7416014)(376014)(82310400026)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2025 16:28:52.2781 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2762ceba-c60c-4a07-d1f2-08dd8f1695e2 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: BN3PEPF0000B074.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB8526 Content-Type: text/plain; charset="utf-8" ARCH_HAS_CPU_ATTACK_VECTORS should be set for architectures which implement the new attack-vector based controls for CPU mitigations. If an arch does not support attack-vector based controls then an attempt to use them results in a warning. Signed-off-by: David Kaplan --- arch/Kconfig | 3 +++ arch/x86/Kconfig | 1 + 2 files changed, 4 insertions(+) diff --git a/arch/Kconfig b/arch/Kconfig index b0adb665041f..a900f7a5baae 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -1755,4 +1755,7 @@ config ARCH_WANTS_PRE_LINK_VMLINUX An architecture can select this if it provides arch//tools/Makefi= le with .arch.vmlinux.o target to be linked into vmlinux. =20 +config ARCH_HAS_CPU_ATTACK_VECTORS + bool + endmenu diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 4c33c644b92d..af6350f056ae 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -74,6 +74,7 @@ config X86 select ARCH_ENABLE_SPLIT_PMD_PTLOCK if (PGTABLE_LEVELS > 2) && (X86_64 ||= X86_PAE) select ARCH_ENABLE_THP_MIGRATION if X86_64 && TRANSPARENT_HUGEPAGE select ARCH_HAS_ACPI_TABLE_UPGRADE if ACPI + select ARCH_HAS_CPU_ATTACK_VECTORS if CPU_MITIGATIONS select ARCH_HAS_CACHE_LINE_SIZE select ARCH_HAS_CPU_CACHE_INVALIDATE_MEMREGION select ARCH_HAS_CPU_FINALIZE_INIT --=20 2.34.1 From nobody Wed Dec 17 08:54:38 2025 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2057.outbound.protection.outlook.com [40.107.94.57]) (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 9BC9A238152 for ; Fri, 9 May 2025 16:28:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.94.57 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746808139; cv=fail; b=FL+dssPRPwFOfr+ktrMs02jw0862MZmUM0L6YdJ2enaMiDZkj73PQ2Ab88ctK4lEnwekKKai54HmU2XUy6+kll3tTo1FyIPqKv9nngKp2wNms1iNfomacXxpbYGAKHI0ZloKCwEv18FPAeb4HicplEIYRa7zOGkd2arTBTMIx/A= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746808139; c=relaxed/simple; bh=S1D1l0UiwerTgMEBHf14O6V4bw0iJG2UixT9WGtn6qc=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=RXAdfUwnFu07bWdJ4Zh/OGpgWXMT+mCkTAPTM7t12SE12lJz08tfsgMjrcs7yHESnERR4r58EoaNU95oPqDSfMT5/GU9svuEd//CMuAEWNGGo8fBsOPtVk7Gfa/OhMvnkoyY86U/A4iBzH3qLIZpN85nCLOR/vVMsElaHNO83xU= 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=2ia6fDGh; arc=fail smtp.client-ip=40.107.94.57 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="2ia6fDGh" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=R5zjcQ5NoQ25QGTWqLERDTLdfADosSZQZmNgf8Zk0qPIUciqY3uL6DKUBb2XBS7H22v/bnr3beTd4816ya9z0Ti4fkiMfuY2t8cabMwTJp4l0gZ5I2l+RVgp5Vq4dkGxpbEUzz3LmPojGb/v+njHG9n/MgkE24E+m6RkjRa3CxVerjrgcRNCP3W+QPL4X0SS+HAvKdKcLGnxmTGQxS5kJ2tQcHmv1HecWjDDxpp+WsA49xhqDDZp785XaJG2N28ckn8Uv4oG7PD7tiXJcgPsNvfG14A8oLLeF2OCMMBAHK3ztiozV15LmjPdFXlR2aXqPem50ljcgohydIqLxUohnQ== 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=V6yzC3yr2F/Z3dMmzDV8zsCv8tDIa048ORXJ+Xn4hGo=; b=oxou7WfR7cqPDyvzC/9F+Nc4KE54GVdGD1DfgeqJ/s2yvbyzqqsyN4lht0u8EfClwyoyvKy/Q25UzmFZ5VMDIa6EEIUz2rW033Bbn3ffbyeVDdpJ+7t9tv5uIVkqBumCTKpTAuEFgpJpNlU5YbMHizbTf1YI6EGBZyWdVGLahX0gToDwo2i5pTzEIPQkvUEzdekkYiTINiVJjPdTSbX26nYIM6YoglY6BqrXIVxWOzR8vdJxxCJcabKCTaWTX3xdHryXBX6h5pZo+O/B0cMStgdo6WHzqhuOrGW5BXA0HSolixChpXy+EMI/b8DHkriyADs8dMdO7tufSX2LERADxQ== 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=V6yzC3yr2F/Z3dMmzDV8zsCv8tDIa048ORXJ+Xn4hGo=; b=2ia6fDGhKvWEZ4R9C31Ubwguqns/MEIr3UcOfQj7244sQ3C0smRATJ56jOM5nYHPqDL9TKYgR5s3ZXflxXbymAYbtELR1DDVF0Tm8FL5Jn0g0VLPvfA0cyMeON2V3ziTuV0N6Eny/xt5Mlnb+xUxV4L48l6gY/9EYS5bM0LKIXI= Received: from BL1PR13CA0120.namprd13.prod.outlook.com (2603:10b6:208:2b9::35) by CH3PR12MB7499.namprd12.prod.outlook.com (2603:10b6:610:142::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8722.23; Fri, 9 May 2025 16:28:52 +0000 Received: from BN3PEPF0000B074.namprd04.prod.outlook.com (2603:10b6:208:2b9:cafe::3) by BL1PR13CA0120.outlook.office365.com (2603:10b6:208:2b9::35) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8722.19 via Frontend Transport; Fri, 9 May 2025 16:28:52 +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 BN3PEPF0000B074.mail.protection.outlook.com (10.167.243.119) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8722.18 via Frontend Transport; Fri, 9 May 2025 16:28:52 +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; Fri, 9 May 2025 11:28:51 -0500 From: David Kaplan To: Thomas Gleixner , Borislav Petkov , Peter Zijlstra , Josh Poimboeuf , Pawan Gupta , Ingo Molnar , Dave Hansen , , "H . Peter Anvin" CC: Subject: [PATCH v5 04/20] x86/bugs: Define attack vectors relevant for each bug Date: Fri, 9 May 2025 11:28:23 -0500 Message-ID: <20250509162839.3057217-5-david.kaplan@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250509162839.3057217-1-david.kaplan@amd.com> References: <20250509162839.3057217-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: BN3PEPF0000B074:EE_|CH3PR12MB7499:EE_ X-MS-Office365-Filtering-Correlation-Id: 962ca314-723c-42cd-236b-08dd8f169622 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|36860700013|1800799024|7416014|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?TVeGUgKKs1zBaS+yqiSc9ZzJMrgOj6wiJwO/MVt+LQFXnLqz3E37Lvvgossq?= =?us-ascii?Q?8IOAmO7OnKVlBy2xnTkl2zhBOGyysKNYMH2Ipa/orKxEy1VkxVhHaBeTVOlK?= =?us-ascii?Q?x0Gi1V+hYl/6L3Te45VhKnqP/cfGf5fvVuE0aREt/OpAIA1y0kxij2dAYikL?= =?us-ascii?Q?xacBB85RCVjaH2Y7UtYYR/7h5thS/EvZcfwor/IqcdJeCbtexoUvn1kkz4WS?= =?us-ascii?Q?mQJCAcmC1NB6plYcHZ3pu2yHW0krY8Ivs8Xgi4p6N5eo0zeM/9pa2S7vkWG/?= =?us-ascii?Q?kao+30uyxtJGpCVKPqftpz83bihVPWYDS0lt9Mn4agG/dNuJt2xUNljvaXc7?= =?us-ascii?Q?TJRAGQhAOoGyPo4U+WUM81cmvl8rujCWHuDLApPAaENCCv+7/mJxXzgnHzvz?= =?us-ascii?Q?YDB+Q8XrxxGjIR3YADuNDuDcD89I9ZbEMHQhpwg4h+cj7+wQK1u1HCMx9FHR?= =?us-ascii?Q?q4Lji1K5s6kGLUiEVF9LNbMvIAwyh59XiVuyByPbBHN8XRRc+r3K9JYiQXIt?= =?us-ascii?Q?vW5vufP6DndG5x3Se0BFEX3pBX1QTfkoHYSMu/GMK93TcXX2W9xgv34VZTpP?= =?us-ascii?Q?BPsM7dTfru6w/zBPdg7kzg/rdJ0dK9M4lXcL68s/dlgelwTAmwKvHTy1qJg9?= =?us-ascii?Q?nPGG/Q+Io+YaIGGy0giM+24ThjGooD+dHJmPZc5wb0hzmivXiUMHFAm5HgnN?= =?us-ascii?Q?ZkogvnPdzRFO7QAIjxKdAZgFyDvBy07FrloeWY5CunO1E/puvOklTEB2Ugkg?= =?us-ascii?Q?OnQh7fn1ONn4LuTkmTT8CgjLOJlb0x2IF7v32EqsbBkkhjW1pfzohrHh+xJW?= =?us-ascii?Q?XWV+1dtaR69L2O5DV8Ra6dgHKjXA3Br7nTe58ByLOTUL6L/z5N2ZGJJI9YOr?= =?us-ascii?Q?kg/wLgNT8DCh/29yrMLMxaLIbEi01oaBKQ4PfYpNrpfAGvWjYrQy/WSA5C5i?= =?us-ascii?Q?gAYTCkFOJ3N+e08aaIobSFQ1WeXdNwSGYIcuEfCszty9dzKH1McffiOSeMtL?= =?us-ascii?Q?tZWtZEWCkVSImlBrYhRDTd6ei10rc93zGJ0oxv9wAvHXAwOAfedFuZ8mvAF8?= =?us-ascii?Q?/erW5DjX+aRcSxx5UGtcsmryGtnPaqfolgpq7JXbs+aIW/qdw4s3MDcgi6WT?= =?us-ascii?Q?KRTkyWdIBYZibH0vkN/hVnjhmWGTJXJwBFTr7A7Vqea5QrMoryrOVrwJCgKO?= =?us-ascii?Q?5yqiAzlBLaTRzCnATxL8yJihC54QR4JFjv7HsIvbaMdLLKK1I111kxlQdnMc?= =?us-ascii?Q?48gAZi5/Nu9Ofn1MkcIDgIb8PXmIP2HSfN0cc8KbrABWXIaOp8liHFnS/VLa?= =?us-ascii?Q?zaRtwg21BIN1seuNrOLEKXFDM79VOdFbQgFQ2D0SlOmlyuqeJxiWHbqvFLA2?= =?us-ascii?Q?qKPeMP7RTiaELUJE4PsJR1cK+Rxwxs4eywiLqed4n3S8AJzYjRzXyLp35NKH?= =?us-ascii?Q?kEqPoUFgyfort8y4X47supXKGsizWyZtn/UGElo0FFwLFoH/TiQr4oYCWwSO?= =?us-ascii?Q?r5QnJgZqL0qtHtKVRdv28C8mdu7rY2QLXdUu?= 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)(7416014)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2025 16:28:52.6920 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 962ca314-723c-42cd-236b-08dd8f169622 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: BN3PEPF0000B074.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB7499 Content-Type: text/plain; charset="utf-8" Add a function which defines which vulnerabilities should be mitigated based on the selected attack vector controls. The selections here are based on the individual characteristics of each vulnerability. Signed-off-by: David Kaplan --- arch/x86/kernel/cpu/bugs.c | 55 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index a938fb4add65..3dce7c3126ea 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -311,6 +311,61 @@ static void x86_amd_ssb_disable(void) #undef pr_fmt #define pr_fmt(fmt) "MDS: " fmt =20 +/* + * Returns true if vulnerability should be mitigated based on the + * selected attack vector controls. + * + * See Documentation/admin-guide/hw-vuln/attack_vector_controls.rst + */ +static bool __init should_mitigate_vuln(unsigned int bug) +{ + switch (bug) { + /* + * The only runtime-selected spectre_v1 mitigations in the kernel are + * related to SWAPGS protection on kernel entry. Therefore, protection + * is only required for the user->kernel attack vector. + */ + case X86_BUG_SPECTRE_V1: + return cpu_attack_vector_mitigated(CPU_MITIGATE_USER_KERNEL); + + case X86_BUG_SPECTRE_V2: + case X86_BUG_RETBLEED: + case X86_BUG_SRSO: + case X86_BUG_L1TF: + return cpu_attack_vector_mitigated(CPU_MITIGATE_USER_KERNEL) || + cpu_attack_vector_mitigated(CPU_MITIGATE_GUEST_HOST); + + case X86_BUG_SPECTRE_V2_USER: + return cpu_attack_vector_mitigated(CPU_MITIGATE_USER_USER) || + cpu_attack_vector_mitigated(CPU_MITIGATE_GUEST_GUEST); + + /* + * All the vulnerabilities below allow potentially leaking data + * across address spaces. Therefore, mitigation is required for + * any of these 4 attack vectors. + */ + case X86_BUG_MDS: + case X86_BUG_TAA: + case X86_BUG_MMIO_STALE_DATA: + case X86_BUG_RFDS: + case X86_BUG_SRBDS: + return cpu_attack_vector_mitigated(CPU_MITIGATE_USER_KERNEL) || + cpu_attack_vector_mitigated(CPU_MITIGATE_GUEST_HOST) || + cpu_attack_vector_mitigated(CPU_MITIGATE_USER_USER) || + cpu_attack_vector_mitigated(CPU_MITIGATE_GUEST_GUEST); + + case X86_BUG_GDS: + return cpu_attack_vector_mitigated(CPU_MITIGATE_USER_KERNEL) || + cpu_attack_vector_mitigated(CPU_MITIGATE_GUEST_HOST) || + cpu_attack_vector_mitigated(CPU_MITIGATE_USER_USER) || + cpu_attack_vector_mitigated(CPU_MITIGATE_GUEST_GUEST) || + (smt_mitigations !=3D SMT_MITIGATIONS_OFF); + default: + WARN(1, "Unknown bug %x\n", bug); + return false; + } +} + /* Default mitigation for MDS-affected CPUs */ static enum mds_mitigations mds_mitigation __ro_after_init =3D IS_ENABLED(CONFIG_MITIGATION_MDS) ? MDS_MITIGATION_AUTO : MDS_MITIGATION_= OFF; --=20 2.34.1 From nobody Wed Dec 17 08:54:38 2025 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2069.outbound.protection.outlook.com [40.107.93.69]) (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 D2D742367DF for ; Fri, 9 May 2025 16:28:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.93.69 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746808137; cv=fail; b=fJ8cOLyS7WkhfjvfqMtWLTa2x3FyhOQzLowBFa2I1/1AvBg+qPgxwFUGDGThxES+F06uYcYmgRUgmUNvy3I6ictmcmA2RN2g/CZhEpdqsq+wiB/FyG1GYKfCTuuOE9osZyxDjf8qSMOIZZsqRIP0tzbV5p12S13f6PHjZPr99J0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746808137; c=relaxed/simple; bh=sES+mICdg8aZ4Ab1ft3OOrg9QBVBojGezKIEpdOTvZw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=MhJWQgO1vHdACt9UEfdZbq23XPgy460R4vkRTdX7XT+QVVuvWrRC6cV90w9p5nAj+3RELzCBHJPjSl6g9oQ7IqWjywOPI3fRjvdfyWAQpya7IvU6pIhws514cqWuq/kMtGhiGGiWCdiirYRBFbXFIgDEcAq+ymysMc1VJvycLzM= 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=sYXeIzrn; arc=fail smtp.client-ip=40.107.93.69 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="sYXeIzrn" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Dfmdoz3v+JMIbg7g5SAfiYq+cReONmGvVEYtYzcXQsP73AJFGeTBaYiZzUiDYtCEieN/fMeDX3RBpjCUGa8fqLge1LoRGmlf41v5Bqi6jGF3ZM+A7vFlICqmNGT47QYafzt9fMyB5UVmp1+LRrEOKPM4BNOaPJadr2/3At6LfxcyHbGoFURz9cqApFRnvi57lr0UyN8Hx/d1IGBf2eP8ct5lzoh2QjBDSHIY+Uhb65PkPxemb9DLonnu6gIi44ogLu6jO3KwDL3uDsmITUoOsxuuCdSpTCZATJ6jvWKUwvnkulFjHYaM80j0eLaG3pW7Zic5l/M8iFnA7emS7wXyTQ== 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=KeMv565h5S+fFGgfHUsh+qQ0mpyPWuI5ZFspel/sS6Y=; b=Yfvl+gKRATWmx2qkuK2egdLIHM0eQOeHEqec2VqoaEQozUyxZ7bl5VQKTFBuK9w3pQsn5AqhyYCx5PGBMs7M/dnM8aKRm012Njbcw4pCvuvAWN8zC+pq6idtNEkxdmBRXbOZ1eEN1dKVdZWJuLl9xaNfdsBS8nXjvf0wsZR4zls2CK6wxQpBhJR+JK04Pcrqf/iQU9s7XtMzKnaU6f+QYq0TEvopwX+sFzXxdXIpJtKcsYdi+mv5vOKVG1RTGL6sZt+nh2xXwlXXBfDhIFH5d0GMEJz+H2lWYZO+0Hu5uhG1g/kbZ3uKDPKxKTwQZNsQ2jZvHOjhWfjdbCwEW9uecw== 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=KeMv565h5S+fFGgfHUsh+qQ0mpyPWuI5ZFspel/sS6Y=; b=sYXeIzrn3E1zl341Ntqdqrq3QRtgVIGZltEKOj9j/w5hzqJqIK4Tsa4M95ZWe7LYoJoWEQgGd6cOPIrJepWEOoGinxlCGKwwywlm1wLJI199nKK5fKKaMLS76lqNT3VJIQAmvhJJ1QZCW99wyIAwz+QG3F1Gy6mxBimESjHBf+M= Received: from BL1PR13CA0114.namprd13.prod.outlook.com (2603:10b6:208:2b9::29) by SA0PR12MB7479.namprd12.prod.outlook.com (2603:10b6:806:24b::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8722.24; Fri, 9 May 2025 16:28:53 +0000 Received: from BN3PEPF0000B074.namprd04.prod.outlook.com (2603:10b6:208:2b9:cafe::39) by BL1PR13CA0114.outlook.office365.com (2603:10b6:208:2b9::29) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8722.20 via Frontend Transport; Fri, 9 May 2025 16:28:53 +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 BN3PEPF0000B074.mail.protection.outlook.com (10.167.243.119) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8722.18 via Frontend Transport; Fri, 9 May 2025 16:28:53 +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; Fri, 9 May 2025 11:28:52 -0500 From: David Kaplan To: Thomas Gleixner , Borislav Petkov , Peter Zijlstra , Josh Poimboeuf , Pawan Gupta , Ingo Molnar , Dave Hansen , , "H . Peter Anvin" CC: Subject: [PATCH v5 05/20] x86/bugs: Add attack vector controls for MDS Date: Fri, 9 May 2025 11:28:24 -0500 Message-ID: <20250509162839.3057217-6-david.kaplan@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250509162839.3057217-1-david.kaplan@amd.com> References: <20250509162839.3057217-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: BN3PEPF0000B074:EE_|SA0PR12MB7479:EE_ X-MS-Office365-Filtering-Correlation-Id: 2e84c552-db70-410d-3e33-08dd8f169651 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|36860700013|376014|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?wgqIF1sHCXrs9JSlWpBMv8MWAEWozzw8o1OiwHXBMnmtqUgjRBiS9XAqg7g9?= =?us-ascii?Q?FBX5SHeSUimdUQ2qR7Q4FR8g1nXdDQ25/gJOgV+Hw+VIWcN/LlKa2xc/8iKU?= =?us-ascii?Q?gUA8asxkom7cBu3myQS7dEJdIp3CyI/YqGA1R4S5EEo3mBUpsKseIhF1mnJE?= =?us-ascii?Q?kMFXs2PuOnhArIx3+PsJGAy+g7vgzI+aMd6Ll59NbEn9S/DAhy4TNHs8WXTJ?= =?us-ascii?Q?yvJcP86v+EP/P1WWLinhsxg1XQzmGC3wnosvLGYnIB0Pj/4ibZ8NrVH+NqCK?= =?us-ascii?Q?GdXs3wKvFCLbNLPxnssSM1/Fi11NrBl9xysw+Zw2SFOP5y5suTDw2brFAEHU?= =?us-ascii?Q?Y6FIcxe4nBazyM4rBk08mgCDS5BJg/ZFoywraqMH//veFDluxV7hnq0SQBzM?= =?us-ascii?Q?ICdVab+MoUNhOpjAcgdsAp/S2p/NZ8fW4WIZHl4Bywaguc3w/NzpCAY0RuoR?= =?us-ascii?Q?MNj5emhL95UEx6xs6pSylbCZ0Ua37BJSjHfbe3m/auJAvh+/45VFKlp/rhyG?= =?us-ascii?Q?BgvllNzMNHIG0sdQ+ygzmVH2oyTF3349klIIEbgoWnaKyKwkGmdJb7kWP3HK?= =?us-ascii?Q?+drKxdUyAScYAaNe6bovzWgU8x4lAnuGhB7KVtewwAi173otzzMc1KOw2Od+?= =?us-ascii?Q?ymBeoM2RvkDqZ4ysJRML0uurDkBL5se/DlteGArTvOd0Jbg96twNvKYI/Hs+?= =?us-ascii?Q?SfHX4k00M9Ix9vdcyF95HL9bpg9yL8FYXZegxZaD5iAdAQUnZ0R85Wk6e0gD?= =?us-ascii?Q?v5o/ctbyk47U7zgZHQbDzoLwmBxSahOunb4EBgrETv/jMzY0ht/LSnrtjEmK?= =?us-ascii?Q?/sg8VwuWcmhffwCtkSWyUzD62zVpv9h3Dm32wAEeS3/Ct+nlIXGMyAvgrsjO?= =?us-ascii?Q?jZHSBcq6QU6T7a+kn4wdA+Fh7kWTjPynOto0rTswo9K3ZmEWKJHocGsilEGQ?= =?us-ascii?Q?No+SStDHXcEy0tccZRlshR4eSmX29N5OMSQEVufvj93hEnXKuYHjQRDyuCM6?= =?us-ascii?Q?Voe4m0azLu4z7MVfYYr744RQU1u/PJafruQe8JIjNTNB3zTUaDRm2CN2A+ZE?= =?us-ascii?Q?34UQtwrDQsC/SKG7M2oXLo3f60ImAUfRWdwPpiQpUMfGqFfPBnPC/GIo2YHl?= =?us-ascii?Q?ciIUM9tofaWPYYRCCVlrKFyqsvLRMt1rkQyJ6DJwZkBLD/NlgwmG5tYk26DA?= =?us-ascii?Q?6IZbwd7wcYGLTZhyC1zcbst4V+TNlmDpyayZw/zxScEfoitCZSH0Uu53T+ZT?= =?us-ascii?Q?f5z5LQsfX8pXcP8DJEZsitF8EOCW1YqVTSwmPFPIRgN+27Wo0A/Dd4vMNZtb?= =?us-ascii?Q?SyR9o83J7QcF2fe3e98tZVYLzL+8Ajqf1FirRW80NJOanexBe32DmHkxjWf9?= =?us-ascii?Q?pcvPfmxl1FrRmoVzEc14zaBVprSUci3cc0kU6CwHvyadxghs6BCmm/9X5uoJ?= =?us-ascii?Q?ZclUgz2IY5/vrPJnC5PToYA1yudDArxoy+w4EqABE9NopGX6WMFZZ1VvqbcP?= =?us-ascii?Q?T6b138S3l5810WYgpaufl2yNNXWJQ7R0hNgF?= 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)(376014)(1800799024)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2025 16:28:53.0010 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2e84c552-db70-410d-3e33-08dd8f169651 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: BN3PEPF0000B074.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB7479 Content-Type: text/plain; charset="utf-8" Use attack vector controls to determine if MDS mitigation is required. The global mitigations=3Doff command now simply disables all attack vectors so explicit checking of mitigations=3Doff is no longer needed. If cross-thread attack mitigations are required, disable SMT. Signed-off-by: David Kaplan --- arch/x86/kernel/cpu/bugs.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 3dce7c3126ea..97d152c33e9e 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -419,13 +419,17 @@ static bool verw_clear_cpu_buf_mitigation_selected __= ro_after_init; =20 static void __init mds_select_mitigation(void) { - if (!boot_cpu_has_bug(X86_BUG_MDS) || cpu_mitigations_off()) { + if (!boot_cpu_has_bug(X86_BUG_MDS)) { mds_mitigation =3D MDS_MITIGATION_OFF; return; } =20 - if (mds_mitigation =3D=3D MDS_MITIGATION_AUTO) - mds_mitigation =3D MDS_MITIGATION_FULL; + if (mds_mitigation =3D=3D MDS_MITIGATION_AUTO) { + if (should_mitigate_vuln(X86_BUG_MDS)) + mds_mitigation =3D MDS_MITIGATION_FULL; + else + mds_mitigation =3D MDS_MITIGATION_OFF; + } =20 if (mds_mitigation =3D=3D MDS_MITIGATION_OFF) return; @@ -435,7 +439,7 @@ static void __init mds_select_mitigation(void) =20 static void __init mds_update_mitigation(void) { - if (!boot_cpu_has_bug(X86_BUG_MDS) || cpu_mitigations_off()) + if (!boot_cpu_has_bug(X86_BUG_MDS)) return; =20 /* If TAA, MMIO, or RFDS are being mitigated, MDS gets mitigated too. */ @@ -456,7 +460,7 @@ static void __init mds_apply_mitigation(void) mds_mitigation =3D=3D MDS_MITIGATION_VMWERV) { setup_force_cpu_cap(X86_FEATURE_CLEAR_CPU_BUF); if (!boot_cpu_has(X86_BUG_MSBDS_ONLY) && - (mds_nosmt || cpu_mitigations_auto_nosmt())) + (mds_nosmt || smt_mitigations =3D=3D SMT_MITIGATIONS_ON)) cpu_smt_disable(false); } } --=20 2.34.1 From nobody Wed Dec 17 08:54:38 2025 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2082.outbound.protection.outlook.com [40.107.237.82]) (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 40C2A237704 for ; Fri, 9 May 2025 16:28:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.237.82 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746808139; cv=fail; b=SjvNS4esqDGUt4JXBfiaf5Z+UJ5l0fN3Wc9mzFX0tqFeFXlfC9/IoxLpcE9/oHXYoTd6o6NeaEbj2wcw61rne2ibyjvnNabkc2TzEAyFlREkg7HH2EgU/QM/hkmtfDkJhmChY45aSwZgJpeaIfqQpgD0ugD9J9MXqVHG5M6M4sA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746808139; c=relaxed/simple; bh=3t++Ft/BcUxG0KUCxHtxPOeE7qQ5Xcscg/OPIpU1wkw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=gCTA43J/EOw5LWuwgDQLA6ZnaqHIRkJvEvQTZgECQVkE0Ab3hnQ88dh+v92ypEARKzsFCDWw9RU0Qf8vOC/k3qbTj0fKLgagumlATQOW2SZrkx2MLk3tiGe+nmwwYKh+dtL/AChxXf6dOHHUsBpaXO2AYgkS6ei1WHRn/gKa/04= 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=qvAr1h3Y; arc=fail smtp.client-ip=40.107.237.82 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="qvAr1h3Y" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=pTmVDorjVPdw2bT5ngAlfTd/3LL2MkllHm2MX6bOSYqTCHxzPfOJYK3f98rVjseY6V7GGt+y8SOmUb1h6yX1bhXgp1ri5anScJcdZCyiswQ/DBXVuqqL0Evyx/X2k8AnGY+FXKEM7mFdJltizEco6UAjlk4lJkSQ0yUAhtz1jxJNw3Hi3RjJEkvB5Hw0tSm40+USYJBOGLWAFjnOZuer2iVjGFZs4R2kDR/+7ol4vULLYwnIdhoAsNAT7BcbfBDx/EJnRctcgbreME7X0MchJ3jhoxA7/Cif1LigOs6vd/jfbQknAzC7/k/WiLyXVMbHp9rVLlHoSeq75BKQPnVx0g== 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=U4EPDzqvITkQU6HQkH+B26p7c2PAnFHwKIhDpQ8OVik=; b=xGjeVLqwlu2G3uCx9eA4fmdQkCtAMXRH0AGEQ3ijKSrLWOk58sCg5gUYgkd3dEIugU+Jo1KU1rqime4X019N1rZtVICMc349fcYrcsHzvDUxR2/ZWo/npDbtIie/3PWiDzifjSczLf5u9v5B4At3ldqUGRuRcSnqhBPubH7pIa+AdKHmCwCRXoXe9tTLNoNnhVTAKoQyWXil6aFHakigdYHxueN/HzmkeBWhk1OXS224Yf3W6F/fo7wKMhtXYVbAYCZmVoU8YHgD2iJzg5i2C2FfWHq5t0Z+SXcw09/hVxOVoho9wnUWi9SnrUHoOy2XGJmt8ESidEkvkrDBJxzffQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=temperror (sender ip is 165.204.84.17) smtp.rcpttodomain=linutronix.de smtp.mailfrom=amd.com; dmarc=temperror 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=U4EPDzqvITkQU6HQkH+B26p7c2PAnFHwKIhDpQ8OVik=; b=qvAr1h3YDyKk7UsVVVpfrQR97w72veXjnD1tXIR4jhpc+VfCeB0ISMzb0wbOko+efZ6zlIBTVY6WTHUjS4StGjE8D/CzxcaItQe4ltqad/YGiFI7X8WBVhhcfdOQUK1pvo0HAJRDhLR0B47eFKC0GzD+fTqJliBe1e0Goy6T8wc= Received: from MN0PR04CA0008.namprd04.prod.outlook.com (2603:10b6:208:52d::22) by CH3PR12MB8354.namprd12.prod.outlook.com (2603:10b6:610:12f::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8722.23; Fri, 9 May 2025 16:28:54 +0000 Received: from BN3PEPF0000B072.namprd04.prod.outlook.com (2603:10b6:208:52d:cafe::11) by MN0PR04CA0008.outlook.office365.com (2603:10b6:208:52d::22) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8722.20 via Frontend Transport; Fri, 9 May 2025 16:28:54 +0000 X-MS-Exchange-Authentication-Results: spf=temperror (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=temperror action=none header.from=amd.com; Received-SPF: TempError (protection.outlook.com: error in processing during lookup of amd.com: DNS Timeout) Received: from SATLEXMB04.amd.com (165.204.84.17) by BN3PEPF0000B072.mail.protection.outlook.com (10.167.243.117) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8722.18 via Frontend Transport; Fri, 9 May 2025 16:28:53 +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; Fri, 9 May 2025 11:28:52 -0500 From: David Kaplan To: Thomas Gleixner , Borislav Petkov , Peter Zijlstra , Josh Poimboeuf , Pawan Gupta , Ingo Molnar , Dave Hansen , , "H . Peter Anvin" CC: Subject: [PATCH v5 06/20] x86/bugs: Add attack vector controls for TAA Date: Fri, 9 May 2025 11:28:25 -0500 Message-ID: <20250509162839.3057217-7-david.kaplan@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250509162839.3057217-1-david.kaplan@amd.com> References: <20250509162839.3057217-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: BN3PEPF0000B072:EE_|CH3PR12MB8354:EE_ X-MS-Office365-Filtering-Correlation-Id: 5efa7740-52c2-4ee3-a43a-08dd8f16969f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|82310400026|7416014|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?p+VnyJfVqeX/67oKZY3kfuFJHuh9+umlWcXyNLlugU+CoJadU4MQPP9ynp3d?= =?us-ascii?Q?hszqEYqn3qrxx9TXpYwk02W9ar0X0i0eNIi8LUhxnxt/iUwz2lIG5wJoF0vp?= =?us-ascii?Q?8yDErMIibHpAt0rT6WOm+jH2dVi2oJhC/GNf0ghWpiSzg0Zb3ocXrooXaJ3t?= =?us-ascii?Q?EZOpT8yMuCzm89Ho8MMxUxxDz0WuQruqssIwnGAYvLqDeSbzwY44bx9QFuF/?= =?us-ascii?Q?rFy1G7fEW/aeXtaj6qqje4PlqD72/P8MI8XooUfKKXWuuB4I4FIOYyFPt2II?= =?us-ascii?Q?Cvwa3tm6hGmhZyX2NloGxnMBfRBc3bMutsmlB1inVcz/D14WJLqXT6ijgrpl?= =?us-ascii?Q?RL8jdJrZ5a8SfC/zFZqEgj4WnAjmKfx1CDMsL9Ufy8Rh1dSXXLcHmPYGUV8u?= =?us-ascii?Q?bjYwcax+UGRFSrEe9Fi22dDzE2/1FjPmKCQ+THFNV+xOWQqfApR7Q7x/QDk9?= =?us-ascii?Q?pWQfBQDD2vuRqhHNcX88EoiietGFrY612T20LeW4XOPFyTZBpiW/FNUevfko?= =?us-ascii?Q?tGlUgfwRRFvC/q4ddkQxHhSm+kOTD1URtdS1rSaW9rV7CE4K1UIhblfJpCtm?= =?us-ascii?Q?9qVI63np5ao4mFVWw77LaiLpV7DcQs3XNXL8oPRn/1UmL6hAee/+gabHJzwN?= =?us-ascii?Q?yy95CgoJR7ioyj9Bn0hNR2Vb1vq169Qw8PK3wnjHcap4qpOFr0pB1R/g58Qp?= =?us-ascii?Q?//crfDBqJ5O/gWKh78aIrsfe+NyHL+SOB7KbdZ7184+BPzGj6w31Sr+TIZ4z?= =?us-ascii?Q?HaCFJR2dtgO2AlnCm/iwVVdvWmOLshGn8wSNUoJYbeihTvMz7q37ECkDCPBT?= =?us-ascii?Q?iTEox6zU8JWrTnhSvjtAe5SXIHiYRzKqDnnb6TyJvtDzvFdHQV51U17LeKIy?= =?us-ascii?Q?FctXVuTZ0GfR8HVqhGYl1+pKbaiRFoXmMmpeCbPaGOgtb08zrQpOMVb1eOMM?= =?us-ascii?Q?ZBJEyZf0jv6WbbAblNldazP/uios6q33RMy+2KaKeMSpUZ59mPoytkbUgb+z?= =?us-ascii?Q?QrJwcFrsKc0qUEA/WGny+yPZgwGS7PvIjsIpmv6gQptq+ec6Sf2HFxupMgII?= =?us-ascii?Q?qzVubtHjWiwV/AfGEgplzdDq6pW4ryjHIkQBp6+IKsrQtMO+dGLaBcUNB1uE?= =?us-ascii?Q?5vbte97tiazfY2oHF7AFJ7nZt+VsWbBAfoWjwtW+zXw1xhIDKU1UEy59dFt/?= =?us-ascii?Q?SdnErQMAcUra7pvv+Ta1DOQSOKBlZIL5OqkR5o80I8Ujn5z5S0PUF9vrzAE3?= =?us-ascii?Q?4QBXm85T2ipWUqdAnIBuIJ2WA1jUx3QM2eEEHOIv1oWwz99GkqZY7JySzw21?= =?us-ascii?Q?pwFtXIQUSo40ApT2/m2zsJVf5l5Z6aq5yoona2PvOwi/FJewDwNz4z6IHVxu?= =?us-ascii?Q?wNMdCQmVm+YYIBHcL6F+v05ssU6Lfuu9qPaKA1zHtc9Mr7g4I2AAv+QvdUlI?= =?us-ascii?Q?GxF2wuZiLvZfs+S6ufU+3OuzpFPwMj+YNJ54rCamCi2KjY987kVq2EOxYgPV?= =?us-ascii?Q?emZf+LJiRfRkKixIn821LVBmLsPMZhSRI3Nk?= 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)(376014)(82310400026)(7416014)(1800799024)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2025 16:28:53.5157 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5efa7740-52c2-4ee3-a43a-08dd8f16969f 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: BN3PEPF0000B072.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8354 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 | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 97d152c33e9e..d57132cdbc21 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -516,12 +516,13 @@ static void __init taa_select_mitigation(void) return; } =20 - if (cpu_mitigations_off()) - taa_mitigation =3D TAA_MITIGATION_OFF; - /* 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 if (taa_mitigation !=3D TAA_MITIGATION_OFF) verw_clear_cpu_buf_mitigation_selected =3D true; @@ -529,7 +530,7 @@ static void __init taa_select_mitigation(void) =20 static void __init taa_update_mitigation(void) { - if (!taa_vulnerable() || cpu_mitigations_off()) + if (!taa_vulnerable()) return; =20 if (verw_clear_cpu_buf_mitigation_selected) @@ -570,7 +571,7 @@ 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 || smt_mitigations =3D=3D SMT_MITIGATIONS_ON) cpu_smt_disable(false); } } --=20 2.34.1 From nobody Wed Dec 17 08:54:38 2025 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2050.outbound.protection.outlook.com [40.107.244.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 65EFC238178 for ; Fri, 9 May 2025 16:28:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.244.50 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746808140; cv=fail; b=A3vQT/GRAqmcrBB/foI4Lds0LACTICdNpgcsRAKzARLfMLxZfVxV+jR/WVoSifkv9oW4xRDhJpdxRFcajd96ZQ8oIN/IY02HFlVK6lAHSPjIiOXsYEk+57KJYkj2RJWyCNRt3p40Xi6I4DgN2UABRanHDsTgEeuN0zZV/LKcOds= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746808140; c=relaxed/simple; bh=g1v5Wi4+A6Pfus8qQQk+PxxoAMd5MY5IZsgOmB+O41Q=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=p7KkhxYJuYs43p+A4ZpCfEEj3TtD1IqXqkjPrNSbLNMSDYYUmGOd05dGkCxxwzlHyFWvtzAARkzeIcsXuJcrR974diDN1QoiMy2unykHhk5lOWlgIrW7BUvULtzhu225rg/+kNn+DNoLHtkBpnzgw3fUQTpg6sFHGBKnQV6nubU= 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=SAnWdsaB; arc=fail smtp.client-ip=40.107.244.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="SAnWdsaB" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=rBby5XGz7kiQoqT/q8Sn53rMRDiz2CJy1142F2KMCLJoerxnWDsdfKsYGpnJ2QAYq/Zzoj7VncxHvJRBSyK3y5OAfaxDU0hAd6iiWmW8MSMsg++JCsXjNaT6+DIXafy5DC0l8jh97FUSaSOCek34Mh9OOlOzi3NP0X+/jWUjntTBN9nHneSX9tYuyyBSDKhLcjM+lWfvYEgo2l0pk9wvmEL4kgPLgzaJ/1kP3wn0p/xxMqXGlXc7nq1eS1wr9+45K6btiiaGVhPFAk7lLpKi2C/H56QRQwDgosDiEhb5+k4Cn9QX+c9v9qhf3J0nbdwMj4uF/9bAwv0afwIMbCkDqA== 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=I1b912mjErWDaQWLui831BBpxiTUPYHTIyu3PXIdcgw=; b=cBfml/5RJCOEB6sW1n9nvSIzLttpQlk5e3k2Ay0M+DXuNIh4qaoKfh5Le/NUTa8W7QO3iFZShAhixmw+Iu+qK18Djt60PIxMgZ+vNVOpisinrtSo4AqqXDgciCx9ZrYu5Wxd+L6isKyKqzX+Q19h81QbAb0gLA04jsScSgTiBLWBkIYhsMIsmn5h8eWKDybAM6Pr7bZEvUZ32B9WlwjKLvX0UzWcDyaEswRlIbKVXMQWctf4VvSHopWKFKfs/0PlyXZYS29L+8DVHEyy+8U+Flke4nFVbLreWcD9aOqzhiyxb4OZSQcgvHbi5Q/mxbbrUT3lxmOxo5gIhlecrEmKzQ== 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=I1b912mjErWDaQWLui831BBpxiTUPYHTIyu3PXIdcgw=; b=SAnWdsaBT7UnIe+5+jDLXAXfwN25fHqaO1FCabpRHjOCEeJ7TRSrwbxkL2GazDmr/IdQ87UFTMpO2c05cJxsjbnT9MsOLpUh87uCEHMsnU4T194GPzj3FZwJkVHhZcMYbFdeqOMWsgfFt8ZN73oc9iBy0B5sK2lGTJyfTEgPE54= Received: from MN0PR04CA0005.namprd04.prod.outlook.com (2603:10b6:208:52d::9) by BL1PR12MB5850.namprd12.prod.outlook.com (2603:10b6:208:395::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8699.24; Fri, 9 May 2025 16:28:55 +0000 Received: from BN3PEPF0000B072.namprd04.prod.outlook.com (2603:10b6:208:52d:cafe::90) by MN0PR04CA0005.outlook.office365.com (2603:10b6:208:52d::9) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8722.23 via Frontend Transport; Fri, 9 May 2025 16:28:54 +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 BN3PEPF0000B072.mail.protection.outlook.com (10.167.243.117) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8722.18 via Frontend Transport; Fri, 9 May 2025 16:28:54 +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; Fri, 9 May 2025 11:28:53 -0500 From: David Kaplan To: Thomas Gleixner , Borislav Petkov , Peter Zijlstra , Josh Poimboeuf , Pawan Gupta , Ingo Molnar , Dave Hansen , , "H . Peter Anvin" CC: Subject: [PATCH v5 07/20] x86/bugs: Add attack vector controls for MMIO Date: Fri, 9 May 2025 11:28:26 -0500 Message-ID: <20250509162839.3057217-8-david.kaplan@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250509162839.3057217-1-david.kaplan@amd.com> References: <20250509162839.3057217-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: BN3PEPF0000B072:EE_|BL1PR12MB5850:EE_ X-MS-Office365-Filtering-Correlation-Id: 772b04ee-bd47-42c9-3995-08dd8f169770 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|1800799024|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?ZX1b2dZ95SXkzzQ/P7I3dx6i9/GpOuGMThg4cfUghgmW81hJGvUqTtUrqN2z?= =?us-ascii?Q?DSwms1rTscl0rPdbcphN/n33/yo6Ea6Vzd1rEvFNUu1BnPlrHSRJZ1wg/GpD?= =?us-ascii?Q?TWTjO8p0J2q8YQtazyGpZ/awFDB/ZlyBizS7csBu3E1Qker7ZdcrnuftW052?= =?us-ascii?Q?mUUJOhnPX9n83kx9RSPWbXaBs6/rIc4YFSKWp/9uGjyM6virlZzAnJ4wTcME?= =?us-ascii?Q?OnA6bJJJmNhjI2CGZtAuOjT1AKQkQEb0+uPQCMTVeaO75xBQclpjyG7phJfn?= =?us-ascii?Q?yVUVIFIKyby8G5JfBGK+NUGuqxk7toTOH+YGTqR0G0+E0zeKO0squVez9gBE?= =?us-ascii?Q?VmdYY0C3xSOhoGhmR9kfcf4g/rX//AeMDjddyZCj49fhTMjiyYjEvYdkGfyf?= =?us-ascii?Q?jaEIYqKeci2qAYSW5yXDsjGrP/XnVB1VHhMUCZEYMHEe9UlyhvlyRM4bn5IV?= =?us-ascii?Q?/ICX4CCIzO6wVPGGm6t9PgVZLh3m5XdM7RQl02FgPq14JSPGLboFcpD6+fLY?= =?us-ascii?Q?41kqTfKkiDroOPaT3fKijo1vJYkQOPs8rj32IBBg/gnIBlmeTkzvidMTb4SM?= =?us-ascii?Q?Mnl6IWKlOeCRWzJf9hTbCVV9AL7eDT6PSe6gJ6xe17fNGTYU4K1czYqVnpVi?= =?us-ascii?Q?w7u41xM4iHAUUwT4lleyQNAKcmqrhHp6StcosITY7nR31fDtkUNDfTpxWO8t?= =?us-ascii?Q?wFXj4giQxXWjSCssXtYhwrFVhZ2+kosxPe8My94eeyReeWeyXWP6xP/R1Bu/?= =?us-ascii?Q?exII3C3zABa04w5dUxnVAOUoEqocnlTUreZlGFcFfEFgDRYRlDTcHpC2Aw/R?= =?us-ascii?Q?/6xFXT0mnABxh6nbe1/SyglSstYF8lhM/T+PMcTv1L64wr9CZkodP7U6H+C/?= =?us-ascii?Q?SIfQxo0Sc1Vx6bwEtZIPRghlyTWePSErVc2Q0VstX3Ctf9BJ6gR1k/cHHNcu?= =?us-ascii?Q?43BuHvFk98UZB3rhoPWY2SGmygvUwi2aqPPCYLvuZsCDiQ4mRwS5liPSlKNx?= =?us-ascii?Q?tHp2pW6BsL+rb3n+a3ovwolHMshw4rrnMUW6RcsGuScTKKBaUD+TQfrG8jBJ?= =?us-ascii?Q?bGARjwaOw81ioLWdXcXlbssu7ej5SroRBH9tkNa3iYI4uSS+4C+lKSNyV4an?= =?us-ascii?Q?SjnbDxiXxtX58vZT9hTkVOzAxDwHTupD/FKcDyTvLIAuNouoFfXu5tPJYkrn?= =?us-ascii?Q?ldVTUxbnnowRYIK+IqijLC6tHYdmDkde5FRGGdeWpXTEgVzQslg/Jh8s1VQe?= =?us-ascii?Q?lRDheL/2Ar5upRlIPmIgkFfGoeJyB+VtMXSkK9VrHXlOSix2z9R/wRqx0ykv?= =?us-ascii?Q?tO1GhsdbXeUoj7suNJktbbyfeGWDqp6qPUmG3OWR6yqPEOTBQ0ZtDVwnasov?= =?us-ascii?Q?sGRjLIb6pS96HOoacBDhzDtui32zbWK0JwWu0UYz8IajmP2ddDEbeKRN/g0g?= =?us-ascii?Q?4lj3bfDiM1Hx1GL96JsDyXY+Q3spftiR4GvJuG7bV0lnCCPCvyEGNLGudxMq?= =?us-ascii?Q?GbysbSuq28sl2hvac8Fr8/pCAoQBOKKO9i6L?= 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)(1800799024)(82310400026)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2025 16:28:54.8811 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 772b04ee-bd47-42c9-3995-08dd8f169770 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: BN3PEPF0000B072.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5850 Content-Type: text/plain; charset="utf-8" Use attack vectors controls to determine if MMIO mitigation is required. Signed-off-by: David Kaplan --- arch/x86/kernel/cpu/bugs.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index d57132cdbc21..bb5d58abaab6 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -617,8 +617,12 @@ static void __init mmio_select_mitigation(void) } =20 /* Microcode will be checked in mmio_update_mitigation(). */ - if (mmio_mitigation =3D=3D MMIO_MITIGATION_AUTO) - mmio_mitigation =3D MMIO_MITIGATION_VERW; + if (mmio_mitigation =3D=3D MMIO_MITIGATION_AUTO) { + if (should_mitigate_vuln(X86_BUG_MMIO_STALE_DATA)) + mmio_mitigation =3D MMIO_MITIGATION_VERW; + else + mmio_mitigation =3D MMIO_MITIGATION_OFF; + } =20 if (mmio_mitigation =3D=3D MMIO_MITIGATION_OFF) return; @@ -633,7 +637,7 @@ static void __init mmio_select_mitigation(void) =20 static void __init mmio_update_mitigation(void) { - if (!boot_cpu_has_bug(X86_BUG_MMIO_STALE_DATA) || cpu_mitigations_off()) + if (!boot_cpu_has_bug(X86_BUG_MMIO_STALE_DATA)) return; =20 if (verw_clear_cpu_buf_mitigation_selected) @@ -681,7 +685,7 @@ static void __init mmio_apply_mitigation(void) if (!(x86_arch_cap_msr & ARCH_CAP_FBSDP_NO)) static_branch_enable(&mds_idle_clear); =20 - if (mmio_nosmt || cpu_mitigations_auto_nosmt()) + if (mmio_nosmt || smt_mitigations =3D=3D SMT_MITIGATIONS_ON) cpu_smt_disable(false); } =20 --=20 2.34.1 From nobody Wed Dec 17 08:54:38 2025 Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2042.outbound.protection.outlook.com [40.107.102.42]) (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 80317239E68 for ; Fri, 9 May 2025 16:29:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.102.42 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746808142; cv=fail; b=R3sF9YcrUsx3IvV4e2z99ZHz9NN5l6NM3EWqLfIUWHGu+flYdjZWAlPSrlMdh16nGAe5WD9WhXPjkAj3qF+R5Yz3TAciOznLMRasHz68twLrLtJx/+gco3mfgAZu+BGYUGJElrKbu6BqtlGmE5GkekGyppAefnD5yCAMbx3DzSA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746808142; c=relaxed/simple; bh=UM6+eSwky4uuxo2n8e14DprIoTq6DcT21BBbKbDf6d0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Hi0r/JhGPwl+GvUDLepCSZFUUOYwm00+zR4Hb+6bcd6Y1vzJ9JhfULjT71QwnlOSXcI0cjJkCjgwInpO9rHIEsuHEYEd9Qlyw6Fy7TdxV4q4uYLb0bD3u73uJMa+AS48iWghQajrJlR38nDXZ8Xd5iBQ7HfgoDYkUtlV7WAILFg= 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=dcgf7mKy; arc=fail smtp.client-ip=40.107.102.42 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="dcgf7mKy" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=HuE6wjjE0tAl7rCMOJoyZ671mGFt9A9Dx3pVg4JZHgfxKWIvSlttShzZs8Sj7sBCyCr3PVnuFKyua0xETY3kekenOLEeW5U5kHaNSHGVMFankgnrZNvwF9Ceurl5buCNHZXMXkc3ASVQo15Wv0zNd2PFoPsa377HO713KWmzrbZeJUXEPHEyDC42KxVULIoRH9cie7LlTVqaWjvM49g5WseHstrHA8fU8EPADGewg1CRRd7YHz1MwFvAviBqoiR9zLzdJydPSKP4H+QfyQ4gM4dsA6yioYeNL9ipdbxL2oLMnRyidVNzrUcOlqR+bbRfm1xx8y2jDCf4l6MgwcTJOQ== 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=QPCpZc8jhwG27BgMBG3OQXj0PJKi9+UEi57oM8fiios=; b=b34FGY8Aryc8P5ca5GiCPutBlwV3fdXJ+tjOCNEIs5AVfacqEi7TigigqEJp5wfD8fAysWbm6SbM8cx0smywupkE6eFB/fInhm0GHGJ0OGgBdOSwv0I4reCAvv2KpxLnacge5Q8WM/7uA7XfIgcqqdON9hPgBVFdG51FXjV9sfBCA3INd0Ef7jCxhqrsboZ9vKOLBTr1/NvhTal+odl4U3ofnMAOjPcUxfsrRDdxCkyvuEaeE9P8GhMfoI7zs26R/pSfL/CB32N+u4k3GbNxWBTXwNynaCBXYAMIfVbnBOi3uewyRpsslRaoveHWqf/oBkBtcVr8zSpcj6AIe25b/g== 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=QPCpZc8jhwG27BgMBG3OQXj0PJKi9+UEi57oM8fiios=; b=dcgf7mKyGuiuxKdVmqKAlnjdUUSjDbEmhcnMfN8oM4eJ2xpCBWpmoQElxXlnwoOJdsbQ9XE6sD5HwPfnMZDKfbHRiF46obHQkPYI4YMtGzf/IXBPEWXBCOm1aKo/IIfafvgoND/thWPvQPl93b/okHkmvoWxrjDJW6hJ/uV6Lpw= Received: from BL1PR13CA0118.namprd13.prod.outlook.com (2603:10b6:208:2b9::33) by MW6PR12MB9017.namprd12.prod.outlook.com (2603:10b6:303:23b::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8722.23; Fri, 9 May 2025 16:28:57 +0000 Received: from BN3PEPF0000B074.namprd04.prod.outlook.com (2603:10b6:208:2b9:cafe::b9) by BL1PR13CA0118.outlook.office365.com (2603:10b6:208:2b9::33) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8722.19 via Frontend Transport; Fri, 9 May 2025 16:28:57 +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 BN3PEPF0000B074.mail.protection.outlook.com (10.167.243.119) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8722.18 via Frontend Transport; Fri, 9 May 2025 16:28:57 +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; Fri, 9 May 2025 11:28:53 -0500 From: David Kaplan To: Thomas Gleixner , Borislav Petkov , Peter Zijlstra , Josh Poimboeuf , Pawan Gupta , Ingo Molnar , Dave Hansen , , "H . Peter Anvin" CC: Subject: [PATCH v5 08/20] x86/bugs: Add attack vector controls for RFDS Date: Fri, 9 May 2025 11:28:27 -0500 Message-ID: <20250509162839.3057217-9-david.kaplan@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250509162839.3057217-1-david.kaplan@amd.com> References: <20250509162839.3057217-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: BN3PEPF0000B074:EE_|MW6PR12MB9017:EE_ X-MS-Office365-Filtering-Correlation-Id: 348d04da-fb93-4dc6-ceae-08dd8f1698bd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|1800799024|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?TkruyHYllgM2HqGxWadKKfZ+UrEj4KLEuIcW1Y7/jjyfww9sYac2jkzueKVB?= =?us-ascii?Q?c1PQhsUIPlnYHSOSUieiaQD7rEl3lq94nqVbR4gohA+GT+9eVZRbU60v4AeB?= =?us-ascii?Q?jng+Jbe+EAGZ4SL4srB8rletz+7z1BQHnFEF0GihP5Nfv97uVlEh5u+NY091?= =?us-ascii?Q?kO/YS29orghUk/ff85AhtodjSenEVJutJodZsDoHWrNclF+x8WrgragrRmTC?= =?us-ascii?Q?7+vKPRz9fttjenzZx3r0I9MtVdzXhskuIOT56RZ9PhVKKI2qBnIgm61PXn0M?= =?us-ascii?Q?DfiN8Z1zck3pmSoyBYWhAzVSgrMiHuOaPS7Z8WsIrvhmU7dWaePqwbxR5b2F?= =?us-ascii?Q?AjHe5bB91FMJTjqKSOED936iKG8EnWPFjmfXDWp77MrxZON38Zu3ymKLjQVB?= =?us-ascii?Q?9eZjmF4ggpjgN5CIxoNHA+c8sfhoCp4l+T0BciLfOpVdRos4riwvE/rkYVqQ?= =?us-ascii?Q?N/S1wsI7jvWO9NvqGLwXpf6dyc/MN7jC6VcB1IOc1fhnwB9lQw2QIDyqBP/5?= =?us-ascii?Q?KHOrRiRrCtRRapBKqsC89ARAh+jUIICdKF8ANMQFGLbqUfLK/ldt0rLiwnI/?= =?us-ascii?Q?mXU8QLsvAALT+VqvIu9UNlWtfAg+xp9bWkPg4/59MyZYaMjjWLwNbPZ23bAM?= =?us-ascii?Q?T0ApM2ebm57bGhvdvKEZ47HHk2Hs6nfVltm6oA31yvBlb1YB9JHWnu889t/W?= =?us-ascii?Q?3182W1A2PO+WfIqDKgtfW3Cw3yrt/nlsY+BHEKpIpr9btztC51umv/oC/V1x?= =?us-ascii?Q?XCbWmHn2eZfNXztutUqNn25zUHAZCsWU3Xh/CAADRseT69xn+t/fOr5fTjah?= =?us-ascii?Q?9/CPzSGc4+EZs4g+k/8bD3d8ZM6z5QfF+VQ/h3i4GwUL1Lf7az2TIpyF15zS?= =?us-ascii?Q?yJ0r32PoESMfhoJxnD0HOaPjYxZF+6RKwYPF3CB6xoFM2FqJI2EaWH7qmcpx?= =?us-ascii?Q?//Slph9hWnME8vQ1ZD9JthaG5jLZCBSO7TKf0yJMzSkgBEqe8rrpxuIQJsEe?= =?us-ascii?Q?yx/pREiMXWhOWm0qNf8htrP7v52QxayftJ3ji4ortcYaaVYMGdLS0e1Ku2dq?= =?us-ascii?Q?HMDwkpJLip7tjX2y8XUAq2TYkZHkKFe5eJR0sTKphgMgSR3jTPRqHceBfSp9?= =?us-ascii?Q?KHp83FTiq1hkTihOJpSkRmzQwCdPp2WAJ/BDZb5capk8+IHm54tvWz7Bla+b?= =?us-ascii?Q?EIFK2sKJubpFy8aJcMYvPWmzJk3D7NOr0bS4wzNBt5z5ZPngglQhUKLkvrw7?= =?us-ascii?Q?MVMQ/6h6TXqQsCqd5JhvOUb1nBzojuEWaxAV1xo3o0nIX0CUmY2xe8gzfjX3?= =?us-ascii?Q?Y9RdTtcvn147bjnaosmidipxWWormSJpR1nlcMZ7l+I7cuqiNyT3278RrSzV?= =?us-ascii?Q?A+DF2t1wVbaRn9vHsiSd+3OYg1s1E8aNw4BpKyKUavp7JM4vVdtrMtJqVM0Q?= =?us-ascii?Q?NPzuhv80u3FQZpjr8YAvFZYe8RlFfnAatip/8TK7QuqBEPYWGIE23obTBjKN?= =?us-ascii?Q?do70bYYvNJBuLdabRejY1bqlEy8KURy3zxX0?= 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)(1800799024)(82310400026)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2025 16:28:57.0641 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 348d04da-fb93-4dc6-ceae-08dd8f1698bd 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: BN3PEPF0000B074.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW6PR12MB9017 Content-Type: text/plain; charset="utf-8" Use attack vector controls to determine if RFDS mitigation is required. Signed-off-by: David Kaplan --- arch/x86/kernel/cpu/bugs.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index bb5d58abaab6..e807176bc845 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -726,13 +726,17 @@ static inline bool __init verw_clears_cpu_reg_file(vo= id) =20 static void __init rfds_select_mitigation(void) { - if (!boot_cpu_has_bug(X86_BUG_RFDS) || cpu_mitigations_off()) { + if (!boot_cpu_has_bug(X86_BUG_RFDS)) { rfds_mitigation =3D RFDS_MITIGATION_OFF; return; } =20 - if (rfds_mitigation =3D=3D RFDS_MITIGATION_AUTO) - rfds_mitigation =3D RFDS_MITIGATION_VERW; + if (rfds_mitigation =3D=3D RFDS_MITIGATION_AUTO) { + if (should_mitigate_vuln(X86_BUG_RFDS)) + rfds_mitigation =3D RFDS_MITIGATION_VERW; + else + rfds_mitigation =3D RFDS_MITIGATION_OFF; + } =20 if (rfds_mitigation =3D=3D RFDS_MITIGATION_OFF) return; @@ -743,7 +747,7 @@ static void __init rfds_select_mitigation(void) =20 static void __init rfds_update_mitigation(void) { - if (!boot_cpu_has_bug(X86_BUG_RFDS) || cpu_mitigations_off()) + if (!boot_cpu_has_bug(X86_BUG_RFDS)) return; =20 if (verw_clear_cpu_buf_mitigation_selected) --=20 2.34.1 From nobody Wed Dec 17 08:54:38 2025 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2045.outbound.protection.outlook.com [40.107.94.45]) (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 0D16823BCFA for ; Fri, 9 May 2025 16:29:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.94.45 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746808144; cv=fail; b=HzL4yPOvhoxaSFYjkfjoXqb2agxi1hTiUEYPDeTz3gr6kCDgGA4UMfkd7mpgQSvkR9mUBh86/bCOj5mZZIfXHp7kWR+FPG5lhaiYsnF8dHXvDw9OF3G9yt1zOfY7Lmiw0WMNVj1sjPGrf5DIqYiWb1EkLOLHA9GeDIm7GiDDPjo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746808144; c=relaxed/simple; bh=NesYlbIV+sJo3sKnYpGhEvX+FOnp012PegdJnjmLuJA=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=uQ9iYpS4OkhXD4SyEwSvcbtTxah2tl8SmTSHT0CtC8OEnRDdISBTvBmQeCZsdN7yrRATxscenyW9UEpxojCp0U17dClXxhOIkf3b4/gCnXjRfiFIW450ZmWys9cruZpNmuwjDRkfTXcSma7jd29vn9xWP78MJZA7oGDQZMR/JtM= 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=jyNXPBYN; arc=fail smtp.client-ip=40.107.94.45 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="jyNXPBYN" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=cvDEDNxTgC+KI5aj3xDQmhf1fqPAlMFJrp7keQfyvc24glZOxgYEgOW24VF2nmkKKHqE8Bz1EY6uDGFN26nSdE+KER4xSiQ8ALoG7MFh1fRw8jyehowCYq22MJnoNNbfGUQMrJJn4TUAKq1d+Nal2Vh3ahaiC+lZB+dax0B3DIMI7NKNbuI/zlQksRNK1XJOTLLPWgDeDrCr35fBMudiTEpNU6ChV9T7jOAx7BUPxIiwwzdYFz4iv/c3uaOT2SLV2J4Y3DAVnqsN+86WXb5KV1ruPKCeAbyUQm9nIVCsf+KSSOCQzeJirv63sT0NBmhC/xTSMP9zBOdxSAh62t1iwA== 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=sLW/IklWVsR3uxy5SU2GiksbMSmraWw5GdM9fwBJQAo=; b=kFTjaI67C/JqvULaUILcNNMsI57v1klgodhq0Ra0bGZDSXzxy07L4Zph7V6JeGWgMU167iOtx9xO4HwE2DZJ44Y7mgU6JZEZ/iKFa/x8QOqTG5e8BKNihJp4u30Y+MpGOJ18Axx1pZCND5CB9ByXE9gBqAvI41Y8PdO3SrfMjAwFDX9ghL0QCYkj1jsJuNuxn95q6reVE2cJn0eKXzw9V2ZsqXSU3LaxPuQbbtaFN97xKhyomsQxiU6s/YlWWldwHKfg+CNakrccnQgRUnjWTVK0jvdzn0BRhQ0kjVUz2ZNxRpz6ljtDgKaifvVPwO5DDS/XxNn+qFjTcMrV+RBxtQ== 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=sLW/IklWVsR3uxy5SU2GiksbMSmraWw5GdM9fwBJQAo=; b=jyNXPBYNfXixSbRJ/jxpFYxkvfbxEhsujWG7rXqpEZLwywwwbJO4dPjQ+bS01Ke4RJHOCHmROlz+XXocmiHwij8xT+02caGQ/yduiiFqTe0hOLQs5bjJpXgsDqekG5aEuvZCe3YxXozl2f3zsdaShjXg880DWW+12YPTXr7soBo= Received: from BL1PR13CA0110.namprd13.prod.outlook.com (2603:10b6:208:2b9::25) by SA1PR12MB8144.namprd12.prod.outlook.com (2603:10b6:806:337::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8699.24; Fri, 9 May 2025 16:28:58 +0000 Received: from BN3PEPF0000B074.namprd04.prod.outlook.com (2603:10b6:208:2b9:cafe::a7) by BL1PR13CA0110.outlook.office365.com (2603:10b6:208:2b9::25) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8722.19 via Frontend Transport; Fri, 9 May 2025 16:28: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 BN3PEPF0000B074.mail.protection.outlook.com (10.167.243.119) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8722.18 via Frontend Transport; Fri, 9 May 2025 16:28: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; Fri, 9 May 2025 11:28:56 -0500 From: David Kaplan To: Thomas Gleixner , Borislav Petkov , Peter Zijlstra , Josh Poimboeuf , Pawan Gupta , Ingo Molnar , Dave Hansen , , "H . Peter Anvin" CC: Subject: [PATCH v5 09/20] x86/bugs: Add attack vector controls for SRBDS Date: Fri, 9 May 2025 11:28:28 -0500 Message-ID: <20250509162839.3057217-10-david.kaplan@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250509162839.3057217-1-david.kaplan@amd.com> References: <20250509162839.3057217-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: BN3PEPF0000B074:EE_|SA1PR12MB8144:EE_ X-MS-Office365-Filtering-Correlation-Id: 97b24c9e-26d6-4bdf-2d0d-08dd8f169964 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|1800799024|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?88YHTLuI49xbWAdTvo7ViZdlgp8RmX0HiNnU/GHuVMrM2y7Mb4ZeBshotKF9?= =?us-ascii?Q?4Lqv5M6LlnMCH94f/jH9v3lt7qtxAAjCbw7e4Z5svPMfHZEMxxHD0oSvoBae?= =?us-ascii?Q?kRNZdcXog3D3FGbTmtxz+mGmPzqYpYM30LrtzfvAPUr5eTKLtZjq/WFUEHor?= =?us-ascii?Q?M8J0HEV2frY0uSY1jRGklanfruYS6t4/8wdtfJdCdqdrHCIuDA/piNxPmWEf?= =?us-ascii?Q?JDuiC4EU3FQr6HCj7eNk1cM3cDVc+WACp8dtQC0h8wSHgrjFTLd+hdt9oJKD?= =?us-ascii?Q?yype8yXpWZHg9jWTMpBzlT/bUDoqBWfC7YRI3J7NegbxVJX2PniEh4gCquO/?= =?us-ascii?Q?lLdSEZDeGqGDXjbITFgpJNSnorf4QhutJHYYlTeyndp33iZXggLYoPH1i1P0?= =?us-ascii?Q?XVxIMloiwRQiEy8FLzIrYoaMkkRWSicpzZjxH+Vwsx8FrjT1fiDCqurQBlaE?= =?us-ascii?Q?ckxKpk8WSn3bFfsOjQjIgMHOLaywv49abo7h4I4sOoGPWAYz25ktx8CNy24S?= =?us-ascii?Q?QUldcnY9PiM7Exiki0HU1QvJS/p6XPBbz/kHMfUjxv7HgwL/AU6sqUpqQceV?= =?us-ascii?Q?YM2G/3qzjp9kagfPrS3cC5ZmPWOdh72VgX6DzHZR0+OlbWz8/PWqahuIvzdT?= =?us-ascii?Q?Y+lQQ93wfc6enERBw7hhgyoRUHGjio88DFObslzi/kNqHgLETO0lHpBeMPW3?= =?us-ascii?Q?if4TJeD0B10Ot214UFyJnXuopujD1u3/VVI7ognO7qBm9/n1J7JeZmU8I2rk?= =?us-ascii?Q?x8Cozu4zXuJqqL2Z9ileqff05/CyxI7//AqyvMm/bD95nPVpzwAQ44DoB3m2?= =?us-ascii?Q?h7YzlGt5CYH1EiHjCAEtAl2rD3TBkXmAIFHyFSdxUTOsoIT9S7bYvKRQFnG+?= =?us-ascii?Q?DAofE0YViBphu09YilDcwSmJjOaOVSzMLV5Jsd8YhONoCYopduhx/L5uALTO?= =?us-ascii?Q?T+HAMo6/Ec9z68lFfGvXbsVBFLnzJo9S1mhG12XZFe3Qu6R2X5xWJGiSXRlZ?= =?us-ascii?Q?UnQ6RmumbMb7g7VQVKf8AH4el4pZPYPnANZz6vTNNhpOJwAqojEXSeJWMX3m?= =?us-ascii?Q?vBqnK3jbLW+xJQOZ7YV5sj1DXFCHWmAJ7Olbuynwkh9S92aH41zrzar92Nwx?= =?us-ascii?Q?ahw9KHVN9Gq19zv74AvWe5AjP/3cfk0xeY2d0xxfliroS67Ki1jR6TiJlT5y?= =?us-ascii?Q?0yCOyAiMjDJ4k8+Rz66vIXyt/dXKXDiyr12eUGA0DJjq7Qr3YD/I/HAWKZKF?= =?us-ascii?Q?4qbfmgAxO+S39NUTrHeJceNZzeDitNPMrZsuG+VWy8dzCzEFscGFa6b9QOzE?= =?us-ascii?Q?AwTiSvzqr8X/2r4BLWlba3rouyOmN6qiNJ5NkWT8s1mZe5xuAfPEhWcNZL9o?= =?us-ascii?Q?Yt4WnKQzWNEGxD1X0kLjT8XA45S5qAKX64I2iEG3ps+3/v/EwCJ8CkaIeANV?= =?us-ascii?Q?j0Rus0h0NgwD18TsevzxnbGDeS9LpYTLWpduQ49obCqa5dz1cPZSwHnWv2aJ?= =?us-ascii?Q?GAPmu4QOJ8mCrBu3RbAXIbReRT04wb4WJ+dK?= 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)(1800799024)(82310400026)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2025 16:28:58.1578 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 97b24c9e-26d6-4bdf-2d0d-08dd8f169964 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: BN3PEPF0000B074.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB8144 Content-Type: text/plain; charset="utf-8" Use attack vector controls to determine if SRBDS mitigation is required. Signed-off-by: David Kaplan --- arch/x86/kernel/cpu/bugs.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index e807176bc845..237ef8d0980a 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -848,13 +848,19 @@ void update_srbds_msr(void) =20 static void __init srbds_select_mitigation(void) { - if (!boot_cpu_has_bug(X86_BUG_SRBDS) || cpu_mitigations_off()) { + if (!boot_cpu_has_bug(X86_BUG_SRBDS)) { srbds_mitigation =3D SRBDS_MITIGATION_OFF; return; } =20 - if (srbds_mitigation =3D=3D SRBDS_MITIGATION_AUTO) - srbds_mitigation =3D SRBDS_MITIGATION_FULL; + if (srbds_mitigation =3D=3D SRBDS_MITIGATION_AUTO) { + if (should_mitigate_vuln(X86_BUG_SRBDS)) + srbds_mitigation =3D SRBDS_MITIGATION_FULL; + else { + srbds_mitigation =3D SRBDS_MITIGATION_OFF; + return; + } + } =20 /* * Check to see if this is one of the MDS_NO systems supporting TSX that --=20 2.34.1 From nobody Wed Dec 17 08:54:38 2025 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2048.outbound.protection.outlook.com [40.107.93.48]) (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 E180B23D297 for ; Fri, 9 May 2025 16:29:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.93.48 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746808147; cv=fail; b=Q1SnZfYx3q5n807qget0bpxwK4mMF02Ydo5jSG87goJXN8VdMVIW9vzA46rbHjfPs02xbl7k2MAuGp2ae4otT+J/y9UZnoCqy3jy1dt+G5rRaiL9GpiRzS4TXrkODll2hEl+kOcLNpCV3oGIph/HDpRz96WaQHy3jTSAYufwo44= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746808147; c=relaxed/simple; bh=2kD+8zFNaQ2HNwxoIx/sJz6284xXHeDYxL/boIKH/4w=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=PpTxNHl1rGcqov6SUpG6VPCkLcCYTWl8hrErqcdgBtc3mTyBFuQVps42QatkZbJmj8jzKa7bUIk0PN0fNV8QfAiS+ekBIYgNJxox3LhX5mb9qMWQVR9HKdskqc+QOH+Cd22fuRZPqf7qQyYD4+RxzFblQ+l8vpPL6xaLGVGF1nc= 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=W7eTl/mc; arc=fail smtp.client-ip=40.107.93.48 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="W7eTl/mc" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=JNpv7ajvKOFHN5AnCJxQxET+dVtOUS9FJqF6/krN8FxFMHd9h+oqkFbBIvphoEGQSUI/IjLdXdKPFuyVzpEWlahMUeigzs/4UE/GoGqoAaLuNwGOaqsQJb6M4zVhMk+apT4bMWwfGznHrgzcbOuCI7Yty5fQohoVQ5qXhz0Y6+4vzAAgl+Vsz+G1B3u+ncaCi9kmsnVyqY/Da3h31xfSJd7lMHO04msrEeAiANNZrzenAFO+txHgJ2JEBRIkuYDZlsbC9fHwmJ08YplcPKwHt4OqUu0GaINLPgA0gFR1qbGQzp038ty8M0FRgeESbauJ+/YJoTmc/jintggJDi7ybg== 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=jYMwPe/gFYIkY6DEvjX6L3EzX5HD972Q8GSbVaRrrp8=; b=rbg0/ewkv6xFTQgtPHJ++2tLKOh4b1r16+w8Wz0Mm55U1G2Mu6Xup67vSKYqKXe7Se51ABGbwVDtecE0mjtEFH5ni5yUs0lwOu0+7liSIzW/cVEiToVii/ixgyx/8ZASWSp6Ygc3vUeKwIQEKIiNlm9SNR2qlT3pov4a9duJbizKlco/u25O6N/jyLLMRYC7LtdDCb/QuqyOYMH9oGakcafNq1wNRMPpodxx1VUwTs7a5Yz6JgGW7Nu1NM69BHkPyr+oo/6n/SPrOGyXivUGipsclf8GTdkUSoz2zxS9edllRODjiTq5udcKW+2xbIx4N9Uce1okrJE1tXHeCPqlig== 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=jYMwPe/gFYIkY6DEvjX6L3EzX5HD972Q8GSbVaRrrp8=; b=W7eTl/mc8f2diXmKwXTajCPJybImrNLftbotHFNx37FChRJ9pDMX8XKUGmcaBJqNax4NCSfHsA3TpfKxydL6x4gPf8lxjR/tIIn3r53MQ8hGeNMlcCsnZCAC6Dk2vLdKuYOxdsKAw4l9X0UKhmn/LuopzyHi81AmxvoWkEqKWVU= Received: from BL1PR13CA0097.namprd13.prod.outlook.com (2603:10b6:208:2b9::12) by SA1PR12MB5659.namprd12.prod.outlook.com (2603:10b6:806:236::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8699.24; Fri, 9 May 2025 16:28:59 +0000 Received: from BN3PEPF0000B074.namprd04.prod.outlook.com (2603:10b6:208:2b9:cafe::88) by BL1PR13CA0097.outlook.office365.com (2603:10b6:208:2b9::12) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8722.19 via Frontend Transport; Fri, 9 May 2025 16:28: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 BN3PEPF0000B074.mail.protection.outlook.com (10.167.243.119) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8722.18 via Frontend Transport; Fri, 9 May 2025 16:28: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; Fri, 9 May 2025 11:28:57 -0500 From: David Kaplan To: Thomas Gleixner , Borislav Petkov , Peter Zijlstra , Josh Poimboeuf , Pawan Gupta , Ingo Molnar , Dave Hansen , , "H . Peter Anvin" CC: Subject: [PATCH v5 10/20] x86/bugs: Add attack vector controls for GDS Date: Fri, 9 May 2025 11:28:29 -0500 Message-ID: <20250509162839.3057217-11-david.kaplan@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250509162839.3057217-1-david.kaplan@amd.com> References: <20250509162839.3057217-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: BN3PEPF0000B074:EE_|SA1PR12MB5659:EE_ X-MS-Office365-Filtering-Correlation-Id: f3c3bce9-9d3d-43bf-ed98-08dd8f1699d0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|36860700013|376014|7416014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?eHm5ENbFxeYjAgvAT2SkmSx5V/H7xWxLqpf0bIIPgm0ULb6MOtxpugi3noOW?= =?us-ascii?Q?SoZWJ8TZ5RmPerQO4CT708CSYxtFiVPLVXTAA7/7EbO3iKixqyJezN4TZrWy?= =?us-ascii?Q?ctVwlqkFtI2fhaFicDeoHBIeWv4OBDPJYV0MhPIVhUFq2RbWN+cFZ7cvHZPz?= =?us-ascii?Q?xSrO25LvU4Qctu2+WVGccL79zp0aVREZgZk1oY/2uodpwuuC2GrzBVD2060u?= =?us-ascii?Q?ePOt0lM5+/wWmimRab6AV3FFQlcwSqWSPy+vYwp1Lo70gz6++K+Ht3zPRUYB?= =?us-ascii?Q?Jn6K/LdQtLDzONK98kAZT6jrZQALn8sDniBOAmRcLY9lNndIsSBUKoO5NNEj?= =?us-ascii?Q?QAPZ0vACHFHEJd/Ju7zcFpNjKt8JzyjhdzMolf5wL8n7jd4daKTDDVBvxL44?= =?us-ascii?Q?7o5r+5IFgHaKkqRSnMTLtaJzG9O5zuzEPb0psk1L+amBbREZFC5JxA9gA0om?= =?us-ascii?Q?4/bQZcln2kFZjFQDPsG3O7KIvBqipXzwQXVvdSDCH9TGf8GdsAWi0gXrgSp5?= =?us-ascii?Q?CVfhscXo4/OuArI+1CBsc46twM1W4x8RqHZ7GDcqFl0jAuRSi84eB2mN/2lm?= =?us-ascii?Q?0yjT0TwwumWottY0mCZrda7H1woCFNGROVqBdqxofiSx1rk1lD2oP3yKcNHx?= =?us-ascii?Q?ffXga7AB+Sql5mgsBeVyTq06WN3JCpupyIZbv30kohIw38uOp+AQCKqqp3JS?= =?us-ascii?Q?+Mz2t7UJU8EMRVMIIKyaqZZ46D7QRs5DjtdTG5o68JrYgj5WIiOf0HMe6zEq?= =?us-ascii?Q?O7pt6OlPK1u2Gfk+IB12pXPSFUcgl5ICuHR9CxG0rriBxt1XTTHSuU525cAa?= =?us-ascii?Q?uWw3K9iWaiD8Jvke2kJMQ2aizColQ5z+xhtYOnJXreEBvAPczXVEatHM5X/0?= =?us-ascii?Q?0+qjLWb7nIsnXu/6622fPy46OJBmXHFosWSagPPZgoA/2urhssGG4VcprVTR?= =?us-ascii?Q?lcErrwOLM9JAiyR1bXNO3dur72JZQ+UeCYNGkt3+tXnNMxaOhoUdPNa1BTLB?= =?us-ascii?Q?o6HM6sGmtGoqxGrWmavwd4L3zxiZ29U+0yb6CcF+9u25YOZcLIa5rrMmAyAh?= =?us-ascii?Q?L3eN/7GaecwRSy4tdErAP5FZgmqG05YV72Y7Rb5NzKNHeX9W87bVkSMPYZpq?= =?us-ascii?Q?pLpAl9ZW7MSaHpFuz0vQaYSSnY+b8PUZjN3TBTm3/rrROq4U62i71vO4r5rA?= =?us-ascii?Q?Ik3RNs92/WP18sh0TmFKURyeP8AlhurOMC02gMTOWUAwyLaG2t+jItz08PUt?= =?us-ascii?Q?Hm0mJoL3C65HQRwGFb3YScEGpmGIrhh3jhG5QLuPOqRhqWkU3UyjLgf/ROvC?= =?us-ascii?Q?ARihFvOE+sa77L0EUhsTP4RKGGTalXEAfSc8n43aFkddw5QVDHs0ne38PNi9?= =?us-ascii?Q?i5MriB04mMSpx+gYrUNKulGo5SVoGIvPhLKbpzmtR8XB86t3hdZpq7x0L57O?= =?us-ascii?Q?b/AstIgCnm1phG13Jekf6OLKdb8xPw0e3bzyYW5GTQ/nW/mzEeUOzrK7BOwr?= =?us-ascii?Q?MRz6FY4w4ZJA4wOnIh+KmZzQoA9XtZQwIAKM?= 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)(376014)(7416014)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2025 16:28:58.8709 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f3c3bce9-9d3d-43bf-ed98-08dd8f1699d0 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: BN3PEPF0000B074.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB5659 Content-Type: text/plain; charset="utf-8" Use attack vector controls to determine if GDS mitigation is required. Signed-off-by: David Kaplan --- arch/x86/kernel/cpu/bugs.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 237ef8d0980a..659455c5b38f 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -1008,12 +1008,15 @@ static void __init gds_select_mitigation(void) return; } =20 - if (cpu_mitigations_off()) - gds_mitigation =3D GDS_MITIGATION_OFF; /* Will verify below that mitigation _can_ be disabled */ - - if (gds_mitigation =3D=3D GDS_MITIGATION_AUTO) - gds_mitigation =3D GDS_MITIGATION_FULL; + if (gds_mitigation =3D=3D GDS_MITIGATION_AUTO) { + if (should_mitigate_vuln(X86_BUG_GDS)) + gds_mitigation =3D GDS_MITIGATION_FULL; + else { + gds_mitigation =3D GDS_MITIGATION_OFF; + return; + } + } =20 /* No microcode */ if (!(x86_arch_cap_msr & ARCH_CAP_GDS_CTRL)) { --=20 2.34.1 From nobody Wed Dec 17 08:54:38 2025 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2064.outbound.protection.outlook.com [40.107.94.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 36CA12367DF for ; Fri, 9 May 2025 16:29:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.94.64 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746808143; cv=fail; b=Oz0nQaIqhTEzeLRncjymB4H72GpQP1jpTsg4JX+H4JdrlKXquN8mo55VnEpWVjGU9unMlznq/yIp3wo5Uz8Se6lE+YoL38mQxfnoBpweBS+WFx5ONRejTccgG3cz7NJanLFCcjEWq0qo2oK31A2Eem6TRTPMMaiTb/LHDx91A+Y= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746808143; c=relaxed/simple; bh=7DCHzGLqdZMy5fCGElerKrOFwVrCI3QRPRlgC/B3Ei8=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=p/t0gKQtHJuZYx2sub2vfXi6fsbTiVRnfE1LrnQkL8l6qxO1jSNZTvcsfOt+cTO0WxHkOyBeAmjB2Ntd28xhaoezd2Nrm/3RZJGj6APnoROZCa5QMA5voyazkhyuQHzXggeATbMyXV372vJbQE19s6IENl/GLa41qHrcycQiDok= 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=VaM69pfk; arc=fail smtp.client-ip=40.107.94.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="VaM69pfk" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ihPayR2tqLaSfiw/xlojJQF0DzgE1gBskeMQ5yglvl+HHtO6KBL0tV3MP+9pU937EpeNvzD1rGWtTjT2DxSdnvHTr/fUywEngHEQUduiUzB8s31Hjq6yIPMB8MrzPlZH9paQ1u6cxLvzQjY4NWswGbDa/frKOn1yNoeJ11221pm1XlziYHJFrvtBOvWnO2kBr1Et95x4Tzl+v00wlqMRNAnToLbkQdgskWiZz0nkTkNfSc8MXllxxVwWqi9HB/kq7PbJuGoM9rCv5iJwSaFC7RgQMiAH6CvlOVlDzpbM6/+6hYBZTnsPN7+GLEGHm9akkpHblkJSomIrjiWUHcdPpg== 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=BCVIOwVgwsLsuXbBNeHpoXLzg+VKVFXeBtmKez7x0Ko=; b=vNxzWYe4aKkGnrYgHrLNxIksSpSUVr68WrvDyfqIzD9elMOVwvT19fwe2A2Ld/5DGAQFSExa33dtavWAYn/ek9WqNkWK5lJy1LBDj8mKwbmepHqPNv6cGwdOlhvCrVW/QxcgWxewQhQVrCyj+46Upr2PY+FeCSPBbeIWHQvnEYbvuKCbTpdzQquQFf/NAcdlbhitrN8GleX5YH1otjnsS/Zgv7XSphzTK1J+4zeMiHpfvcEh8zt9AIaFdzKwx+x8qQNJuCXS2SwAS1x7uc8IG6e1Z4l1FNq0fDXt2bYyrAh/4628dHrC5c9QWmOwUzizRGcdsTOdmFdd8cdHBrHaLw== 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=BCVIOwVgwsLsuXbBNeHpoXLzg+VKVFXeBtmKez7x0Ko=; b=VaM69pfknVicS5lUEY4i3fK3Q5gGsvK4ZmlwDUff7b8IHFDjM/i+hc2Yro89rpF79raI3RK1drgTtSzu0WuB3Hn1vsQMsh1tcsu8GceiNgxqcNf1NobS8SMhqCjAaLApFbZw/61EEM/s2ULsU6fxkKOvIqdsqqO0zZOo+c2yEis= Received: from BL1PR13CA0103.namprd13.prod.outlook.com (2603:10b6:208:2b9::18) by PH7PR12MB6786.namprd12.prod.outlook.com (2603:10b6:510:1ac::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8722.23; Fri, 9 May 2025 16:28:59 +0000 Received: from BN3PEPF0000B074.namprd04.prod.outlook.com (2603:10b6:208:2b9:cafe::6) by BL1PR13CA0103.outlook.office365.com (2603:10b6:208:2b9::18) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8722.19 via Frontend Transport; Fri, 9 May 2025 16:28:59 +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 BN3PEPF0000B074.mail.protection.outlook.com (10.167.243.119) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8722.18 via Frontend Transport; Fri, 9 May 2025 16:28:59 +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; Fri, 9 May 2025 11:28:58 -0500 From: David Kaplan To: Thomas Gleixner , Borislav Petkov , Peter Zijlstra , Josh Poimboeuf , Pawan Gupta , Ingo Molnar , Dave Hansen , , "H . Peter Anvin" CC: Subject: [PATCH v5 11/20] x86/bugs: Add attack vector controls for spectre_v1 Date: Fri, 9 May 2025 11:28:30 -0500 Message-ID: <20250509162839.3057217-12-david.kaplan@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250509162839.3057217-1-david.kaplan@amd.com> References: <20250509162839.3057217-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: BN3PEPF0000B074:EE_|PH7PR12MB6786:EE_ X-MS-Office365-Filtering-Correlation-Id: 17774019-a142-44fc-5934-08dd8f169a3c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|1800799024|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?mUoFcndaUpSJ64vrwzb9Zw8o/oIBvjuy8KJ4E6PUmxDQitPAX7sUeFh3iWm8?= =?us-ascii?Q?nDGqaUl60MyS7/8X5/kp7LUFsH1DZYkjnP+CYljEs65I1LChFm+ODosENo8K?= =?us-ascii?Q?SwmABjE7bC7y9KlAsx8Yf63bSMNFNkxC4hdzx1S0v8NKb91FsbzMVkn2RGBD?= =?us-ascii?Q?W2VGQ+JQ5m0vlpCzjNqvomXKCOzoB0I99LlMqh6Veo3/r5nQkCWUFuE85heE?= =?us-ascii?Q?AA+dk5KmiBj9Epy1ixhPclaoY0actQq2R3SUxKuksu9KjiSWTrTUnfD481pb?= =?us-ascii?Q?W9omH59+X1wFc38Jqae72427gzpSikWEEm79du9HjaJyL6jppE2X2cwKUI6g?= =?us-ascii?Q?ajEZvVzS45WUEIUboIALPZnDcEJkoFD+7cQnV7qBZooEAuxR181d7DuFy5WC?= =?us-ascii?Q?ZxPzYY5ayX5am8BhZj2Yt692dXiRcG9Jk4S14ydayNTrQrRvEBiJwEb8h1IC?= =?us-ascii?Q?kEOMZHxxaz9uxCouf2TyiR67RCyXtBKveZps+R10tWjd6jj1lgPmFIZa0dfz?= =?us-ascii?Q?N5w29CrUx7HZeilIPqDVxbKmzyA5vNQdczd9pUL6TvF9LGxLm/PL+eqFMhn9?= =?us-ascii?Q?SlsCzKlm4yUUJOI6TrNtYmxr48jem22jechak9t2gY1nHyuZ7xVuMLbIlFfq?= =?us-ascii?Q?HUtEbO9hsa7EBo+v8rzTS9JdPpPJxTMqi61vljMz4GruaMZmfx/jWWlGX7Ce?= =?us-ascii?Q?CHSVXhc5XLjRBtop0JG9cIda0lqs4N/vUGDSJU/TD+BqD/wNUmkfrUkwFHQy?= =?us-ascii?Q?HBQiP6SPMxJT/RuyvJnyJDHMtTTZXx+w01hGI0kxWAzeZ90HM0lqYNozgILi?= =?us-ascii?Q?DyA6ZGBQZRZOvdCfRRzrm3vdWuh3JKxYpk8buGdHev2uvOraU3xTcUD+SH0h?= =?us-ascii?Q?e8+eKsMLSIMOnMNfSdKYceSM8X9mS+DXrEQsch/Xk+70+Hk2goDf7T+3orr8?= =?us-ascii?Q?pLpi9vhcSJNauFZYtZYeADOoviZ1/hT0eiOxz1wmUMMuTPqge2a29lNU0Oiw?= =?us-ascii?Q?+RZjSFEHG/zPw83b20DneweRlcM+Mw9Qg3aiB2PrvsCegtmswB/3CT0zyhFv?= =?us-ascii?Q?1uKll+4z4O0m8VJ051tKWnlm6W+XutlZsaXKbiJAWIQHYRKzDfbCTRDnjaQ/?= =?us-ascii?Q?POFSHu4DeOxddKDMrR9S676j3RQKhbD5lF0hJen3XQpQukg3F6O1Q61hvPst?= =?us-ascii?Q?N9lx4uf/ZW+EIZubuclEJL5rc4601GvmwWqzrEsev9KjFsLg51thJCEPRjYd?= =?us-ascii?Q?3qyxx8KJ+YdAw36MsSvIajwmFeLP15tD3Q8kRwz3EcRTT3GkXX6xPKrYWX4A?= =?us-ascii?Q?u3z8Vnsv6jkr/0tOvfc/OGzy1Q/elOIlkN6C/yURPVN8p73G09sdj+hH9mf1?= =?us-ascii?Q?TbamAx9dUrLxVC04ChFa8xr+q7mP+vRMNWUn02WTJdry+bcC657eRxkym36v?= =?us-ascii?Q?mpBXwRWUZUPr7bqxHfjoFxZ5mDVC0ogft3uPUL2P1kkts3bbV6MVzRZuKuC0?= =?us-ascii?Q?qh9WXaZCbIm/dsFICyqViNSIruYGsdNKD8EZ?= 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)(1800799024)(82310400026)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2025 16:28:59.5754 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 17774019-a142-44fc-5934-08dd8f169a3c 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: BN3PEPF0000B074.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB6786 Content-Type: text/plain; charset="utf-8" Use attack vector controls to determine if spectre_v1 mitigation is required. Signed-off-by: David Kaplan --- arch/x86/kernel/cpu/bugs.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 659455c5b38f..ad68130707c2 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -1122,13 +1122,16 @@ 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)) + spectre_v1_mitigation =3D SPECTRE_V1_MITIGATION_NONE; + + if (!should_mitigate_vuln(X86_BUG_SPECTRE_V1)) spectre_v1_mitigation =3D SPECTRE_V1_MITIGATION_NONE; } =20 static void __init spectre_v1_apply_mitigation(void) { - if (!boot_cpu_has_bug(X86_BUG_SPECTRE_V1) || cpu_mitigations_off()) + if (!boot_cpu_has_bug(X86_BUG_SPECTRE_V1)) return; =20 if (spectre_v1_mitigation =3D=3D SPECTRE_V1_MITIGATION_AUTO) { --=20 2.34.1 From nobody Wed Dec 17 08:54:38 2025 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2083.outbound.protection.outlook.com [40.107.93.83]) (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 4042623BD05 for ; Fri, 9 May 2025 16:29:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.93.83 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746808145; cv=fail; b=HJnCROyJoNq1smi7p09/ZT7vqNUdKB/Ch72qTbjmAcsajqG/eK2CGhuujQgiY/4VzyBUxV+HFaJaxlz0FrdUrlPNJ/qF/8e1cr+g/Fvqzkggh5h6H1wR8gMmCrxvfvg7Vw5zDrdwGEaSFQLNQxSDJkAnCpYr2h+787lPsph7oNE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746808145; c=relaxed/simple; bh=tRBYN+cny0WeAiMGZPWS1+6lVmTDpS/ovmRvkpoR4tI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=H/aLAl4dpfMp5VFvpRLxXdvbXo2wT7SOqqExBZ23VE2Hn/ltf+skVVAi9yAMjV/DND127sWhwoZsH7ptuTcwL7WudIWs0sk2Buox0TRrHuBZxcY3b5TbgjMjLpboEKv/FDsUjYb682roKZ4rkqgjvU1WxQdGmOUDx3RlAZXvrUY= 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=a9WxRY0u; arc=fail smtp.client-ip=40.107.93.83 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="a9WxRY0u" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ohflnBMYipNQY+6ejx02AJB5RsrwYHz4orU7ir+NEQ+LIkf33+csuHXHWfDHKog7hxBz/D7e2NEx4qLW/b2/3ZwHI/84I+fVcbDLL3GMq7hARWzBb9M3PGsSH2M09UBlhKy6qCbLQTRSDh7ok+tLzKv7mQ/HippqiMr0WizxJzEYJwmouOuIUGkeo7zgcIkspv8Juf6vdNgk2o5NvGia34FVltwUKiGcSWPXR3df4hm26eYX1uK9MjsYOILLZN/XWju/a1b4wMGO08fUoC6w8PWHygjszetEbIZ/bgxH6+aoekywkbURzOFhVwiAZvVT9ShxPjaW1TwiFEX5rzixFA== 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=DH94MwYROFayZ9EhNJq9fMoBvK0P79UwFDdThTJW+Zo=; b=qYhpWUPGg1xaeOWwmJDSYmbMxs6AV5hFulJGsz+UzuWWqaq2CVupRS68DuaqxGM/tjXMFO9gne4GNn1soOmx0KMiYlCFAqFdSwp7XxQSkJ8L4Qtr36k/Sqt385giKp7OydjdoC/mHWtBHT3VN6wo/pHZ92pMrW8Py/7cMa15WlaF172lCWkkecF/N7Vw+NksdsbolF+dvGnQeeETlgp5rxChnrkquKhYgY4N8SRE66i+grYf1MqERTKsetrpPijN7fqOwvLD2F5jkqgg0/Q26P2wurJ8JEiaL/bKbWfFykbq5G21bfCmL9WNyCVAg+bPe+m+WRkC0akcBEWcZTTKTA== 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=DH94MwYROFayZ9EhNJq9fMoBvK0P79UwFDdThTJW+Zo=; b=a9WxRY0uAfsvi9a3Fm4ztcP/hphPNE6IUYp2sq626Pm6fhK1zUPdI5d46JbmCP3zo0Bj1MlKO1cPvuUIaMDZ56O/Kw+3LQaAL161IjxdwxKGY21Eqqfc/tTJJ9Pek7WFRuMf8YNoYAPG7C+iusOfv1i5oAQff/Dl4xiZlmhUeZU= Received: from BL1PR13CA0117.namprd13.prod.outlook.com (2603:10b6:208:2b9::32) by MW3PR12MB4457.namprd12.prod.outlook.com (2603:10b6:303:2e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8722.23; Fri, 9 May 2025 16:29:00 +0000 Received: from BN3PEPF0000B074.namprd04.prod.outlook.com (2603:10b6:208:2b9:cafe::c0) by BL1PR13CA0117.outlook.office365.com (2603:10b6:208:2b9::32) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8746.6 via Frontend Transport; Fri, 9 May 2025 16:29:00 +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 BN3PEPF0000B074.mail.protection.outlook.com (10.167.243.119) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8722.18 via Frontend Transport; Fri, 9 May 2025 16:29:00 +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; Fri, 9 May 2025 11:28:58 -0500 From: David Kaplan To: Thomas Gleixner , Borislav Petkov , Peter Zijlstra , Josh Poimboeuf , Pawan Gupta , Ingo Molnar , Dave Hansen , , "H . Peter Anvin" CC: Subject: [PATCH v5 12/20] x86/bugs: Add attack vector controls for retbleed Date: Fri, 9 May 2025 11:28:31 -0500 Message-ID: <20250509162839.3057217-13-david.kaplan@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250509162839.3057217-1-david.kaplan@amd.com> References: <20250509162839.3057217-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: BN3PEPF0000B074:EE_|MW3PR12MB4457:EE_ X-MS-Office365-Filtering-Correlation-Id: d3fc6c9a-b893-4d1c-806b-08dd8f169a91 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|82310400026|36860700013|376014|7416014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?jhi5z3wR/FGynEqGkzAPPOK6UXDiKIFmYl9mlbwwkIRpJd0ZIMVa8t3Tch4e?= =?us-ascii?Q?9BPEAJ+t7m1nq8m44iloP6zFAugWkX4+A/Qqsibpn8u+jLMQJ4jNZwDPUTPZ?= =?us-ascii?Q?/b4LKyhpkTXQnROekWqq0vmJ+/RiT1BV0mujW1UuTRwgL90es5A2mzqE/GmH?= =?us-ascii?Q?UWq9oO6qcnXq1OmxGhM3i2oaiw1BaFqjRJwm4p1YqTvs65k7hzMvVkrP8rKr?= =?us-ascii?Q?RTtS5+I6AV9+9TZt/zUZADWxz7jA6rdEwr4xOoqq15+nIcRzes5jSzU9/EdN?= =?us-ascii?Q?BLDYCatDVcJd6vvegDyIXxrW0t3REbYgtXfUVsKEKSux2xTZxdhSzNsSoxTv?= =?us-ascii?Q?e7Ry9lb/u95SPjAUlXE8dsfiHs2oUWpksrmKtTgnvtmmsTVt4+8vhYyZeyfq?= =?us-ascii?Q?Ln2WmupzpCcWVfBWh9t+vpyTKKbLfzhR97DjTvrf2eLcANZO6zMsv/YNyeMH?= =?us-ascii?Q?oX/WSH8/RN79G9e/zVm31+k9LIL3eHrtrpUK+pi6W1Wf8cCDkMUuheT5huQF?= =?us-ascii?Q?j9tqWajw5ZsVuY7wE6eBO0EGzw+sv7zVE9JKBX+NYBL6DffVmJcSsy6T6+tw?= =?us-ascii?Q?+abBTogFf9u+m5ctor/SWLE/GH0X8z64pegYxoZW0sAZRV5Aasr4f96+Y9f7?= =?us-ascii?Q?Pbfl4WtM+jxhc+jXOsxO1BohWQVFj0Q/PLScGaOerV86fcpBDzOV29+u+ius?= =?us-ascii?Q?JPNijO8ZbgZSTv6/qpw9lLamQkhiW8n5EY+JnRFFulZOe246NQXRKQkh4Wjt?= =?us-ascii?Q?6NIC03rM9MymNPqJ83vmDZusRp/Jr3jPvsrfzczTEOUL6697PnWfnHj/ZcF9?= =?us-ascii?Q?vRLltfiUVGnbDoYZ9dTUaMFHaXzWkZes1RobOemvhO7b0rF8XyqahwaElq5f?= =?us-ascii?Q?qjocIs2+dHKRZNswDMOb+cDCgflXWSwiKrfvL9ijXWEaN4lQ1spn1Mkzo41+?= =?us-ascii?Q?LIpdTQCEmNaPdJvYaofYUknKGv68uwy6wkVVyUsJpsMf36+DkTXTxbf8qMI4?= =?us-ascii?Q?GJ1YFQsPau0rEHqOz/focgZuOMf7SKk8T5hJavKO9m8VVThKEZSdQ5zlLeGd?= =?us-ascii?Q?NG/z0bjDdutUK/ZQUhZ1OkLwPLiDAUs05CKobzelrYDUcePWhuR+DaQkKYWi?= =?us-ascii?Q?T3XKiB9wuBW3KeYcmzaUyxypA+PFE0/3QtWb2dDzGGqWwm9OKTbS9or8rwTA?= =?us-ascii?Q?PhEi2dRHRq12pUnLZWJKj6/BrIYo1C/7nqSrs+KPF9bwlEP1FQvrL7EXH4kt?= =?us-ascii?Q?+XrIqugPhZhFpkPdBKNw1E5yUt4Qo+bYhWoo/+grzxBa12xaoaInWR60I5Y/?= =?us-ascii?Q?YflXjSgHRPNBJVWJVaF/wXrgipjrhKnr1otl8GpdNwtZyq5nOi9K6qvJT0RD?= =?us-ascii?Q?e/Nx3hjQLxBbfYi1Ur3f/tB/m8iPLSCh09S7gR7PBaUY99DmoGjB3xvU1pYj?= =?us-ascii?Q?sHiaZYy9muRIGvX4q63pUY6VLc5IQtkIVcb8Rrd3XAtZN3ZV/xvVNFOJb+Ma?= =?us-ascii?Q?KBSMreeyCJBVOX4Oz7CJAprywg4spnm/Zd8Q?= 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)(82310400026)(36860700013)(376014)(7416014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2025 16:29:00.1336 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d3fc6c9a-b893-4d1c-806b-08dd8f169a91 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: BN3PEPF0000B074.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR12MB4457 Content-Type: text/plain; charset="utf-8" Use attack vector controls to determine if retbleed mitigation is required. Disable SMT if cross-thread protection is desired and STIBP is not available. 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 ad68130707c2..160dcaa18b04 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -1251,7 +1251,7 @@ early_param("retbleed", retbleed_parse_cmdline); =20 static void __init retbleed_select_mitigation(void) { - if (!boot_cpu_has_bug(X86_BUG_RETBLEED) || cpu_mitigations_off()) { + if (!boot_cpu_has_bug(X86_BUG_RETBLEED)) { retbleed_mitigation =3D RETBLEED_MITIGATION_NONE; return; } @@ -1288,6 +1288,11 @@ static void __init retbleed_select_mitigation(void) if (retbleed_mitigation !=3D RETBLEED_MITIGATION_AUTO) return; =20 + if (!should_mitigate_vuln(X86_BUG_RETBLEED)) { + retbleed_mitigation =3D RETBLEED_MITIGATION_NONE; + return; + } + /* Intel mitigation selected in retbleed_update_mitigation() */ if (boot_cpu_data.x86_vendor =3D=3D X86_VENDOR_AMD || boot_cpu_data.x86_vendor =3D=3D X86_VENDOR_HYGON) { @@ -1303,7 +1308,7 @@ static void __init retbleed_select_mitigation(void) =20 static void __init retbleed_update_mitigation(void) { - if (!boot_cpu_has_bug(X86_BUG_RETBLEED) || cpu_mitigations_off()) + if (!boot_cpu_has_bug(X86_BUG_RETBLEED)) return; =20 if (retbleed_mitigation =3D=3D RETBLEED_MITIGATION_NONE) @@ -1401,7 +1406,7 @@ static void __init retbleed_apply_mitigation(void) } =20 if (mitigate_smt && !boot_cpu_has(X86_FEATURE_STIBP) && - (retbleed_nosmt || cpu_mitigations_auto_nosmt())) + (retbleed_nosmt || smt_mitigations =3D=3D SMT_MITIGATIONS_ON)) cpu_smt_disable(false); } =20 --=20 2.34.1 From nobody Wed Dec 17 08:54:38 2025 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2045.outbound.protection.outlook.com [40.107.236.45]) (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 EADE22918D9 for ; Fri, 9 May 2025 16:29:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.236.45 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746808153; cv=fail; b=RbhEsoPtR0vU1yay9AzfabMq72vgz31SCVl4qUj7QPK4KjiVgs4kvr6ht75bl30KaEr8BkJsCQPxu6XW2RvOyEc16OgLODa2oe3iXhyGrISERfUL4r1k+UjoTVditpv4NHiI371PiMgQkSPdSkJ93Yc8vgxgO99UVvPsVINcfXI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746808153; c=relaxed/simple; bh=0arSg2n0XSFlrzbaUoKyWgpPNqvjTw6BDVyVDCmAon8=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=qfHGIYO0cYPIToKvF+Of0yi4PwMe0h5OQdLB9k/NmT2E33RzRsAETUhJdxpxXZwYxaJcIaYOh3LseqjabfaMtoth+wOtR7NgBZLtR0WHQBG230wDJ4DY7qkSd8HkFzvY+sUzVVwg9qCxDooOikoK5reBJceT88dxtNc0u7KlV6E= 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=rvlTnXVU; arc=fail smtp.client-ip=40.107.236.45 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="rvlTnXVU" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Eg3QNqpZ8oKhBkDqMbfDrLk2Yf5u3EKWyybWFa8gwkF6uavQYShMUfyOsPe70JlLmCE+5oM1BuXexfDceaueyZ94c/pzb/Lzl7RPz8F6d9OWc+YS8VjqkcLDTibT0j281hCNHrsrUNi2jj1noKVFJk07qFICJI3Mx1nQQwnma4W3a0oAjjrFfG4bEFNbRAhMKpgPaEvinlSnWUFJeKEDgZCgw1eyC8h5PeSoCuHClz/PdOaV8uhTULqPwUj761Ui+qBFCZJx8BMIEuQh+KewWN0wgdJNfK6mTD7BGhS0goXSAQG8NMX+o2t1L8Rmsj3n2HWZQJsCVrUMevXWYcgM6Q== 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=OPt5bgti877jDWnmf/WN1Oa7K2oSotr3SBVnJdO77MA=; b=Abubh7wY5V9AXp/mNFjo/FqxAvcUMovif5j+9qHeD07lmW+9Zw/VsIWWEFxAlkHfJMLZ1UKIabKi1D56Ahef6/G3KLeXaXbKtTMDLTr2tHycHRfMC3Nqgz0LQC9B+SGjwasaHHHy/CZwfnEb/OJziJkndtiOMvIzgFhSJI+FsncXWlK5USk5OHDVGnBuxhxQGBVmkiM7JA1s+Vxk7aShs8PpwOwJQa73L5f7rRfdkDPnqpZRW3BfTzSazJpzPNSla8Te4IgvJgXwSskYxGXShDA0L5u9bdEHeOhV1IF96Zbn8tZ6cgREHbnoSfvaaINTdDFNQi19L1N/ycGMU4w6tQ== 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=OPt5bgti877jDWnmf/WN1Oa7K2oSotr3SBVnJdO77MA=; b=rvlTnXVUChxSMDf/4UPYxUGPyWG8G3FMXhqPAT3JzX4xq1GH8OaVN6cCVuPRB6DInWtDjzmtpkCSQEYrDkw18ssAHykATPi8CEyst8fSmDbQf1ZdcC1kPfVwlL6GetSpxlI4lLHKDj91L+Zgb8Q0bqu3IACCIJZnOu8hN+mHsCQ= Received: from BL1PR13CA0120.namprd13.prod.outlook.com (2603:10b6:208:2b9::35) by MW4PR12MB6825.namprd12.prod.outlook.com (2603:10b6:303:20d::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8699.26; Fri, 9 May 2025 16:29:02 +0000 Received: from BN3PEPF0000B074.namprd04.prod.outlook.com (2603:10b6:208:2b9:cafe::3) by BL1PR13CA0120.outlook.office365.com (2603:10b6:208:2b9::35) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8722.19 via Frontend Transport; Fri, 9 May 2025 16:29:01 +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 BN3PEPF0000B074.mail.protection.outlook.com (10.167.243.119) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8722.18 via Frontend Transport; Fri, 9 May 2025 16:29:01 +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; Fri, 9 May 2025 11:28:59 -0500 From: David Kaplan To: Thomas Gleixner , Borislav Petkov , Peter Zijlstra , Josh Poimboeuf , Pawan Gupta , Ingo Molnar , Dave Hansen , , "H . Peter Anvin" CC: Subject: [PATCH v5 13/20] x86/bugs: Add attack vector controls for spectre_v2_user Date: Fri, 9 May 2025 11:28:32 -0500 Message-ID: <20250509162839.3057217-14-david.kaplan@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250509162839.3057217-1-david.kaplan@amd.com> References: <20250509162839.3057217-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: BN3PEPF0000B074:EE_|MW4PR12MB6825:EE_ X-MS-Office365-Filtering-Correlation-Id: 345ddc9e-9fee-4b97-1c10-08dd8f169b22 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|82310400026|7416014|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?XUTjSm5SH09B6uk3byg/uhUnLp9/GfUG8+KkRGqHpue9nRmxUGySMHpNcK6t?= =?us-ascii?Q?nqN3JjTC94n5rWET9PVQTxaGDAD5AE3aUMyW5MqpeLCcFUc2ldg3TTfUd/cI?= =?us-ascii?Q?9z+r3EuYYX5r4CsY4TbnayDUcUOBfQTudekGQlBe2X7YtCsFDcbrfCULj3nU?= =?us-ascii?Q?TNvwgLgSP5MVbXTy/KRMn1zaGzK9bvdTRj2b/hs16YFi2jwRb0PoYRyFg4th?= =?us-ascii?Q?jLbLda0138lH1H692T5I04YB2no9ld4U70JUhWxOa5DznERcYcS/tvkDCVh8?= =?us-ascii?Q?PolkwN7bxEa8X9T8NwkZ+oPWJmxawOBSt3NLoXAoh/8WqTDkmee2T2AhEcKW?= =?us-ascii?Q?QFePNQsOSj5sO3zF2e/5lUxRvpLCZyOCkAY/8I5QewFbmGMiq5uzF2TfhiEI?= =?us-ascii?Q?bZKKNT37eYRKOYFlacvhcQU/KLKxewbg0lbvQ5aIyIU+AYCVJvANjOpMbgYj?= =?us-ascii?Q?qyeH53LMWYnL/Epg3FKbBoH2tM3eKy+mID+i5oOGTQ6uhLS7YY67epH6dLdJ?= =?us-ascii?Q?fHwAp/p2xsKMxW2gW95Sl/0gLCdpKzqqB3j7cnvXEeWqdGxeseytZ/lZVBhb?= =?us-ascii?Q?Hn1CMi1/AiKBxsTMC3un3xf0mVio1o+3iAQVY9nCa958hI8biI6WwfuEEvzI?= =?us-ascii?Q?DnkusMGTuKueurEg2lvdjBK/q/2tQunsHY/u3Be3wpoSSc5RU/r+h+zaCIVC?= =?us-ascii?Q?PsTLsUEt8Xlzw3gQsn7nGILDQM7PoSfxHWPlWtR8g92JAffMRtU0Tk4SaGD1?= =?us-ascii?Q?mhe2rGMLs20ZyFZNlQNQeBcqJxgv+LnH0jChhFi48cUfWRKMe4AP3IYAd7vB?= =?us-ascii?Q?nPa9vI9lPIjNPZkyn8oOD/6KZOzGXDl6Ivr9Q8tGFGhiByMDG/diCNyrPoOp?= =?us-ascii?Q?U9NOGeL7StgbfTljNA1UXRLA3iHxvaNVxKu9glkDUgtDCpIjCewIVuHjUk+z?= =?us-ascii?Q?mz9jEaHpQuLmuDGvQAGVGWXr0BApKA9cDsnQNOUxOtp4b2O0eUJPSijaqu+x?= =?us-ascii?Q?xSltFc9XG1BkI2GFPbwxJ9+6/205hSq6ciIcT1ZlPMePUZERQVbt1W6uczQy?= =?us-ascii?Q?q73kVy8zKYLNzvm+3rxwOMycqzGbyfMII0aazYzNKYq7zaVCjTSSiCDOBer7?= =?us-ascii?Q?yEcyJU87sKML2OyvrDxHOn7sKa+FKiqo56itXMl0paZjY6dN0XVHd1y8Z1c2?= =?us-ascii?Q?at0/G48PKUhmqnpnKIkk5YD82csaYC5/JOwuJ0sDDpiqiBBnMRHfb5xh9KW4?= =?us-ascii?Q?Hkwq8IdPoZVGXWSZg6TmihMhvqmW3EHJYllvia4bA+HJ0SpE6XTmKY/sVp/m?= =?us-ascii?Q?i58XaBW6QRl6VN+uAvIv9acfXzQ3eqI+p/ypR4f0g4SIyjCPnRIxQVQcr6zf?= =?us-ascii?Q?aY3oP1Z09xWXQQqMM8RB+l64tyNtAPthqFGqFUObsRH4CsUB937y5vBjzssV?= =?us-ascii?Q?yL0Avj0Gx+HP1dynn8MY8iT/FUOU5wB247gj1ejskTtTWtQRyiGoJejgJK9/?= =?us-ascii?Q?/H2O9LXyanRh15Jy5DYaVq0lJ13QPWNBFRX8?= 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)(376014)(82310400026)(7416014)(1800799024)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2025 16:29:01.0805 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 345ddc9e-9fee-4b97-1c10-08dd8f169b22 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: BN3PEPF0000B074.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB6825 Content-Type: text/plain; charset="utf-8" Use attack vector controls to determine if spectre_v2_user mitigation is required. Signed-off-by: David Kaplan --- arch/x86/kernel/cpu/bugs.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 160dcaa18b04..305a11fa9521 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -1532,7 +1532,7 @@ static enum spectre_v2_user_cmd __init spectre_v2_par= se_user_cmdline(void) char arg[20]; int ret, i; =20 - if (cpu_mitigations_off() || !IS_ENABLED(CONFIG_MITIGATION_SPECTRE_V2)) + if (!IS_ENABLED(CONFIG_MITIGATION_SPECTRE_V2)) return SPECTRE_V2_USER_CMD_NONE; =20 ret =3D cmdline_find_option(boot_command_line, "spectre_v2_user", @@ -1570,6 +1570,13 @@ static void __init spectre_v2_user_select_mitigation= (void) spectre_v2_user_stibp =3D SPECTRE_V2_USER_STRICT; break; case SPECTRE_V2_USER_CMD_AUTO: + if (!should_mitigate_vuln(X86_BUG_SPECTRE_V2_USER)) + break; + spectre_v2_user_ibpb =3D SPECTRE_V2_USER_PRCTL; + if (smt_mitigations =3D=3D SMT_MITIGATIONS_OFF) + break; + spectre_v2_user_stibp =3D SPECTRE_V2_USER_PRCTL; + break; case SPECTRE_V2_USER_CMD_PRCTL: spectre_v2_user_ibpb =3D SPECTRE_V2_USER_PRCTL; spectre_v2_user_stibp =3D SPECTRE_V2_USER_PRCTL; --=20 2.34.1 From nobody Wed Dec 17 08:54:38 2025 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2061.outbound.protection.outlook.com [40.107.243.61]) (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 3E37A22DA1A for ; Fri, 9 May 2025 16:29:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.243.61 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746808148; cv=fail; b=LhOggso8/P280dnQuAL2fRHH2TQxntNO+KyQz48OwC+g0CeiaALe4IWP78tG4AXELuSfv9MTQM+wDVXdICCxuoy4I08ARuo8oo0bsBetW8F9sWS6MqJCztsKeoISkbhEA/uhdBlprK08AMgB8s3rY1QPZrvJ8BhDJuLRUeVVUIQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746808148; c=relaxed/simple; bh=AnJXAq9P6kM8i9u6iFMnedZ+BFxBd0nqR4NB3zporMY=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=eeRNGCy1uiJMtg9Ay+BVHcSCLAbScTgt2ULDMPxVU5j0xzPfgDEoXQJS6VhxkBamQDZIl1jFrClYiUBAuklfTghLdMzqOV3qK1wDDhR0KZubcFYREmznqhJQ6ijyNKkRwnDj9nlsS5Vl99GkXh4A6kf4oW/1hgBrKNKI8pQST7U= 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=vt8+Rgg8; arc=fail smtp.client-ip=40.107.243.61 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="vt8+Rgg8" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=I19JfmMef9kkfXqomd7G5l0+PnFKBkIzK8y5ETJ0Ei25uZE7Usl4mdXubsC+MpgoiWXQ3lu8zXjH7CdJZsfZkkMz7mUUCHHrj57FQYiY+aau4T1HPNJfXfKZNW+OImUKO8g4ctBeYLfx/k3kXM88P6QeWkY/C598lroox+4gCHPbcaAWE/zh+uEZQZp54sQtbCaeBQgck5uV6vtjJ+H1r/1v8nJcNhyhc+fGYJaz/wCXYOaC4K2aRliAv5DDArCMS8JZdZ0FCT3J+8oLJW4z+ALMXbhktOLEhcCySKHj4kEuUm5AsprvUitJWRYhhDFgLi5TODmnf/22f1V1oTs/cg== 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=wou7asFIe0VOjM1zM9rLsm+/8/HkGmEZFxSnVqocGg0=; b=RjS45S4+dRQ9c84YWpm7NGboaq8HjAOhAu0urfLet7cvo7P/Urd4DArBI5Blll9+P9b6P8Rk43QUDW+jmH6u69Aa1+qLC6Sx+7lP+uN3CZUfWPAdzBeR/oxN5savU+xqMSZd6RCH9JjTmGOnmH/QBG1PCAUTniOcUQhc8jKgUpvYfB9kn2ugv4xj/oI7kaYSNv0BGL6jo1NuDMURGLNc+5PjUxDSwJ79oyqtEAV09gY4oNflF2OOTToe16E3yogXuPIP1Rx4EDAKJg5QSx3EJUw7cZfpgp4Ag/k0xX6UcTyVBcviRbyG8woep8mPeSE16AqYnTe5LXfKwKiqYXNfBQ== 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=wou7asFIe0VOjM1zM9rLsm+/8/HkGmEZFxSnVqocGg0=; b=vt8+Rgg8bhfYmVXOeYxp+dWT0UmbAKKihM6K9dXyJSkeELKFmSiQMGQ24IZ828F9AvlhThCm3bLfqb+UXYm8Ww0mMex0OamgvjMOAv95QRVSfxzGEsRRrOF/G5IIT9gGkaKn8j+CWpwcDXIGUbSlYaeWo+mSOzCsDU63FzDyFV4= Received: from BL1PR13CA0113.namprd13.prod.outlook.com (2603:10b6:208:2b9::28) by CY5PR12MB6479.namprd12.prod.outlook.com (2603:10b6:930:34::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8699.22; Fri, 9 May 2025 16:29:03 +0000 Received: from BN3PEPF0000B074.namprd04.prod.outlook.com (2603:10b6:208:2b9:cafe::c5) by BL1PR13CA0113.outlook.office365.com (2603:10b6:208:2b9::28) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8722.19 via Frontend Transport; Fri, 9 May 2025 16:29:02 +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 BN3PEPF0000B074.mail.protection.outlook.com (10.167.243.119) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8722.18 via Frontend Transport; Fri, 9 May 2025 16:29:02 +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; Fri, 9 May 2025 11:28:59 -0500 From: David Kaplan To: Thomas Gleixner , Borislav Petkov , Peter Zijlstra , Josh Poimboeuf , Pawan Gupta , Ingo Molnar , Dave Hansen , , "H . Peter Anvin" CC: Subject: [PATCH v5 14/20] x86/bugs: Add attack vector controls for BHI Date: Fri, 9 May 2025 11:28:33 -0500 Message-ID: <20250509162839.3057217-15-david.kaplan@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250509162839.3057217-1-david.kaplan@amd.com> References: <20250509162839.3057217-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: BN3PEPF0000B074:EE_|CY5PR12MB6479:EE_ X-MS-Office365-Filtering-Correlation-Id: d2661487-ee37-4b06-ceba-08dd8f169c23 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|82310400026|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?zu43s5tgKLlgQPxFVsgpNcMrCeSVY7P7AYR6aFk7anS6Y2DiTauCIJK5nsBG?= =?us-ascii?Q?97mu5InltsvTsYTT2CRTBqOmAi0jrNS4g/htRa5zw0sib92aMNa+n2fWwlLo?= =?us-ascii?Q?9K5DGxGpeup/vxgjYPVg10RlsSMm92QngMDS1Og1BKXAPJKbTzgy0DjOmDg7?= =?us-ascii?Q?eswmi4oCsXcBpNM6MFJuqSZsh/NahZ86dVJhfLzwCdX+0yROjOa2wWOXlTZo?= =?us-ascii?Q?fVAB/21/QdPjIyu9rYuB8eGDQYTMcL+cyuUICMEvleDpfgk6833H1gE6+Na7?= =?us-ascii?Q?i0+BXiOyRpkw4lj/YDti1rzAGH8wjyRs56DoAn/9GuRT2+niwdGhiompmInj?= =?us-ascii?Q?vqPx6CWoDFIHo4vWnmk9u4P7PzRYy38FUDqN+Ff+wU1SBjYBpaDebmqz8013?= =?us-ascii?Q?lSno/TfKcBjoLnD5HiRP/rMj67W6m0IG5/y2T5cUWK8nXDvlVcWVQ7slK50s?= =?us-ascii?Q?QA0WS+aFSKhaixVs2GpqWdertIzYO8fIBayPhnKPIEMCX3+NDvmbSxlnXhcR?= =?us-ascii?Q?3wZbqO+psUcFm7o/sfIxpl9JYFQWplEIUPRigXC+CNGFju3g3zDD7NRqmV5i?= =?us-ascii?Q?ReqPtPZOaNM7zf1YigW6Q9qd9/QXrru6b2h53jqPbAnGEPu3F7MHP7d2Q7Rs?= =?us-ascii?Q?pZise0iJogY1pAQlxqLJ9ylYe2MOLS6N79RXVgla58DSwLyCfHD57RD+qWJ5?= =?us-ascii?Q?LHVUXd0aGeI3Ppw9BFzK+ZmhJJUgv+9ic95+w+3SUapqN1A6sH+P50jT7zDM?= =?us-ascii?Q?uzqOSbwhjOKBZuUtjzmL9GEzgEshN5qZhMtC07ALI2KsdLkQDOLlcW/dn5s+?= =?us-ascii?Q?EkPJObTWxlLQidYVjfOvQKwD/S5TeECLGU2X/Edqudox6Hs3BjukKCDKFMYQ?= =?us-ascii?Q?vUZ5pDBD5LANXkoiNBvFFg1tl3kdlzEgFuXjMF94JvGwUuD47mC2Hf0BoH7O?= =?us-ascii?Q?Q+GNEdoTAfObqtSBSVpP8Ya3YDNgENb/LMbK/zQTg2cgDxUBkG6ed5+zHiK1?= =?us-ascii?Q?ObEWGpPjvIw+sDAxdX323O7SFP2gwlS1AyUmCvfrOhYaNaBoUdCBQeGu8Xmx?= =?us-ascii?Q?B7RjFCXyVgKBo7hs3+xpSWtEWY4MF6dwms9677Fcv1SLljsBhxPpEMZWIacc?= =?us-ascii?Q?EjMgCCkUs7iGB+S/1nMzMhltd4bmKWTSMi/ZH6cT4wPk9xDC+RxkdZX0KsEx?= =?us-ascii?Q?NSOlF/hAGrnUMnjDdU+GpyJ8hQrxt1sa+Fmv2YqA/IC2hEeOHmetXJmskcTq?= =?us-ascii?Q?maGxMZKO6sE+p5VjH7WL4+zAz0xlwVspe+xPk40E1FGB526qkBnp+B+298mU?= =?us-ascii?Q?jiPUtbOwRmgcIc5nbyZKDuwMZcOFymvcjc5lnr6qAJnCImHj5MCg8skr/cw6?= =?us-ascii?Q?RKqWJbkbluxPaavaRLEm6xTXBSbFnEb4Xj9zSJFON1enH610HulRTFIqSAVm?= =?us-ascii?Q?doY+gKYxEpqJgCoJUX9fGVtbczYHPlEGA+x0y6okHTSyhC9o7Kqh+WXcSgSc?= =?us-ascii?Q?jytZtDA+neTCN/mK3pkHfjM1NJfCBXhldTDD?= 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)(376014)(7416014)(82310400026)(36860700013)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2025 16:29:02.7698 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d2661487-ee37-4b06-ceba-08dd8f169c23 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: BN3PEPF0000B074.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6479 Content-Type: text/plain; charset="utf-8" There are two BHI mitigations, one for SYSCALL and one for VMEXIT. Split these up so they can be selected individually based on attack vector. Signed-off-by: David Kaplan --- arch/x86/kernel/cpu/bugs.c | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 305a11fa9521..667385808400 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -1905,8 +1905,9 @@ static bool __init spec_ctrl_bhi_dis(void) enum bhi_mitigations { BHI_MITIGATION_OFF, BHI_MITIGATION_AUTO, - BHI_MITIGATION_ON, + BHI_MITIGATION_FULL, BHI_MITIGATION_VMEXIT_ONLY, + BHI_MITIGATION_SYSCALL_ONLY }; =20 static enum bhi_mitigations bhi_mitigation __ro_after_init =3D @@ -1920,7 +1921,7 @@ static int __init spectre_bhi_parse_cmdline(char *str) if (!strcmp(str, "off")) bhi_mitigation =3D BHI_MITIGATION_OFF; else if (!strcmp(str, "on")) - bhi_mitigation =3D BHI_MITIGATION_ON; + bhi_mitigation =3D BHI_MITIGATION_FULL; else if (!strcmp(str, "vmexit")) bhi_mitigation =3D BHI_MITIGATION_VMEXIT_ONLY; else @@ -1932,11 +1933,22 @@ early_param("spectre_bhi", spectre_bhi_parse_cmdlin= e); =20 static void __init bhi_select_mitigation(void) { - if (!boot_cpu_has(X86_BUG_BHI) || cpu_mitigations_off()) + if (!boot_cpu_has(X86_BUG_BHI)) bhi_mitigation =3D BHI_MITIGATION_OFF; =20 - if (bhi_mitigation =3D=3D BHI_MITIGATION_AUTO) - bhi_mitigation =3D BHI_MITIGATION_ON; + if (bhi_mitigation !=3D BHI_MITIGATION_AUTO) + return; + + if (cpu_attack_vector_mitigated(CPU_MITIGATE_USER_KERNEL)) { + if (cpu_attack_vector_mitigated(CPU_MITIGATE_GUEST_HOST)) + bhi_mitigation =3D BHI_MITIGATION_FULL; + else + bhi_mitigation =3D BHI_MITIGATION_SYSCALL_ONLY; + } else if (cpu_attack_vector_mitigated(CPU_MITIGATE_GUEST_HOST)) { + bhi_mitigation =3D BHI_MITIGATION_VMEXIT_ONLY; + } else { + bhi_mitigation =3D BHI_MITIGATION_OFF; + } } =20 static void __init bhi_update_mitigation(void) @@ -1969,15 +1981,19 @@ static void __init bhi_apply_mitigation(void) if (!IS_ENABLED(CONFIG_X86_64)) return; =20 - if (bhi_mitigation =3D=3D BHI_MITIGATION_VMEXIT_ONLY) { - pr_info("Spectre BHI mitigation: SW BHB clearing on VM exit only\n"); + /* Mitigate KVM if guest->host protection is desired */ + if (bhi_mitigation =3D=3D BHI_MITIGATION_FULL || + bhi_mitigation =3D=3D BHI_MITIGATION_VMEXIT_ONLY) { setup_force_cpu_cap(X86_FEATURE_CLEAR_BHB_VMEXIT); - return; + pr_info("Spectre BHI mitigation: SW BHB clearing on VM exit\n"); } =20 - pr_info("Spectre BHI mitigation: SW BHB clearing on syscall and VM exit\n= "); - setup_force_cpu_cap(X86_FEATURE_CLEAR_BHB_LOOP); - setup_force_cpu_cap(X86_FEATURE_CLEAR_BHB_VMEXIT); + /* Mitigate syscalls if user->kernel protection is desired */ + if (bhi_mitigation =3D=3D BHI_MITIGATION_FULL || + bhi_mitigation =3D=3D BHI_MITIGATION_SYSCALL_ONLY) { + setup_force_cpu_cap(X86_FEATURE_CLEAR_BHB_LOOP); + pr_info("Spectre BHI mitigation: SW BHB clearing on syscall\n"); + } } =20 static void __init spectre_v2_select_mitigation(void) --=20 2.34.1 From nobody Wed Dec 17 08:54:38 2025 Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2085.outbound.protection.outlook.com [40.107.100.85]) (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 0F09123D29E for ; Fri, 9 May 2025 16:29:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.100.85 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746808147; cv=fail; b=RwVFb0Xltf+1oiHkdTZGWli0xB2gFl7f85BSeuzEr/C7/YTte8SrBkdtZHM0OEq9jU9cUKc4AVW/VuSwpuWZsJoh2LM3DwHMzM6dv1sXDSZf+dub7daBp2d7FXY7zBFD6BA1/iaQmBWVbWQqKRe1kajyBQfreYGXE+wgHM+lbX0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746808147; c=relaxed/simple; bh=/8Mrpm8eTzTZ4JIaMaz8nHexdv5ajRIg+vFKkyB3GmE=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=FZBgopwC0+RpxsRATrfOj1MPSjVxjlcRhz/NZWQVCwRjvJYbO2gNrob4iWOFJW55rgu9HSkhRfvicRxJ4mwVAWezR5vyh4CAQMGMY+NthwVFM3MIrVGJdhptxUmbMAFltUGWcWTPaZ5YoAKRD2x4xVgwBpTMUg48an/feoTcCxY= 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=ND3x8g1e; arc=fail smtp.client-ip=40.107.100.85 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="ND3x8g1e" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=cU7ZDwdhu0XcUTg5bTOvdSuchViSHj8NZGLu9agwzuGNQw18/zSdxu6tvjgH+9O4/yz2Ez+fFonlz3hQUivTSt9k2+5oez9SFeeR2RMLIPu8vMafB+KHhPHVqWXD72y/IVota8gpym7tnfLKtdU2RLb3w9/QK2TaagVF/ZvR1qAe4X1BwHBwxoCt/RGaMUisM6y4QOb9SBQ1NsVa4eT5TTERxthF5I5i4brxrmt5nOc1Ol4fWHiGlXgkio3SmY3t++jYL2h2VvsYXxbFHe7AK/yD6B563mgyI4etqcYdJzRBmdxhNGRovpFfEY8Ixkutx/qe5LWumUDZOVbEifCEwQ== 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=LqMv0l1bZiXfgPs2142QHhIPoY0/kmo51ClXolOmzus=; b=kv2CUyLICKBWyHrKuxrpnh4B0aNEj97AGSMzsUhuKoCdBEzjUR+r66WEDiBRmZtgR1+eIDTyFHzJJrMOkl/p/4B12Td2fuoZ7bgJiM33ZOa3Z8jnEVm3Xr5ndwRc6Q5QETijqYvebUYIK94no5xV6c26rNGQXAcXBl6JVYG61+PyBzuZiBUqwp45QjN5y1pJD12A4ItuCzhGwarEhrs1Q4SKmEcN94Y8l6gEL6NncgJC9jqc1QXLjSuR/0LvCZJCn4ZdkIaTeKUJEv8Xw0mHGURqsx8DMnCJ2qnDTLnrbouIHk1Zj3gTTHh/HQU8lfeSEmtjZf1RO8Am+4BPVq8znw== 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=LqMv0l1bZiXfgPs2142QHhIPoY0/kmo51ClXolOmzus=; b=ND3x8g1eV5EWUC94yznfC/2g7fH01AurXnJZ4G7bQjQjTYTkTWZ1y2HRqdv/IpNZ8UVTHWAYSlZcPflgK1PLVil9TAFCaj16PauLRb2OhWAel49hOfNNIf0kva9XFXLxpWA4Yzgf6wObc3m2L8RbQQkzmxsmurlvXq/ahc7w8so= Received: from BL1PR13CA0112.namprd13.prod.outlook.com (2603:10b6:208:2b9::27) by BN7PPFED9549B84.namprd12.prod.outlook.com (2603:10b6:40f:fc02::6e7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8678.33; Fri, 9 May 2025 16:29:03 +0000 Received: from BN3PEPF0000B074.namprd04.prod.outlook.com (2603:10b6:208:2b9:cafe::c8) by BL1PR13CA0112.outlook.office365.com (2603:10b6:208:2b9::27) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8722.18 via Frontend Transport; Fri, 9 May 2025 16:29:03 +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 BN3PEPF0000B074.mail.protection.outlook.com (10.167.243.119) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8722.18 via Frontend Transport; Fri, 9 May 2025 16:29:03 +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; Fri, 9 May 2025 11:29:00 -0500 From: David Kaplan To: Thomas Gleixner , Borislav Petkov , Peter Zijlstra , Josh Poimboeuf , Pawan Gupta , Ingo Molnar , Dave Hansen , , "H . Peter Anvin" CC: Subject: [PATCH v5 15/20] x86/bugs: Add attack vector controls for spectre_v2 Date: Fri, 9 May 2025 11:28:34 -0500 Message-ID: <20250509162839.3057217-16-david.kaplan@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250509162839.3057217-1-david.kaplan@amd.com> References: <20250509162839.3057217-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: BN3PEPF0000B074:EE_|BN7PPFED9549B84:EE_ X-MS-Office365-Filtering-Correlation-Id: e59c53d3-2006-4d0b-559c-08dd8f169c91 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|7416014|82310400026|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?CxoDs5OOSG/Mnf3vT81pkEmKoTBImeEf8H+Bgzh2i5JGDAf7cX68SpLMVzL4?= =?us-ascii?Q?f/ZCplaPCrrYPM+0630YsM0rjnrX9SkrleEo2zgAsJRjvp3SqfYPURfeboa0?= =?us-ascii?Q?GSvuhvD/jvV4D5eTp5HTlfrNydwD7uGzMccZtW54jN70fR+Wm114/Q4kTN3H?= =?us-ascii?Q?QziUfRD12qagcMq1f9g3du9KLgdyg+uO02ZzBZhDqPLUH+Z3T2odvyJUZ0D/?= =?us-ascii?Q?DgwQxeChgExkbOXXsUlWUPYoEE/6+RJqQldbRhEzrctwxrawJTILQbH+TTHR?= =?us-ascii?Q?vK2Hq8gGKpWmoAAUix0HNAv9Bhr8ccLaaKSvRxu97eYjmhrW7Z49tvKaNei/?= =?us-ascii?Q?Fek2ctphA8s+GngsPncGuP8NcbfNf4z40lq4R+6YsrNmLznbBNvm2y6+SyiE?= =?us-ascii?Q?kbdc72lXP60Hf4IFoQO9Cc3P9C3gZVBZ70Clt78nRegpK7Yj9AFiJY8Vuw21?= =?us-ascii?Q?9ul1hdE9h9/9tFU9YzNZ9COhSWWPFR9dlczPi6c7n6lPHY04DzOeK2XX+I17?= =?us-ascii?Q?AMrHTwDn52/WM9+dI4XVHylLx1QD+l8RuYvIzNG6auLMO6jFPkRRLZbKzKsI?= =?us-ascii?Q?929G0BCUPIgs7bm1r14Hs8STuMEPWd+YiFp3g48gjwMLAPhJXqwE1RewdUja?= =?us-ascii?Q?aboKNcRYvNy6vYNor2PWzjQLaJK0YVfc5jNN8MFkVGTINp/Qj7ZEGONHB8Su?= =?us-ascii?Q?ldrm7Ve7qRW6oUCgjQWb865s40CeedaQbdEVTAZOskyAvFh51O7Sf6di7SjM?= =?us-ascii?Q?8E4ZkhfncW28jXu3JJw5ZLeQSTyibzCwHJHbUnD02rb6F6KCy28QoU7avsBc?= =?us-ascii?Q?R+0jGB1Mb9cfK3RY8qziezVU+J2LzSCpuKcMGxZ0I0UQ7stRGteCAbJPtsTh?= =?us-ascii?Q?yhHD5yPyEQGThmUY4bGaKZoYUBwOxSnCAtRe4ykW1160QlEJbMjw5N+kLHea?= =?us-ascii?Q?YxV2wjNS0k7B204AzA2/vpTcUXzN5q8vZ8xLAMyPAY27LQERirUXxuGUmTUm?= =?us-ascii?Q?0+oX/VC0aHAOTn31ZG8j6SJVThYFsyvj5Enyg72fvEVJZVKzzN3aYwgVb27q?= =?us-ascii?Q?otFhHlhFEfBwS9Np/feTZ/fBkioxke52dmBvrpMr2ioR8IsfyRgYporYcXGW?= =?us-ascii?Q?CY+Tl8oQ5jJgSD8HzUAYHBb4kZGLBDHENg1+Hl953V1Y8Yj2/wXwa1+F3NZu?= =?us-ascii?Q?PI8WsdhomBZccQK9EaC4OW/pJ18OMOunB3AO14+WXGuo+r7P+DRCobPvD9Dh?= =?us-ascii?Q?skedGAARPHqv2S7cp5KT6VAE58BQAIAY2tWlSZL1zsirsK2THj4ffCxBGtAY?= =?us-ascii?Q?NcswSfq/ofJ8Vqk+dyvVbcZRW0ibFdid6hMSPgWoSWyQTWwbJMtYJnJGq22H?= =?us-ascii?Q?aHrHQQ7qXzByrSnMEyvoBDSDPF28ZWSMMWmXVXw/a9xuHY0OOLLpEgBqLzrW?= =?us-ascii?Q?raFjBSqQm5IMVe2OwX99ewYRbMqotnPC18VQHOs04vLAeA74J6Qr1JLmW3yJ?= =?us-ascii?Q?wSSb4RMIIaqF22RpMIJyvo8wn+W+NiRU0Zuj?= 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)(36860700013)(7416014)(82310400026)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2025 16:29:03.4884 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e59c53d3-2006-4d0b-559c-08dd8f169c91 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: BN3PEPF0000B074.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN7PPFED9549B84 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 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 667385808400..6a4bc80be1e9 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -1728,8 +1728,7 @@ static enum spectre_v2_mitigation_cmd __init spectre_= v2_parse_cmdline(void) int ret, i; =20 cmd =3D IS_ENABLED(CONFIG_MITIGATION_SPECTRE_V2) ? SPECTRE_V2_CMD_AUTO := SPECTRE_V2_CMD_NONE; - if (cmdline_find_option_bool(boot_command_line, "nospectre_v2") || - cpu_mitigations_off()) + if (cmdline_find_option_bool(boot_command_line, "nospectre_v2")) return SPECTRE_V2_CMD_NONE; =20 ret =3D cmdline_find_option(boot_command_line, "spectre_v2", arg, sizeof(= arg)); @@ -2008,8 +2007,11 @@ static void __init spectre_v2_select_mitigation(void) 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)) { spectre_v2_enabled =3D SPECTRE_V2_EIBRS; break; @@ -2062,7 +2064,7 @@ static void __init spectre_v2_update_mitigation(void) } } =20 - if (boot_cpu_has_bug(X86_BUG_SPECTRE_V2) && !cpu_mitigations_off()) + if (boot_cpu_has_bug(X86_BUG_SPECTRE_V2)) pr_info("%s\n", spectre_v2_strings[spectre_v2_enabled]); } =20 --=20 2.34.1 From nobody Wed Dec 17 08:54:38 2025 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2071.outbound.protection.outlook.com [40.107.243.71]) (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 D06082405E5 for ; Fri, 9 May 2025 16:29:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.243.71 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746808149; cv=fail; b=bYhvgkRWmZ/wVY1qhedfxFfK5OAJQMkr3bUymk3vmCxgaXd8fd6e8lCmkZEMb+fWuV05f/tNPUjPoNgCy1k+gu94/1RSz3DrNK42oeFTZ+pkJHQ9I034spv75S53fSgw2CsSEV430ndUJcCRmNroqejEmyByZfJCZlR5kAZcSZQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746808149; c=relaxed/simple; bh=hoLK2ZwfaQBf8CbKWxpCs2NnqNyqbMBQJVBygOaofV8=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=c3xkqX84E6GThtSdHvwfc1pObDviJL0x69eMsoLvZF4kDRyrZCMDBhKRJy1BT1BW2NSCozpp/rdZSYkOySYk2Y/wXPM+jhkKY142GOCLup/xkSQ5/KZxogo+K035/QJfd+RzHu516JATumxR91Odk1fEzQyrpTg0gNElQcK8BAE= 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=DTF7bZ4M; arc=fail smtp.client-ip=40.107.243.71 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="DTF7bZ4M" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=lFuStezf1npiMvSDvpqdb3BBfTSChTRNqG9qHsWfV44DF1iHM/NVXBEMpzEVDvDgN62+OnB8j/AFWu7I3nQQdD8Nk93R9Bb7xSozX07LaULx5hVlbqQnb3Ntkui/Gys6gIc3RC37AFOSM/qjNizrslxZCKUTGMGI+LGSNHXt2I88nmWki+3f1cf8HuNYzH01Piojl8bk0/LYnYrL623zGLWGipXb0PIFm+O4aKIFCy1VKeG1gWsE35HL5SJz+RVJDw+cLiNr05yzFnKKF6A454bMd1pyAH+g4FcnrHKxI3XjBjNLqdXroV7avxvXW73EgoSCNZoNIcuJhD54eFheNg== 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=RQiOoRukaY4EyFv9nLsvbmMVsJO09rc3JKs5k/rP/vY=; b=ZeFiHCEhBH47e02K1onQtQQ3LSbFIb2dU6Lo0kDcCedtmGfArzQWiVOY8yFrM6HSzYlhCiNvQ6EKmTllbRykkOVoGwjGsTQBjAUaVfAjqf74qAVZt6Qo6Mf7D5Jn6NVVGFt8ZqGlHgnf/uzWOgbXNzKpp8uYUlN6/lbN1di42po0qdKtLb1GLwmltX9OPQ69CyOdJbTkuzh12iM2frKakMNn8WjCtbFNT468Fm2oQxKNWtcgMLa27FhkvVHODNQn6oUfJqEH1JrTzXfs3d2/f1D+/eJWUzfejZa5S7MqF8VEOI+NFTQLzRrNhe59znfwoy3dFCPZfRiXAo6o2jrN9g== 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=RQiOoRukaY4EyFv9nLsvbmMVsJO09rc3JKs5k/rP/vY=; b=DTF7bZ4MAfgHpXo+lhVZmRTds7AM/y2OiznWdHGcIVFa+UxJUj/vBR5rYIZ4j74IzXXTkJ2Le5NfaYVWXGNT06f9hlB2CI4RKxqzHednF/nh0Eb+dLj1IJg3P5cw64Ym0CkRyPBduWHWqOlANS2xsBa9ybQIBrHMWlWHPohThhk= Received: from BL1PR13CA0114.namprd13.prod.outlook.com (2603:10b6:208:2b9::29) by DS7PR12MB6192.namprd12.prod.outlook.com (2603:10b6:8:97::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8722.21; Fri, 9 May 2025 16:29:03 +0000 Received: from BN3PEPF0000B074.namprd04.prod.outlook.com (2603:10b6:208:2b9:cafe::8c) by BL1PR13CA0114.outlook.office365.com (2603:10b6:208:2b9::29) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8722.20 via Frontend Transport; Fri, 9 May 2025 16:29:03 +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 BN3PEPF0000B074.mail.protection.outlook.com (10.167.243.119) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8722.18 via Frontend Transport; Fri, 9 May 2025 16:29:03 +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; Fri, 9 May 2025 11:29:00 -0500 From: David Kaplan To: Thomas Gleixner , Borislav Petkov , Peter Zijlstra , Josh Poimboeuf , Pawan Gupta , Ingo Molnar , Dave Hansen , , "H . Peter Anvin" CC: Subject: [PATCH v5 16/20] x86/bugs: Add attack vector controls for L1TF Date: Fri, 9 May 2025 11:28:35 -0500 Message-ID: <20250509162839.3057217-17-david.kaplan@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250509162839.3057217-1-david.kaplan@amd.com> References: <20250509162839.3057217-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: BN3PEPF0000B074:EE_|DS7PR12MB6192:EE_ X-MS-Office365-Filtering-Correlation-Id: e9d1681a-a619-4c2c-1cf9-08dd8f169cbf X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|7416014|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?a7Ye9Jrak1ULAPG8/dv0g00Vv9xTiqOVVk78hDOphP22wyQJwZDorl3zwhfJ?= =?us-ascii?Q?NX6UjuqRILjqe19zxSqmnf+MHbEHl0Z4mBrv3qFVjwTVn9j5q1LuVwaoVU0J?= =?us-ascii?Q?RXBBWKZH+LbFKWgql7mwJlZpg8LkUS5zLfzM5yDma2KCbtQjwhGRdMM2lcdK?= =?us-ascii?Q?gmnT6wEq7VSKlxSHazgLyhoc4yAvfCna4bB78THiFe1505dv6H8Cow+wzewN?= =?us-ascii?Q?ujldixIwDPFeXXYCAG8kvUzLaVq5TUlhxfSkyamV1hraC6YHhLnljg637fgZ?= =?us-ascii?Q?mw1DoXJ2UY5XzRTTHcraWXNpwfth7c/HMA7jqImdlpYIGK3nOv02CVYb1btb?= =?us-ascii?Q?3WJPCHD2xzFG3F5hfZyBncpMsYWBm7RIT0HddiLoxpmhjKF00ypCRezcrYVz?= =?us-ascii?Q?Y3XnJkKafW5g1GstbJztfRa6v42srvh0i+6fCOFZKLcKNRHGYN4WjAgyiBVw?= =?us-ascii?Q?2t0dvN777FQOMbT1Nw8lYwvOC8LFSK/6W4vdF1rR+Lgy/+IysDTA/w8H+4FG?= =?us-ascii?Q?iJv28QqB5SJpNs52n3zWH6ij6Yib1ari8nW7ileiN7mMyrVyg8SQTqk34jkd?= =?us-ascii?Q?bslUhyIaCGE5c3kzSlUUyIicuwuMPzS5CI2DV81OfZEWgkZcP6CbqMqiXkLJ?= =?us-ascii?Q?IQkhHGvkGgmMSJv7iLkKchuwgrQ0xp7fiFyZFjyClaDx65Z2zKIJSmywK0Zk?= =?us-ascii?Q?Pp448TI4fv/H39/ztl5sQg3irfa3AOKPuXHsqtyhQS+7wpeOhJeyjnRn+Qvs?= =?us-ascii?Q?bMQnu5Ozy2xYW3IsceS4SVTPTTToz/Pzo0MFFDdR+MKzmsYFoxmeG9m5kgWc?= =?us-ascii?Q?d9tko/3LKfEI7pXDG6fzyibye5nliOUat+aiBpsoG5Oj4imCdM9V/08r7V2e?= =?us-ascii?Q?lIPu7kbJei1yG4rHVyQI2qmVXpudn1PcFWzZrVquAuDJ1wJi8FsOlH46+Udt?= =?us-ascii?Q?q9xShheFMyvaOilLSgGT54LEJlYlAr1goYwMSjquPt7nQRVT3Tz1zZ5Ttmyl?= =?us-ascii?Q?tHMLJqGV6tamirYjwOaQ1AC2nlDQd3cCybdf349jAUYoe4gmUfS/z1/YMGhu?= =?us-ascii?Q?vFXoOjozFv9MiBTlJPhKRN+lR5jvviUTKjRRYnfn3XR2LknyOSJo7+QGEnUu?= =?us-ascii?Q?AGUJn3R01psY9i/KteaTdJVGlc/epJtx+KJXLVg6uRJGSuzc0NH0l13S4Wpi?= =?us-ascii?Q?LaexVZpFFHxd6I+VygvDCcQUXpp4tOWXefx1OxLcYpmRWGPtkuZFy+Hhszve?= =?us-ascii?Q?9WDrHGGFhAIBg4qhBZCRN+l2YFx/AeQ72nKuflC2Ohl7mQtnltcP5xM6XWG2?= =?us-ascii?Q?511SaxCxvG1T3ZseF0tOx1ZoVQp3kpWJlqS+Msk7fduH1rWNwsl794l2bw6p?= =?us-ascii?Q?s7o3eK7cat3gYlpfcaz9HSy46/2texuRB0VYH01Bd2fEFYta7LTjawnrtB3j?= =?us-ascii?Q?LeWinaA4q3r9ey++NVYWJUYUy7ldSMuBzuM7VDdBaX2tpaWqDTquIrZsXOw1?= =?us-ascii?Q?dzSTXBTYEVBpSSpw2MnvL7WolYXwMblgW5N5?= 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)(376014)(7416014)(36860700013)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2025 16:29:03.7869 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e9d1681a-a619-4c2c-1cf9-08dd8f169cbf 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: BN3PEPF0000B074.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB6192 Content-Type: text/plain; charset="utf-8" Use attack vector controls to determine if L1TF mitigation is required. Disable SMT if cross-thread protection is desired. Signed-off-by: David Kaplan --- arch/x86/kernel/cpu/bugs.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 6a4bc80be1e9..19a176369b22 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -2697,17 +2697,23 @@ static void override_cache_bits(struct cpuinfo_x86 = *c) =20 static void __init l1tf_select_mitigation(void) { - if (!boot_cpu_has_bug(X86_BUG_L1TF) || cpu_mitigations_off()) { + if (!boot_cpu_has_bug(X86_BUG_L1TF)) { l1tf_mitigation =3D L1TF_MITIGATION_OFF; return; } =20 - if (l1tf_mitigation =3D=3D L1TF_MITIGATION_AUTO) { - if (cpu_mitigations_auto_nosmt()) - l1tf_mitigation =3D L1TF_MITIGATION_FLUSH_NOSMT; - else - l1tf_mitigation =3D L1TF_MITIGATION_FLUSH; + if (l1tf_mitigation !=3D L1TF_MITIGATION_AUTO) + return; + + if (!should_mitigate_vuln(X86_BUG_L1TF)) { + l1tf_mitigation =3D L1TF_MITIGATION_OFF; + return; } + + if (smt_mitigations =3D=3D SMT_MITIGATIONS_ON) + l1tf_mitigation =3D L1TF_MITIGATION_FLUSH_NOSMT; + else + l1tf_mitigation =3D L1TF_MITIGATION_FLUSH; } =20 static void __init l1tf_apply_mitigation(void) --=20 2.34.1 From nobody Wed Dec 17 08:54:38 2025 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2081.outbound.protection.outlook.com [40.107.244.81]) (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 0BFB8241114 for ; Fri, 9 May 2025 16:29:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.244.81 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746808149; cv=fail; b=tUPFVhQZIFRagbxQP5r1j9f0INlCYjGaLdkr3783L2Igqoz6Vuq938UqECFYVumnNLoa7B2IeVVedN8WjfzfcbpqE6jMBUaJb5w7Wfm4sajv+4tpBiVvO5qeG9I68yCm9aloCSBUNc5puNvygOPnKTAFJqWjgUvH8KLtOSPTbHI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746808149; c=relaxed/simple; bh=96JgUOpuZxSdrn1gpLF5lfFY8Q7uB9UXUg9he1Ta9sw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=IFsV4ihmFaKhmdObuW3757k9GWOcwR4skzEcyWkb+3R8F4/YMHsL1IelhQ4FXXOcMMx5l98m0fWERm6J2vz3wc+rHWB83V8BsxMOt9IUQCQKxD40mUfQVHlBy+B1/gHMqcp2wHD3JqLDDkS4Zh+BJXKYL+pQ0j99Yz8+3KguIIQ= 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=KtsZsgDa; arc=fail smtp.client-ip=40.107.244.81 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="KtsZsgDa" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=DPGnUAogNzSDtbkNI/CS8gb6jIft6TRt+GLXrcmauZkiL1DNBsfD+ZOf5hdHtyLsCuiGkfjw/6YtQR9UnHQJunCEDQ2LWNVnSrczQkUAHAthjz+BVk9FHOVe7NgPIHX8T7sn/6oqrFIyjoYewmjaXfFO7K4QzBvA7ntfgT2KJ/cgks0lCeX3WIJW8FROw89tIcizPdyJgEet2HNOhvfmSDtKdO9RXugd4sAJLOaCXprdzAAhRwM9/+a9kD+pma9r3lCHrGjZORwvhw0SJBnxNDp3TDFefDSvsLKtZjzpnSpZ9opqjE9h+WjSdA1P7tneRamjn1oq0U+kMF0uwf8K8g== 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=WsMOWUhAPS4lERF+BAdHn98PM4z4Nad+dqCgDa2W4JU=; b=p7MTLp6IjbrsOf2B/Nuib1ZHgfjhZPqPHbzXzUVuqATZVdKkcYFltebmzbzPy+daZ52AvZmiljS63WCATaWhpG3RJvfmL41+SWegvSTm3BOqKy7tnX6zU5/f+Oh5xHNPH1EiGYns0vjsR3lS9JYV1F4ReONUFpitWA/i5kBljCqsrWCH4hBvF7a+yAGGngFvZI4j3G6MkGlrv/7rCJ9zgf7gOV1soSfF/hqum0saNEQEzFaf6Evq/fDydBXxrpgPdI3xsQpxCZil6qJDVUn5QiuNBF+QpONdYS2+nnPwqIH0CKs6L6OIYix0UjIdEaRZZC1EFMkSHqRE41V2LaNcBQ== 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=WsMOWUhAPS4lERF+BAdHn98PM4z4Nad+dqCgDa2W4JU=; b=KtsZsgDacYQrpMxzKWVAu0K6i3mUkkTXOCvlXy+lO4k84i8YrmsBmVlIpZ6I33/M/So87DVDzbiI3GpooImtW8BVHbqGAXozWQ/4Uq2da13yB31ulG5ikMr1A11cnJw3DbPTvnHePamAcZ1jkrjbNeZ0msKYc/ZeH2Dx3PziZYE= Received: from BL1PR13CA0104.namprd13.prod.outlook.com (2603:10b6:208:2b9::19) by SA1PR12MB7320.namprd12.prod.outlook.com (2603:10b6:806:2b7::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8722.23; Fri, 9 May 2025 16:29:04 +0000 Received: from BN3PEPF0000B074.namprd04.prod.outlook.com (2603:10b6:208:2b9:cafe::ce) by BL1PR13CA0104.outlook.office365.com (2603:10b6:208:2b9::19) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8722.19 via Frontend Transport; Fri, 9 May 2025 16:29:04 +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 BN3PEPF0000B074.mail.protection.outlook.com (10.167.243.119) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8722.18 via Frontend Transport; Fri, 9 May 2025 16:29:04 +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; Fri, 9 May 2025 11:29:01 -0500 From: David Kaplan To: Thomas Gleixner , Borislav Petkov , Peter Zijlstra , Josh Poimboeuf , Pawan Gupta , Ingo Molnar , Dave Hansen , , "H . Peter Anvin" CC: Subject: [PATCH v5 17/20] x86/bugs: Add attack vector controls for SRSO Date: Fri, 9 May 2025 11:28:36 -0500 Message-ID: <20250509162839.3057217-18-david.kaplan@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250509162839.3057217-1-david.kaplan@amd.com> References: <20250509162839.3057217-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: BN3PEPF0000B074:EE_|SA1PR12MB7320:EE_ X-MS-Office365-Filtering-Correlation-Id: 25cccb08-3a5a-493f-af74-08dd8f169cff X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|1800799024|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?rgl8bS3CEPYFYAqATdplnG9oSqhcQdonrV8gl6D+xJmGj49pYhT19qAR1KAh?= =?us-ascii?Q?5y24HLCgxwwwcaJ5qkYMLAyaBlJalh2h28STqA/KFkqOLzUmq0Dssx1gnE0Y?= =?us-ascii?Q?vYhNG6TiT6jrHKS25S7G6KymzJxXh2cv88pcKteZFu4U0KHxWA58hZsMXfDy?= =?us-ascii?Q?XcV8m8tHX91MRuMIYwOxK9e2BAWN5PgmYNetAY8OoyW/A7zT4lHfxjB/G1vT?= =?us-ascii?Q?erTV3vX7IZCP6e3M7RekRSt97pji81SLTFU/AbA8iugCUtZVSqofQP64yD5t?= =?us-ascii?Q?aec+WhgG27ALqUMf4l3ciP848xjb1vhIhpC0ANBwyYbEBZgghIPHKNRV4+Ni?= =?us-ascii?Q?A0bl6edcLL4suSpZ/snTuu9LZnOYNUy2xB8dChEeoYYPWfalfW6ereSkCRmd?= =?us-ascii?Q?VuphUWHYPpASLTJW95dOyp18Ed6NrSbTL0XF8Z8kicuCRBIipTumE5sbj3Ho?= =?us-ascii?Q?1ty+qfwBUDfKcWjnlsShhzZliXeDuLNWCTXk0FQaXJkKEwIbFWlnCCJr+KoA?= =?us-ascii?Q?nmwX9/NY/c4lycUorsuxtyrYBKsP1VFSMf+d9gSKgS1r5+AOomiuhn0YtN7K?= =?us-ascii?Q?rs24X5gJtXaq4KS9HcVVaF7r8VQWnb9ppaqi+NNciMnhLGGJ56OeiRUQzDTf?= =?us-ascii?Q?I8OYgR+CCmZyenyBrmhPlhN+a2TKWtyVkSQsZb3OK4D9t/gvDZRydx2GrRG3?= =?us-ascii?Q?X7b9RlvbatMaLf3TiQC7/qIQsmHK6hKRrEn1kSjV//awl8dm2YhImlwZNZm1?= =?us-ascii?Q?D+X2luMqT7JXA29ANcOKYgSi8bNrlBrBVWuHehJ6MpQmEzL1jfLZTjnNVZXn?= =?us-ascii?Q?8TYfrBeKrge9f/vyM6XBYEyIGD806Dkgf2yJDdNcb+80QEgHQ16Ks86ASetd?= =?us-ascii?Q?VpnuMXQkl2Caa7XLR7ykV8w1uOPlAKNzj8UnEBTG9pvTCx5fzBLe0t+cK0Nx?= =?us-ascii?Q?Wt/xjykYPjqq35DvvmxFI/f7NchRBf/EWGTS+Xg/BWOIIThde+ssWn6jERoV?= =?us-ascii?Q?1g0kJEIJ+G5CNmVFcNSK6wwwZwoS0XdWDIinVnqx6CDRZkjS+R0o5K9/0bcp?= =?us-ascii?Q?MRtAtvnFVWt0X2Bp/F1jldXRvSmfD+RqMp5MTQc8zbNRp7JMvAxPsJSpAhw+?= =?us-ascii?Q?6rpjCe0sBSNk10qS2WsuLmYBzY48ceQy7udC9rUCfvDqJm8nblyp9jBkCgrI?= =?us-ascii?Q?ngVA3yWIYLYFcB1WDUL2T3GLaRht3eZT24Kod61gPczJgs5HQ7PpcSJs3T6N?= =?us-ascii?Q?VohoOmS1QBZqZzzcINc7ZH0r4qPWQdoWNPHEwnsLVGTh1olmg734lQnHtiSE?= =?us-ascii?Q?fTimb+aIudcd7/gdgTGk/kQiismdAEUy+yK8YctaRFFyGJhVwcs2JHjjeFza?= =?us-ascii?Q?brSM7LZguR6xDbRcGu6ON3eamUztm2nXCZKZkqn4P6HuB1YwppHNVVXNLnN5?= =?us-ascii?Q?VWsV8nkyd79bEpL3gG16dr7HUK8kpyJCL3pei9t14tfWe3J4lifj2t+p+3rT?= =?us-ascii?Q?/8L7jr9CX7FGJGJIYriwTSXUa4zYso2pgOfg?= 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)(1800799024)(82310400026)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2025 16:29:04.2118 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 25cccb08-3a5a-493f-af74-08dd8f169cff 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: BN3PEPF0000B074.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB7320 Content-Type: text/plain; charset="utf-8" Use attack vector controls to determine if SRSO mitigation is required. Signed-off-by: David Kaplan --- arch/x86/kernel/cpu/bugs.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 19a176369b22..55b0658562c0 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -2840,14 +2840,19 @@ static void __init srso_select_mitigation(void) { bool has_microcode; =20 - if (!boot_cpu_has_bug(X86_BUG_SRSO) || cpu_mitigations_off()) + if (!boot_cpu_has_bug(X86_BUG_SRSO)) { srso_mitigation =3D SRSO_MITIGATION_NONE; - - if (srso_mitigation =3D=3D SRSO_MITIGATION_NONE) return; + } =20 - if (srso_mitigation =3D=3D SRSO_MITIGATION_AUTO) - srso_mitigation =3D SRSO_MITIGATION_SAFE_RET; + if (srso_mitigation =3D=3D SRSO_MITIGATION_AUTO) { + if (should_mitigate_vuln(X86_BUG_SRSO)) { + srso_mitigation =3D SRSO_MITIGATION_SAFE_RET; + } else { + srso_mitigation =3D SRSO_MITIGATION_NONE; + return; + } + } =20 has_microcode =3D boot_cpu_has(X86_FEATURE_IBPB_BRTYPE); if (has_microcode) { @@ -2909,7 +2914,7 @@ static void __init srso_update_mitigation(void) boot_cpu_has(X86_FEATURE_IBPB_BRTYPE)) srso_mitigation =3D SRSO_MITIGATION_IBPB; =20 - if (boot_cpu_has_bug(X86_BUG_SRSO) && !cpu_mitigations_off()) + if (boot_cpu_has_bug(X86_BUG_SRSO)) pr_info("%s\n", srso_strings[srso_mitigation]); } =20 --=20 2.34.1 From nobody Wed Dec 17 08:54:38 2025 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2049.outbound.protection.outlook.com [40.107.220.49]) (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 AE89523F431 for ; Fri, 9 May 2025 16:29:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.220.49 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746808149; cv=fail; b=kYGalzJKmxavBs58+6IhAenM2omTG2/QWdcVTcGLZb7vTMS87xcrLZuiDQJ2XpDMzAXV3IgnbvcrfasEuUu2dQT0hK1mIWh+vuLQ2gOIjKRbsdUl2DdFSmpjACXzVKmuhK0iTNJuAk+GcaUEc1s6MdREQdcYdpKk1aOf8nmJ6Ro= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746808149; c=relaxed/simple; bh=X0lZQbZlLcBDa76zyjd0xCHm/kiniscJV0bgrv0PIn0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=pf1jLqG6KnYj+v9XiuPJmAlAvhIJpw5sYfeQgk+r9qQX4UfIKmjk8SE6lASFljpFJS7IYmjbiN9sXFcgjbW8wj/6BzacgYkPscIQC4BfB6xuMmCdh68eu9hyA44pBZD1IY/CEEGizkBO/4AQfAvnPpvpM9xcpKLQFhzYb9+KPq8= 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=Lmn6eAg/; arc=fail smtp.client-ip=40.107.220.49 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="Lmn6eAg/" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=gMorzxpbmnEuGDeS/uq2OM28oDCz8eo2wtTGFlIboZCy1ksNaN3qgNXo48lMnEf5znW3zfXbZKTsQProlJEbQymkxuOaBukFZiHBdK4q7ySLJfct0ij8j9wI3p6fgsXextVW1sjDUuUhd/VBCIMUhZD3D5x/sPVJiFXLzIRNdMoMirMqINWmrI+STPSfA3xlFxTfQ3ypT9M7an1HhdRmGLJDKqKk3n1WbhzRq0oNdnkUDLJgeMAa+Inbzk1uScFpTn4TM0hvEXg8FUL/uxz0iNWSMqVmXv++98TcAzA3K6d9sODwfdp/HqlL+hw6AxtyhT8+ZOuNOM5zCSnPzbzRDg== 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=OTpwY6RhLSVr3r6VL7+jlKk3UVp9abgKbOLE8x3WOmw=; b=xSVlulPtn74xfjYZ3RA5cZELzqgdHqia3tAsAS4wUhnUpLELLpKnAkDy840IrzTA+Jqtwe2jfsWZQX/8Do/MYgAbjdVYolhKwSDS8La6BiDB4Lek4LG7y5Oh2MMO6TMZXgy93874i9spqYKXHNOMJh5iZ96KvVVKraZGaG/JbBf7qH+I1wFwVkxNqFYiS5zFeY2D0GYnk5N/2pMGywcbSQff4J0wJ+XD1z5TbWem/W0EpC//YZ8lecKuNFN3dwCYkEbeWgAUKGa9kI5tj+aU1RFa246Rn9yn7jfHUxBHH5OzTD3Mfr1oadryyyIldCsEvMJBJt14pg2foU8xDaUIlQ== 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=OTpwY6RhLSVr3r6VL7+jlKk3UVp9abgKbOLE8x3WOmw=; b=Lmn6eAg/qo1RKQ16+iDJojpn0xbcu0fDExGxLVxWxEYKyRl64+5k0UyLsFUTV/amzMUDtE1d4WOLQfEsLbXx7mIYPHSID06vqc2H+615HUllgBhnlHKP0s4TYAUsSLcT7Ol6XewAhI5BKsurI0E1HW/NHmFkUv5z5nuY1ZMWi9s= Received: from BL1PR13CA0099.namprd13.prod.outlook.com (2603:10b6:208:2b9::14) by IA0PR12MB9047.namprd12.prod.outlook.com (2603:10b6:208:402::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8722.26; Fri, 9 May 2025 16:29:04 +0000 Received: from BN3PEPF0000B074.namprd04.prod.outlook.com (2603:10b6:208:2b9:cafe::9a) by BL1PR13CA0099.outlook.office365.com (2603:10b6:208:2b9::14) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8722.18 via Frontend Transport; Fri, 9 May 2025 16:29:04 +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 BN3PEPF0000B074.mail.protection.outlook.com (10.167.243.119) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8722.18 via Frontend Transport; Fri, 9 May 2025 16:29:04 +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; Fri, 9 May 2025 11:29:02 -0500 From: David Kaplan To: Thomas Gleixner , Borislav Petkov , Peter Zijlstra , Josh Poimboeuf , Pawan Gupta , Ingo Molnar , Dave Hansen , , "H . Peter Anvin" CC: Subject: [PATCH v5 18/20] x86/pti: Add attack vector controls for PTI Date: Fri, 9 May 2025 11:28:37 -0500 Message-ID: <20250509162839.3057217-19-david.kaplan@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250509162839.3057217-1-david.kaplan@amd.com> References: <20250509162839.3057217-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: BN3PEPF0000B074:EE_|IA0PR12MB9047:EE_ X-MS-Office365-Filtering-Correlation-Id: 8203ac53-f711-41eb-74a5-08dd8f169d67 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|1800799024|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?kIAM1X/Y8Tv+5QCmcPG9zrQMe9SdSOAhBDzXsYhTyn4elndZR1w+YJZKMC2u?= =?us-ascii?Q?6P6TMiaZaYROL3R62I/UFGZ6JidiYYRryGyyDuxO8M6518Ek4T6lCmYFs9aM?= =?us-ascii?Q?XlVPEIiz7NZ59Pl9fAEjjOFl/Ms5iZSm22rNBWFPgvP0eV3vr/KDcP7EEEkX?= =?us-ascii?Q?OVeOlYHk0NxdtjjCf3fbOMGAXjyT7drVldc6I4LsY0WxN465XNSGE1VYMh9D?= =?us-ascii?Q?PaAwuRzEQ6qBqxYoDboCbsbOhwYvuN4shoN3fl6GOQM5vjME32SfixC0N6h5?= =?us-ascii?Q?MoOH1dYh+trkuzbHjK0x4jdNKhDkTk5tKql5+LA/+VEQwfZZkBy5gSi0KfqP?= =?us-ascii?Q?GD2+3fv3qoGeukGz9fIVSkG5rBhjTXEw6S0AR32R7kM0McK7uANccm/0XEgW?= =?us-ascii?Q?cLAIeqO7G6R8HHlsbXzVzqMDm2AP6fGM4z31g+6yjXupr2zIoRH25+NrxcIw?= =?us-ascii?Q?MJJH/Ml/4JZL2+YsL1J7/h2JxP4GCY1YK2RVQuteS8JEbmNs4ZYie95B8ztE?= =?us-ascii?Q?h0/Rx/JSoyyGKU4IkKl4LnVBt5oFrw8QhRC1leXxudz5U30dTVn4gzQQHFlZ?= =?us-ascii?Q?vnYpRn0+LilS+2rFChEnnsvDzowCKTjvLam93GwMuLH5kYwnLf3iWZqsU2hl?= =?us-ascii?Q?Z3fH3bpkBgEL99omfLZWH4bxHI8jw979aHw9hyMOAy/kBwHLVfFy0LZShPy2?= =?us-ascii?Q?JMN9KDbufaMJS5WT8B2sM6ly/+uj0OjSlNUPaoRVZA0L5zXjcz+SiGugPVQK?= =?us-ascii?Q?vIg7N/Y3Et0bzg05ym7/1q/EAIi9+hP01YGdw58QrBq7VV+6cW+gk4uzBiVG?= =?us-ascii?Q?J/NmNsyfaje/ijqUO33oxwJVQGFDXX1WGWi/Jn3m1rKDMBnELJSImPwq3sxQ?= =?us-ascii?Q?wkXN8DY+/2qkYI7qSVJtLY8P3sVG8ik+TOowIc7udGkJxbwSD3nbPQKDHKg0?= =?us-ascii?Q?Dr4wCdvhnML4v6V2Jee7Boa4kR3Zpc7np8dLtNSSZseVpJfJfNVfc2t0mN6z?= =?us-ascii?Q?0AjCeqkx5OpDtcBYndEI9ocT7FqhJvXR17velnpozhRXo8MjrjV0g5q7C0DQ?= =?us-ascii?Q?cBYTOmTE+t/3HYQBidk5ZWek1/fEnDAw5rvGTtzp/T++Sq7JOnz2py5UeKvN?= =?us-ascii?Q?E7n2Q1sMlcSHGQ0cNTzbF+hejzeqk+eejqLX48WOdG1YrI2jsm2W1N/hXY2p?= =?us-ascii?Q?GF4UjLcTGMDOHqKGJ6DsQFgNknmDsmNeFjT874/PdOqQEZpxjgZPBJ9HLBt8?= =?us-ascii?Q?jR10J20xeHuDpY1nZ0e93G1rKmH/dxddloSA12yrA9ACBYA1H4PVPt6iQqkl?= =?us-ascii?Q?HMkF/NeG6K6+UBxO5bBsAbn9H+wu1CXUDpYMyPlVxSZ6rlabLqWJKZ0woU5h?= =?us-ascii?Q?jhqxeZXm93CsseG1ynxxaL4XbUZh5KC9djX3hBC1rm8X8hYa/lEXm6iE4xR1?= =?us-ascii?Q?vcb+smDtF0K5iaO41rmc24lCF/Aa7jWf3Xw32X9NkxodP7MHgTOYLpgiRgAN?= =?us-ascii?Q?kJaBgABbf+Ob2hOrn55+o7EqCcSqTQ+92VoH?= 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)(1800799024)(82310400026)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2025 16:29:04.8905 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8203ac53-f711-41eb-74a5-08dd8f169d67 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: BN3PEPF0000B074.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB9047 Content-Type: text/plain; charset="utf-8" Disable PTI mitigation if user->kernel attack vector mitigations are disabled. Signed-off-by: David Kaplan --- arch/x86/mm/pti.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/x86/mm/pti.c b/arch/x86/mm/pti.c index 190299834011..6dba18f8c715 100644 --- a/arch/x86/mm/pti.c +++ b/arch/x86/mm/pti.c @@ -38,6 +38,7 @@ #include #include #include +#include =20 #undef pr_fmt #define pr_fmt(fmt) "Kernel/User page tables isolation: " fmt @@ -84,7 +85,8 @@ void __init pti_check_boottime_disable(void) return; } =20 - if (cpu_mitigations_off()) + if (pti_mode =3D=3D PTI_AUTO && + !cpu_attack_vector_mitigated(CPU_MITIGATE_USER_KERNEL)) pti_mode =3D PTI_FORCE_OFF; if (pti_mode =3D=3D PTI_FORCE_OFF) { pti_print_if_insecure("disabled on command line."); --=20 2.34.1 From nobody Wed Dec 17 08:54:38 2025 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2047.outbound.protection.outlook.com [40.107.93.47]) (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 6FAF6238151 for ; Fri, 9 May 2025 16:29:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.93.47 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746808154; cv=fail; b=HkUYHZly3/SmaPGxFsBz1TKvIGWidlanDyU6DXMQ0ErOEVqEHPBGqhr/pxqbB9cxJr44C5FLHpQngt3TJGUUOMZxvQJdWE8f/IL618WaR7x9WoxKdslW7ozh8rtIUy+o4H/yfi0Q1cdzij52RypUkmS7uoxIuncmu4zcpkuGZus= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746808154; c=relaxed/simple; bh=nnVEZK8E2WSfyPPq4z6x1v0qkqfcXD713rKpQABisd0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=dMGgVs7OWBncmo3V+NeppJTtNVi3/w35i2rnkCKhSfz5WW8a+FBXNyrUh6G9LS3UsP+r6Z6qyI7S+WJP8V5TsCgMuttw+VoBgWGTM1hAvIpK+Ty1uw81QLdV8m0+pUzIc2drA9NKXxHEqVRTJawRQWHv8eS01DBsCkmN9zg8Vfs= 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=bHJ99MF4; arc=fail smtp.client-ip=40.107.93.47 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="bHJ99MF4" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=xuz+ZZxSdiYI3tw1G+1B+I2FT4ef5GYIUimpV8NoToEosHphDfLn001nuyk1/iCmdHj9LaJPsw7VRtX4/MUpqttsIhXr/Uj8b0LwnPHydx7/189/0rguhg94EhOXWSMgAB1ZCVNDiIbv6I+24kZF1r35mc+nV7TKS9+/qSdMtN41IkYDzJ/uGe7GH3T8pVl4BLquycKX1ldKZJ5BHsuZz9qV6qVP3cj7DZZpIDqzo2814oudmvf+Anz6HF+Lue+wmq3uWZUCaMo/j6I8kRCtHrqzFvWRa8YIzJ6StXNtkvTsbbwvsa+sPTYdlOHA2Nt/MeyL8yNzZ+3n9zRwbeu/hg== 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=ESSAFQwIg28BwrwypKLZDxYDSij6Tz1LiZ0Nj3O0cko=; b=wqnSEuDQzoh3MsGm0rZ9T1b4xw8r5JgFqGCxzD6enl7t/7Mr/stDM6A4xFZT90P+TOS6nxK+VJiSmkQCl2+LnkUGPt+jUVjvBKCToj/PhScBV5gGck1ZXKs5f6EswzPWPoA45KnZ9mfgZxZvn5hgBUjtQFQdDb3+uvFVJeJ00I5+FLuLxhuROQTssuX3OAml3LSvPY9TiWdIphu6KXRoby0XNy6HjhuSNk/InkdH6uZ+qRP1tilX2JzE4jj44b2tbh+ml5Is0l8KDfj/4P6BSMZ/fXvBwv/cXwTPfSsYvJuF3mHrLdg4D264itvpoZ4CnnVSQvZG6zZQTvav3SF/AQ== 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=ESSAFQwIg28BwrwypKLZDxYDSij6Tz1LiZ0Nj3O0cko=; b=bHJ99MF4zG3hEPPNVkeRzlAV75m84txwDKTctf7ooF8vM8BlIofLnxj961v6WNRDcHRxbPkMnaienyFlIVWBtiY6nQ9nvV7F1gcnli4Hy6y22i0lSt1q6iwaBalo9TXJvix78L2DsYcXTIONdtRYuuESG9Kv+DWEdt902Niy9bE= Received: from BL1PR13CA0093.namprd13.prod.outlook.com (2603:10b6:208:2b9::8) by PH8PR12MB7421.namprd12.prod.outlook.com (2603:10b6:510:22b::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8722.21; Fri, 9 May 2025 16:29:05 +0000 Received: from BN3PEPF0000B074.namprd04.prod.outlook.com (2603:10b6:208:2b9:cafe::38) by BL1PR13CA0093.outlook.office365.com (2603:10b6:208:2b9::8) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8746.11 via Frontend Transport; Fri, 9 May 2025 16:29:05 +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 BN3PEPF0000B074.mail.protection.outlook.com (10.167.243.119) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8722.18 via Frontend Transport; Fri, 9 May 2025 16:29:05 +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; Fri, 9 May 2025 11:29:02 -0500 From: David Kaplan To: Thomas Gleixner , Borislav Petkov , Peter Zijlstra , Josh Poimboeuf , Pawan Gupta , Ingo Molnar , Dave Hansen , , "H . Peter Anvin" CC: Subject: [PATCH v5 19/20] x86/bugs: Print enabled attack vectors Date: Fri, 9 May 2025 11:28:38 -0500 Message-ID: <20250509162839.3057217-20-david.kaplan@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250509162839.3057217-1-david.kaplan@amd.com> References: <20250509162839.3057217-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: BN3PEPF0000B074:EE_|PH8PR12MB7421:EE_ X-MS-Office365-Filtering-Correlation-Id: 6846cb9e-f80a-4327-e4a0-08dd8f169d91 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|82310400026|7416014|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?dtVKJjwedUZjMfBtI+wh/JnljFNhNxQozmY742Rcx0zAK/K8RcSTLKBBqWxA?= =?us-ascii?Q?S3iFvPjIUWYm46v2++ymyXNt1mBFbWPFOgJ3fvD1cZzInfAc1/T2nbzjN+D/?= =?us-ascii?Q?E+DMxp0ikZ8So72WoIfxjbocRGdwj9IYKRxpdqXRzkmQMTscrO9MvMX02n+7?= =?us-ascii?Q?kt/8TNBNP/OnOAVej1uosAM+LuXqYCC2u2xQIJkFQha0/MBxTW6iKZGt+Y4A?= =?us-ascii?Q?7nbciYSFkWxw4novSLXwPTi/EDs8h1/ReB5t4OTEQA1Wos4gwuEPQTgiJCpp?= =?us-ascii?Q?M/5XWoo6jFtBsOpmNFJ+Au/XwPYK5H+uxnYagRqkvbewS/V6L99bYY63uUkN?= =?us-ascii?Q?RGwyJMfYjPFNGNL0GYY6XdKuoGbnpzie092s+r8OI6kGNMw1aA0E97I2/q/O?= =?us-ascii?Q?yZFo6T9mPqD5ym2rDpB2uwX+i9et5YCRr9Rfzd55pwrLeJXibcbr4g2AFL25?= =?us-ascii?Q?EQfG1sAAs426eNbb0z9deo8z0M3OuDQljaa3OSh15HqqBAME1WwpsdbUVbXk?= =?us-ascii?Q?AccvMCWYUnbbcevXTlDfzUMDBdl5+AHa+i+zChFbJ0NbSruSZuFhBaJANJDb?= =?us-ascii?Q?K79Gh0s9hOo1xkaB+KUGp5IY7Pe909ii/lNC++SW5C9xq68BbhRZnXrfjWRN?= =?us-ascii?Q?ifZJ/WoxMsuJV4gMf9p+jzIOZpIib9mefSX4FpDv27w/Fb9aQfl3uEILj6Xv?= =?us-ascii?Q?L/JewXTpFCgha3+xNyT/SJTiRbxW3N2TU3TaDYSosutctPPK5krMoS5uySv9?= =?us-ascii?Q?q6TMuV5C64CWQ6jq8FB5sExc23kd6Hnd+cL9Fq02KcZBPcAMOlqC+nGXMaKz?= =?us-ascii?Q?H3ZdsgR+WvM6aDFLSetHkZFhT7h59s1PmW0HgaKQHdIL5WnLUCqpniQkW3Uc?= =?us-ascii?Q?BbkxJY6FpWEB6RXveSJcDd+JGpIxFTrBoDeYk0zPUK4F7DD7d9dtMPF/U3pu?= =?us-ascii?Q?kPOY6mQxbr9uMSjL8lExA4OV/oBcxQfkfbdCYN6e7kb5MWJ8XJaR2OhKBchu?= =?us-ascii?Q?o1RWp0g1xo5LZK02p6TsdGxQpMtv8pGZQwWbunOnrXHeCBxiB24B0rCdX18t?= =?us-ascii?Q?QCdfvSatc4MNaHrjjyZFfAln9aVqBKp+javqwKSWmDOp2LIVnKHgY2v/IfFH?= =?us-ascii?Q?uIbsWDlTPngMe/rfBOGajOoEqBWUeOV/4WRwY+TFuY41kukcnX4NeNX8Cssx?= =?us-ascii?Q?Cie0CU4qJ1HdyeoIwxz7ZpqQ5ImVlycYhh8qjP5FXtBekAqYB8f0LEgPxMDZ?= =?us-ascii?Q?+bgueFGDVGnXLRuPaWMd7izw8xH39zStb8WFTIpeE9aC1i2+RFt0p9DoMMZk?= =?us-ascii?Q?1KMjbt/0+01Lc7YUk+RBVO+v6E4QrS2LRXuc0BrTiYEhJn9nFvF+Tpb1a7sP?= =?us-ascii?Q?JjtqT6EKLcLpth8hEozZ/v96NEOJ4naXbRHuC4YMeqVhFzUKmorbkG7kxtHm?= =?us-ascii?Q?YW0Jqco420i1Dp6WiCkY9B3PM8CpXx4/iZz/u17Mqmnq0ST/VUl1nQSokm5F?= =?us-ascii?Q?WCJLEyTjpLb9wYPetksoQJFpC9Di9Ufocq8S?= 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)(7416014)(376014)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2025 16:29:05.1696 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6846cb9e-f80a-4327-e4a0-08dd8f169d91 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: BN3PEPF0000B074.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB7421 Content-Type: text/plain; charset="utf-8" Print the status of enabled attack vectors and SMT mitigation status in the boot log for easier reporting and debugging. This information will also be available through sysfs. Signed-off-by: David Kaplan --- arch/x86/kernel/cpu/bugs.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 55b0658562c0..4e01903ca6fd 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -177,6 +177,39 @@ DEFINE_STATIC_KEY_FALSE(switch_mm_cond_l1d_flush); DEFINE_STATIC_KEY_FALSE(cpu_buf_vm_clear); EXPORT_SYMBOL_GPL(cpu_buf_vm_clear); =20 +#undef pr_fmt +#define pr_fmt(fmt) "mitigations: " fmt + +static void __init cpu_print_attack_vectors(void) +{ + pr_info("Enabled attack vectors: "); + + if (cpu_attack_vector_mitigated(CPU_MITIGATE_USER_KERNEL)) + pr_cont("user_kernel, "); + + if (cpu_attack_vector_mitigated(CPU_MITIGATE_USER_USER)) + pr_cont("user_user, "); + + if (cpu_attack_vector_mitigated(CPU_MITIGATE_GUEST_HOST)) + pr_cont("guest_host, "); + + if (cpu_attack_vector_mitigated(CPU_MITIGATE_GUEST_GUEST)) + pr_cont("guest_guest, "); + + pr_cont("SMT mitigations: "); + + switch (smt_mitigations) { + case SMT_MITIGATIONS_OFF: + pr_cont("off\n"); + break; + case SMT_MITIGATIONS_AUTO: + pr_cont("auto\n"); + break; + case SMT_MITIGATIONS_ON: + pr_cont("on\n"); + } +} + void __init cpu_select_mitigations(void) { /* @@ -197,6 +230,8 @@ void __init cpu_select_mitigations(void) =20 x86_arch_cap_msr =3D x86_read_arch_cap_msr(); =20 + cpu_print_attack_vectors(); + /* Select the proper CPU mitigations before patching alternatives: */ spectre_v1_select_mitigation(); spectre_v2_select_mitigation(); --=20 2.34.1 From nobody Wed Dec 17 08:54:38 2025 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2073.outbound.protection.outlook.com [40.107.244.73]) (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 75E6E290DA4 for ; Fri, 9 May 2025 16:29:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.244.73 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746808153; cv=fail; b=SHWE8MYtD2ZUC2vD6cHWJkiFhRhzsDfH9odx8KoFZutQRlnZgyEH3J85iaGnAU45u/VubJfzvnvglLrVkCQLiuA7Yaq5pIFDGf3LOPWrQsP/8m5mjYEwiLSujruooXYLoo6jTqqO2AOa15i54aAbwtdXbZVkZGvdgPi/PnVvTRE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746808153; c=relaxed/simple; bh=9ePOZNxU4dO8vNKhy9+NYqZIYqNkrpKC+OBiaDA6lqM=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=CgjQZep4QAn7waYUO3aXgsvSxnSaogFRR49Og8UUkYfN8gn/k6O3LjrCkwXxAsFzh2vWfeW/FtBfsqs6crLdQ3b2N5192cVM6KG7nt+NUBLPxhvDM9XItRkBlG63n4yP930TOzH0DjhmG2iTZbdUXC3RRVl5Tv39z8C8xbopGik= 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=Aq4FcIiL; arc=fail smtp.client-ip=40.107.244.73 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="Aq4FcIiL" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=f+FtmuscFEqKKoNFv84FHrwB26jretN6a4yuScI02/escRbTrySRKwiobMEkt17B8yStlnzMQnR9wfAhK8aXSz7jZ/tPXpTXYRUG6M+rU6VSZbE8vpX7pyy3WRCkPslNcntlDePoBGvDzWyu7nIhJ92lP0V3PPK51Qzkv6sz+o1rpJ3/03rt4VXQYo9vOvU1JN2VRhAGXNek9lb+lVTnRJrK8HRFlMqbLnwZsrkjKpaRV1D5OkDcjSLcudtTIgeIpCYLKYmNknGtlWZUKHu5J9rJVDkkvF1azw8yguxBVjxKhSeka//NFyAkqSQlwyoUkDjTXSGpE8jtrHVN4Ng0pg== 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=+E7M8bB4d/Bm8ZiZ7eSfTLzA8pOvObfiTAHYavQH1nI=; b=m6EJhsOJW9+9IGV9pGUhY6EnYy3S7ifZEF9zl6/CTKUki/oUFpIaNSCDQIwANaOmv564T5hAkbhRHglMqAYxA/A2QN9M3XdvAS0hKVuLtLnBTfhgPQ7qtAyaXDGN7cPYiJ5afyZRlhLCPMXy5rMahSsuVsLeEyTddq9U/GDrUKgKa78argxZS+2x8hh2k5O1h0/73Xwbli3lRLucwXP53uxalC87sFGK4xV4Loo3ackj6dcR9TTv9z5Ok28Hg+yyCUtvJxGWohUsVtw9bOwgUwFvCPuK38UysNYCeHJY8WzBGTooBr/PmwVZqiEBs8bryNjPQfRsti6WR4zaqvTPwQ== 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=+E7M8bB4d/Bm8ZiZ7eSfTLzA8pOvObfiTAHYavQH1nI=; b=Aq4FcIiLvc2VuPROYN4hcBbvrAw/zvD/6lpNQp0WgcZyD//AdpAnTMsrVSXjRfKkFAlkhupSdwyyx27ZD3UAL0IF4pEWoD4gDlyuvVUD6qKbVPYZcx+kGYQtkrGi63orwp6ACcYc0i1H8WdUz32O6r5k/B/5Gd49XuM8Kx+fRcs= Received: from BL1PR13CA0113.namprd13.prod.outlook.com (2603:10b6:208:2b9::28) by CY5PR12MB6324.namprd12.prod.outlook.com (2603:10b6:930:f::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8699.26; Fri, 9 May 2025 16:29:09 +0000 Received: from BN3PEPF0000B074.namprd04.prod.outlook.com (2603:10b6:208:2b9:cafe::7a) by BL1PR13CA0113.outlook.office365.com (2603:10b6:208:2b9::28) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8722.19 via Frontend Transport; Fri, 9 May 2025 16:29:09 +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 BN3PEPF0000B074.mail.protection.outlook.com (10.167.243.119) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8722.18 via Frontend Transport; Fri, 9 May 2025 16:29:09 +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; Fri, 9 May 2025 11:29:03 -0500 From: David Kaplan To: Thomas Gleixner , Borislav Petkov , Peter Zijlstra , Josh Poimboeuf , Pawan Gupta , Ingo Molnar , Dave Hansen , , "H . Peter Anvin" CC: Subject: [PATCH v5 20/20] cpu: Show attack vectors in sysfs Date: Fri, 9 May 2025 11:28:39 -0500 Message-ID: <20250509162839.3057217-21-david.kaplan@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250509162839.3057217-1-david.kaplan@amd.com> References: <20250509162839.3057217-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: BN3PEPF0000B074:EE_|CY5PR12MB6324:EE_ X-MS-Office365-Filtering-Correlation-Id: ee88a001-5a93-436e-8686-08dd8f169feb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|82310400026|36860700013|376014|7416014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?EguhrFJcOHN/TnjK/i/zXO0r/qyVAZysxOCShR7ZLCX8vdH9JUsLX+L+Oo+Y?= =?us-ascii?Q?CFWrSwxmHo3klknMCzoUlGYXd1PxKxe4uEKZea7EWukFwHqtMp8Xttbwzs+P?= =?us-ascii?Q?xexAMXThdAjHO8RH4Wes8w1Hhvko+wVDbyBLNJtNBmpHqwdBjpszgpM5Ih6X?= =?us-ascii?Q?fvvAEkbWK+CV09qmiJGKe41YzmMH+DoSK909xI5G095R7L13px3iFhTpb9rV?= =?us-ascii?Q?9ycHJARKfWcBnURp1mBKlQLZVT+MEtwe8JmnqcJ7pW7t092C4+gxxtXM8VJk?= =?us-ascii?Q?Wfi6jnH2icMpiy7zkYLE/J2jILgJs8qWpDKuiZUowm1z6bQQGI6wCJ0FE+KM?= =?us-ascii?Q?a5wocjTY4kkqf7f90YioKLdKqPdlILFLkk8Ve4Gn0ZAEDdY8INGTCl1IWxnB?= =?us-ascii?Q?dpNKRtFQu4Ihb0xpxtQwVkYlIwYRE093KAD2r2L8+qAtDrChRFDEFlStal1X?= =?us-ascii?Q?iT0rENjBeqZxXtCOKeDgB6G4oBDmbm/TnnF1E56LC2yKq2T8yOgpGpVXHkhv?= =?us-ascii?Q?NI6gBg20/0pTAkQn+MgFhLn2eezXz1lR8ORCWFZRCHSJXJmrtE3+C/9O1lDw?= =?us-ascii?Q?64JLtUuQq2bMYlx/SLVwT7gcMK0RYK+re5ykb577o6dhzavgfwxbo/KKhCww?= =?us-ascii?Q?LNQYvUCYn21NQ9o0iPvipNVFjskpz0cDGhjzWqUgz5T4qHZ5cVv3SCT1K2jt?= =?us-ascii?Q?Z37LxDD1niTe96+OisR0/VaObn0e6fqeQDbLyIUX0WT7oYk11ZkCb+eb4CZD?= =?us-ascii?Q?608EfLCDQOZ19ZxvxWQCk9dsQvjohayqXCtGxqD0r9CRq8gR9HSprh5Nq65B?= =?us-ascii?Q?aLfqNBnnUBjJtWvhTK2ufryVVEO17foYwT3v0d2u/kcUO3RH/vLl8GeHYbNy?= =?us-ascii?Q?Bk7A9AehimXGLbJsXlH0ix4NFFqq816z/mDTnhNAO764U5IUt6OvYONXPN3d?= =?us-ascii?Q?hRfs4FU7JcFO/PeVhgbOVHG3/WLXqgkQr9an98p14KW7hFmWHbIE3hbi9KZ2?= =?us-ascii?Q?uBV7rzp0QID33o+qLPP3SmVuI+CkE5kajqGqi3hle4CtrPWMdZyXXYCll6Ds?= =?us-ascii?Q?O3PutYsWGh9Zk9ITXn2FSU/BpJPa1/ytPLdCap8lPN440T1H/Vv8QoIqRXNu?= =?us-ascii?Q?T4mMgPRLPZnqkiLkyL4KSf2qiESP94H+CWY5g5fCqWfeQ4MhTcXQN51KU9ZI?= =?us-ascii?Q?WiiRrLWgTtJq/4aNAB1TRSrBbcApdwgSFUCz3fB1GsExDG/hGn7Xftwz8xds?= =?us-ascii?Q?BjWQZq/CqA8uXunM9xtFnr6V9tX9G9U5dQUtA04ane84YvYe/j5lX9EX23d8?= =?us-ascii?Q?E4d9v1Oz9rbfR6IPQS9WIYB0wqIc0e2nIxResSN1uXAV1FArHBdnQnype1GW?= =?us-ascii?Q?hPSWEBB4t2Bt+dNGTI4HFPOMDVNs6IW7N/dx1RSQrW8W3nKXGSDrX1Aaid6D?= =?us-ascii?Q?x3ZMyU5J5An4L+qOa4060kj7EnZsvlSqAtkLsKKpPLl9xbOajtUtrRSNE8I3?= =?us-ascii?Q?l/95hk2ii5vg0+IoyqQ+HwQsqyCuTCIX6DuE?= 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)(82310400026)(36860700013)(376014)(7416014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 May 2025 16:29:09.1112 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ee88a001-5a93-436e-8686-08dd8f169feb 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: BN3PEPF0000B074.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6324 Content-Type: text/plain; charset="utf-8" Show the status of currently mitigated attack vectors in /sys/devices/system/cpu/vector_mitigations/ Note that these files are not under the vulnerabilities directory so they will not be printed by 'lscpu'. Signed-off-by: David Kaplan --- drivers/base/cpu.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c index 1c4359366cd7..991f989f18ff 100644 --- a/drivers/base/cpu.c +++ b/drivers/base/cpu.c @@ -20,6 +20,7 @@ #include #include #include +#include #include =20 #include "base.h" @@ -644,6 +645,70 @@ static const struct attribute_group cpu_root_vulnerabi= lities_group =3D { .attrs =3D cpu_root_vulnerabilities_attrs, }; =20 +static const char *attack_vector_state(enum cpu_attack_vectors v) +{ + return str_on_off(cpu_attack_vector_mitigated(v)); +} + +static ssize_t cpu_show_user_kernel_vector(struct device *dev, + struct device_attribute *attr, char *buf) +{ + return sysfs_emit(buf, "%s\n", attack_vector_state(CPU_MITIGATE_USER_KER= NEL)); +} + +static ssize_t cpu_show_user_user_vector(struct device *dev, + struct device_attribute *attr, char *buf) +{ + return sysfs_emit(buf, "%s\n", attack_vector_state(CPU_MITIGATE_USER_USER= )); +} + +static ssize_t cpu_show_guest_host_vector(struct device *dev, + struct device_attribute *attr, char *buf) +{ + return sysfs_emit(buf, "%s\n", attack_vector_state(CPU_MITIGATE_GUEST_HOS= T)); +} + +static ssize_t cpu_show_guest_guest_vector(struct device *dev, + struct device_attribute *attr, char *buf) +{ + return sysfs_emit(buf, "%s\n", attack_vector_state(CPU_MITIGATE_GUEST_GUE= ST)); +} + +static ssize_t cpu_show_smt_vector(struct device *dev, + struct device_attribute *attr, char *buf) +{ + switch (smt_mitigations) { + case SMT_MITIGATIONS_OFF: + return sysfs_emit(buf, "off\n"); + case SMT_MITIGATIONS_ON: + return sysfs_emit(buf, "on\n"); + case SMT_MITIGATIONS_AUTO: + return sysfs_emit(buf, "auto\n"); + } + + return 0; +} + +static DEVICE_ATTR(user_kernel, 0444, cpu_show_user_kernel_vector, NULL); +static DEVICE_ATTR(user_user, 0444, cpu_show_user_user_vector, NULL); +static DEVICE_ATTR(guest_host, 0444, cpu_show_guest_host_vector, NULL); +static DEVICE_ATTR(guest_guest, 0444, cpu_show_guest_guest_vector, NULL); +static DEVICE_ATTR(smt, 0444, cpu_show_smt_vector, NULL); + +static struct attribute *cpu_vector_mitigations_attrs[] =3D { + &dev_attr_user_kernel.attr, + &dev_attr_user_user.attr, + &dev_attr_guest_host.attr, + &dev_attr_guest_guest.attr, + &dev_attr_smt.attr, + NULL +}; + +static const struct attribute_group cpu_vector_mitigations_group =3D { + .name =3D "vector_mitigations", + .attrs =3D cpu_vector_mitigations_attrs, +}; + static void __init cpu_register_vulnerabilities(void) { struct device *dev =3D bus_get_dev_root(&cpu_subsys); @@ -651,6 +716,8 @@ static void __init cpu_register_vulnerabilities(void) if (dev) { if (sysfs_create_group(&dev->kobj, &cpu_root_vulnerabilities_group)) pr_err("Unable to register CPU vulnerabilities\n"); + if (sysfs_create_group(&dev->kobj, &cpu_vector_mitigations_group)) + pr_err("Unable to register CPU attack vectors\n"); put_device(dev); } } --=20 2.34.1