From nobody Fri Apr 17 00:17:50 2026 Received: from PH8PR06CU001.outbound.protection.outlook.com (mail-westus3azon11012031.outbound.protection.outlook.com [40.107.209.31]) (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 D35C93644A7; Tue, 24 Feb 2026 18:02:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.209.31 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771956148; cv=fail; b=m+GxT+WdbiJ4YT4dLoIfe/3wAeNrjv2WOvI65mR5405Ys5FMp8dKPcXpWEbDAdM2N9sIEXKe96ozrK5P/wrRDMIJII+ECSdaOeMtm3F7nVtYvVJsBBgF1gAt7SR3vlNn/99+wfUJjawTv2OoKPbkUWopv/XBYgs/ajXlraLwfKk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771956148; c=relaxed/simple; bh=Zzo44lHK73FbCEVyAw8vxSdSQEpCqyPf/JUVBmN/y84=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=EvN/y6vi3xfeEwJ1NxXYXTLN89oYlCyHvJVpZF9X1nwVWaSgvYVsW8svfzDNaKpdsqpSm+7tUt+YBNeMdIxZrqzXoNEPExQk99Wd7kWB7Sie1j31zSeqv1eBKpv2KuNYZvKcL8w9dg7vV95vqUit5HpaujBjlRuCtXZh2CI2ruw= 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=wmT9Stzc; arc=fail smtp.client-ip=40.107.209.31 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="wmT9Stzc" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=yDE0W9s6pKXXt96CaV9tbC5W14fiI7JIla+TaK9YYNBXvns2S114hd246KC68mXjH1fZb62YtUsR556nUJkc6WYTUPSgCHbtG23hyWhvkkgpWfdyppdW/uBzBVoLC5NvvFfPux6sJBvMqLVZe1VjrfBcGfsQKO38S34uXVh9AQcjfVjTLv4YCH+O1NebjyHjhsrL0V/qTfQ8LFbPGqgpT2dCqipTVrjjlnS+4XPwMY3IdDVuvelfJDVHOlnlTrpfyN0cGA8pLs5aqQscuLBzE873JMuxB1iyuN2gC0ELjBqRf2Bm1yRqAAo9kT7857ky7J7Hi/iI1pPSvYzZWNFBBw== 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=esvU+cNInMev5qUm5PHxZmhYcVWO6gsM9SdR907DRLA=; b=De36JK1/0/taGi+ao+W1xpZlf7NXKYKPlFTU+VyL7zIhz2HFD87AysmhOg1Zls+CrlDSkSINRpSamlF4fzbvw4J96yV4vqjbRvzHjHRtqQ/OmeYMse+fX6KkB0oNRSB8fmk9feuF3I+B26d+wIVHspEPvuoqkN6R254OYyBVCfYWh2NZT9YfkMQNkcrZvwN7ZRCAWxzmAhj9RmVxNgwaz/vpl92Jr+b95n96rBcEA5AuNk/Tnl9RPCyjA4BysRNGSBdPe7OBoW8sc+Gw2CZV03sHIZ9RSQkR3p4XU3G9bj1uqARl/1C5B/SVQZvxM9ctkriWRZJ4e8RoUY7+qRScTg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org 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=esvU+cNInMev5qUm5PHxZmhYcVWO6gsM9SdR907DRLA=; b=wmT9StzcGWti+sEG+xb+wUtP+2+6eqN5dFqYKiGIZwRujCCQ4ygdhk2nXWlYMj/tPMk9G+D+I5V7A2bZrZWkMC8D4eBu0w1l8bPF+8f2qZ7i3THJNyGRh+MKuddTus2wl9jWwkC76B1BoojWho3KrIFcR9EyQ1XHOm8gFLn8fhM= Received: from MN2PR03CA0022.namprd03.prod.outlook.com (2603:10b6:208:23a::27) by IA0PPF7646FEBB5.namprd12.prod.outlook.com (2603:10b6:20f:fc04::bd3) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9632.21; Tue, 24 Feb 2026 18:02:23 +0000 Received: from BL02EPF0002992B.namprd02.prod.outlook.com (2603:10b6:208:23a:cafe::72) by MN2PR03CA0022.outlook.office365.com (2603:10b6:208:23a::27) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9632.22 via Frontend Transport; Tue, 24 Feb 2026 18:02: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=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by BL02EPF0002992B.mail.protection.outlook.com (10.167.249.56) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9632.12 via Frontend Transport; Tue, 24 Feb 2026 18:02:22 +0000 Received: from dryer.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Tue, 24 Feb 2026 12:02:21 -0600 From: Kim Phillips To: , , , CC: Sean Christopherson , Paolo Bonzini , K Prateek Nayak , "Nikunj A Dadhania" , Tom Lendacky , "Michael Roth" , Borislav Petkov , Borislav Petkov , Naveen Rao , David Kaplan , Pawan Gupta , "Kim Phillips" , Subject: [PATCH 1/3] cpu/bugs: Fix selecting Automatic IBRS using spectre_v2=eibrs Date: Tue, 24 Feb 2026 12:01:55 -0600 Message-ID: <20260224180157.725159-2-kim.phillips@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260224180157.725159-1-kim.phillips@amd.com> References: <20260224180157.725159-1-kim.phillips@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: satlexmb08.amd.com (10.181.42.217) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF0002992B:EE_|IA0PPF7646FEBB5:EE_ X-MS-Office365-Filtering-Correlation-Id: 3ecaad79-ff76-4a00-0485-08de73cedc28 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?+wccmTkXatMGgOiB4yM5uBrS849XZWyQ/z4jTq0NzrxS9+UtBfeB3l2JGugj?= =?us-ascii?Q?/BxfN8DrE+RuNUB+GF9a7MPPbq0x5J+Z5U7t71ABfMCTOU9ERi1Cu6cbjjvs?= =?us-ascii?Q?RGtIUuP6YWjxLRTEEDjrnnOJi26sgrV8iWVBu3GQemCWSd/5cPW1CNma6VbG?= =?us-ascii?Q?ghbtuz3j4RBMDYdaWKLjIJqkUCvXCAg1a+DvkhF8hAhqOPIUzUS9S5IstEyu?= =?us-ascii?Q?F2Vdn/UPCxv6rHVRU8QnXlTFj3L2nw6AHKqpWWaTFSfhvFL9DrxSPIXVjO3J?= =?us-ascii?Q?zTVynrSckxswUTsX67U4lr8hFn3YSf0ZLfBMEYNVHXTLgbQX3Vv8td75pQQ3?= =?us-ascii?Q?j67Y+SauoNXLN2sn7/leuRIKjDBu0+d6VfH9QoRF5JxYsw2bVQv9Em5r4SmK?= =?us-ascii?Q?+UsH4O9C2CWwGWCw7237kWm/r9DMVkO4pXd8HqtK2iOoyu5+ZvqcjrbxiEAn?= =?us-ascii?Q?HhcVXipKxqQTO+6OflRfFZ+h1pzdpBK2gMh0bW0BAK51cMSn3oV7aZiB22sf?= =?us-ascii?Q?d6al/3oxFrGl99vM4Ymsi0FFAhhKxRH8j0PfzAzsyLZ+RMpHIfRZi6NDTI+r?= =?us-ascii?Q?yxWiLrELLP1VfyF9ptAXGhRemu6SHuPAKbcDOSc8B6m91BQXvepielttJyWt?= =?us-ascii?Q?1rBDyoC7npEBwPFQSQ27kdGAt88yDoff4rub7J0sZ/6kB532WNjaroZfZScF?= =?us-ascii?Q?VDxcXYUSM+QqBZrGfRSN5NZmYdCwZGVr9WBwe3FptNGxNPE9q0VqWTKxKSV5?= =?us-ascii?Q?J0GOBuTVYQWvMgmjkqaafkZWxSVkLZkWqnMEknrcEBWV1dsvtqkxRQxzqobd?= =?us-ascii?Q?ihj0MqqGPVeHRTOCcMHcyo9tUXrk2BonQIGyS8RlqiWqosFa6iuWjuKHpfMv?= =?us-ascii?Q?iEUwCAzzYYFA9C2CVE5KB3lD2GJ6bUW/1sbBFR5E1eZTHGqMBImtFuRwc2ED?= =?us-ascii?Q?+dXONXbeOH9v6VPtByBzToO2Unp4KHa67e6D+8LhUaYhCnFfqs5Zaz/szc9U?= =?us-ascii?Q?+Af9B2giMgsxVoJQvikOf13qvZVTiS9GQhofjl7uHqXOhyhnLwTf2e2FCP8z?= =?us-ascii?Q?IAsGmJJXGB8SmjpbjeWt5q8sKa0XFo3J/BO5BaLS+gyCV/WeCAYKbH6dFrCb?= =?us-ascii?Q?bonqsJasp1mekKcnFLT56PVoCsmH76z54lSz3oM7e9TOruqrffi1VkGRL8kt?= =?us-ascii?Q?UCmSoTD7ip0bO0mc//kc2RVUZo3MPTv6vP5VGA9fRvus212HHrQYXvN6UpkH?= =?us-ascii?Q?OtcywfTYhXTDOSAxiISxro3WVzzvArDl90ffBY2OOKE94LH1rj9MHB3VPG9J?= =?us-ascii?Q?S13GahCnVqcN/CRcmUFihergKomW5ah7FzdsVLE4HhiE8cjnzJ02OG3lgcSA?= =?us-ascii?Q?EuL8yznq78E6UtsvE0oRl1IFtD5cxKwWQfuciXXMgLJPhO1cqKFjHpo7u9yj?= =?us-ascii?Q?ToQitepYjHd97auXn89x4SS6Mti9rAgeUtnvCBb2B8QJFQBvIgKpu1J9YWJj?= =?us-ascii?Q?i6lv3JijWPDghyVx8WbYGFn2/2egbwlvMfeb3hc3Zv2LNl4a3+bIQ7hRLY4B?= =?us-ascii?Q?p7QlhE2skbpczB6FGFvtqm2uocArHD0V2sNJu/dul71mA9HIVEhETXPorhT6?= =?us-ascii?Q?la8G/IS+eQaMZzQzT2Lzw9Jey2qqH++muoopusSIGdUdoWbrsADa17qIeLx0?= =?us-ascii?Q?JDNucg=3D=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(376014)(1800799024)(36860700013);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +vXhWLjan1MhQQbVIK2d1zMoAjcknf8vZROPPylY72MN6OHQqK2JjSKBFZdOUNE4U2kXEDn3MkMSQ+Lx07YzVmbP8nO3hljV5W+mS1u9fK4V+3Xr2KW/CYley6wGhx0aZYzvdZUZRIw8+BhU4UuutoVh+DyF3VrZEm1BufOu5x60pvKW8njoFiJ6btXNMzuLutprd9yasgxZrKJVX/V/gQAFLrZCQXPodAXpamWiE5oPrbxpvyfhrdeoGUVz9PqY4ngNgyJ9E6jFI+rn365Q9TgndgDjFiKhZYoFHELfw+Ey8xPqDOkDRrzbJ0ut9KqTzcPftiMncmxQMwxJVZ3SaDtoigxTTS/8N7fFYEdv7edfJNs8n8dU1JgPuFISE2KPw+Vr9AyBrSCwtK8sO7XBFkIK3G/HhYadOvRQC+M5d7fEJoOYV5FRiEO4tjvwYagp X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2026 18:02:22.6804 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3ecaad79-ff76-4a00-0485-08de73cedc28 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=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF0002992B.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PPF7646FEBB5 Content-Type: text/plain; charset="utf-8" The original commit that added support for Automatic IBRS neglected to amend a condition to include AUTOIBRS in addition to the X86_FEATURE_IBRS_ENHANCED check. Fix that, and another couple of minor outliers. Fixes: e7862eda309e ("x86/cpu: Support AMD Automatic IBRS") Reported-by: Tom Lendacky Cc: Borislav Petkov (AMD) Cc: stable@kernel.org Signed-off-by: Kim Phillips --- arch/x86/kernel/cpu/bugs.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index d0a2847a4bb0..4eefbff4b19a 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -2136,7 +2136,8 @@ static void __init spectre_v2_select_mitigation(void) if ((spectre_v2_cmd =3D=3D SPECTRE_V2_CMD_EIBRS || spectre_v2_cmd =3D=3D SPECTRE_V2_CMD_EIBRS_LFENCE || spectre_v2_cmd =3D=3D SPECTRE_V2_CMD_EIBRS_RETPOLINE) && - !boot_cpu_has(X86_FEATURE_IBRS_ENHANCED)) { + !(boot_cpu_has(X86_FEATURE_IBRS_ENHANCED) || + boot_cpu_has(X86_FEATURE_AUTOIBRS))) { pr_err("EIBRS selected but CPU doesn't have Enhanced or Automatic IBRS. = Switching to AUTO select\n"); spectre_v2_cmd =3D SPECTRE_V2_CMD_AUTO; } @@ -2182,7 +2183,8 @@ static void __init spectre_v2_select_mitigation(void) break; fallthrough; case SPECTRE_V2_CMD_FORCE: - if (boot_cpu_has(X86_FEATURE_IBRS_ENHANCED)) { + if (boot_cpu_has(X86_FEATURE_IBRS_ENHANCED) || + boot_cpu_has(X86_FEATURE_AUTOIBRS)) { spectre_v2_enabled =3D SPECTRE_V2_EIBRS; break; } @@ -2262,7 +2264,8 @@ static void __init spectre_v2_apply_mitigation(void) =20 case SPECTRE_V2_IBRS: setup_force_cpu_cap(X86_FEATURE_KERNEL_IBRS); - if (boot_cpu_has(X86_FEATURE_IBRS_ENHANCED)) + if (boot_cpu_has(X86_FEATURE_IBRS_ENHANCED) || + boot_cpu_has(X86_FEATURE_AUTOIBRS)) pr_warn(SPECTRE_V2_IBRS_PERF_MSG); break; =20 --=20 2.43.0 From nobody Fri Apr 17 00:17:50 2026 Received: from BYAPR05CU005.outbound.protection.outlook.com (mail-westusazon11010029.outbound.protection.outlook.com [52.101.85.29]) (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 2D0A054758; Tue, 24 Feb 2026 18:02:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.85.29 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771956164; cv=fail; b=fvqL14zKphgsmVEkL6VnibDNcQpkNxhhtA6qxrIhSNwSFw28abPCP9TSn21sSb2bo+J7WgnbIkLTzotwESL71pQvMeCFBVtngmrnJkuQ9Pax5O+Ae9RudT3Yqd55UgsYLYFZjdYRFf2tys5yrvZcXCc769W1sKAFuQ1DtzywxeE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771956164; c=relaxed/simple; bh=CUZ0Yp8Ctj5iGXDOBzggNJqtDrYM6UhDGLbGltHeLtM=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=jyPYc/NfKrtS0nfBBdhvqYGdqkelaaO5T476mlJZa35vaq1hXhnQpHqUlg820BQLh9RsTRluQlpAHstRmfUnDuEvMeCxaBLEhTwr3l5xm75vLdFx6Xu8uuB3HuX26RfR+yIWRavMV4E9lcdSMm6iWCXD97igS4kmwMU4ALoHkU4= 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=3SGUz/vS; arc=fail smtp.client-ip=52.101.85.29 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="3SGUz/vS" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=HnRshgX2BGDippYtUHJaTgYqODBYcYb2++hLXn7uZTBzP6bzG2SCFrbptKQ7dl3iE9DO4dbuxP2xoGDzeK6qfSH/srpatpMOMfXWJS61i92GNR4yEQMQasv3t5Hsyi0sUNzb5EIn00+n0wIswuIjpDOKfc+62KDdRO9PTuz90kaFNCbIcc4m+nh1am8coUfkhQK8UjBv4jMHtygMwIsBzab6yDwmnLqNg4R9Fw9mpOUgE7RMsYmuyKrwrIhqwtuyDodPVzAZI8g5WgR1uhSczCItzBNYPytIbq5toQb0bjD3MrBr5a7SmRdMDsQybOJVQGn6rysH9t4nZJPq+OOD/g== 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=Cpez5mwt4d/Bf2YizbgXqk90L42ZNm+bNgHBZd7xUck=; b=UqLwpa5zqAaH8DpTe+ay7SI3dvWq+mUICTm7UWsfpPOthnbQW+3/Q9KLVMJukO5R1xIXMBuCWb0mxfvgvY314OA+KHCXB/pW1ZMCkncZ68YEPbCHEhnwN1PepWLSpfbIkEPMyLum8GmnlPHUEzmi+M96i0gGU9TNvhe2uuIq6oE84y/qQgrYmX+5AX69LDCYDYsK0yrkhLKDdIxkM4FpVwaRSTta6QHLdpNj+C7WUGt8Tv0TzTY2WMxb9k1oGuJsc2q+LiTK7Ke5OXjQIEJoMn5G0X9vLaTAiEFTu/cZ5UV1uUBpAViJXtCl0TU5fzwXaKcZqOvL3i0s5fKIv7ZAmw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org 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=Cpez5mwt4d/Bf2YizbgXqk90L42ZNm+bNgHBZd7xUck=; b=3SGUz/vSGLBz3HQXgRjyjzRYHXftD3TfgGYmclQjurGdS3yHLBaw7yEAOuTGt3zZCIiT8EbnEimiQF8K3CUcVUI4wSRvaWw6aBhd4lfFo4rk24s40yFwlf4H6ZoVEUpea53XAOjs7tFCci5/GErkIH8TEeFoeu6mJICd06RSK94= Received: from BN0PR04CA0090.namprd04.prod.outlook.com (2603:10b6:408:ea::35) by DM4PR12MB5961.namprd12.prod.outlook.com (2603:10b6:8:68::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9632.22; Tue, 24 Feb 2026 18:02:39 +0000 Received: from BL02EPF0002992E.namprd02.prod.outlook.com (2603:10b6:408:ea:cafe::91) by BN0PR04CA0090.outlook.office365.com (2603:10b6:408:ea::35) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9632.22 via Frontend Transport; Tue, 24 Feb 2026 18:02:27 +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=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by BL02EPF0002992E.mail.protection.outlook.com (10.167.249.59) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9632.12 via Frontend Transport; Tue, 24 Feb 2026 18:02:39 +0000 Received: from dryer.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Tue, 24 Feb 2026 12:02:37 -0600 From: Kim Phillips To: , , , CC: Sean Christopherson , Paolo Bonzini , K Prateek Nayak , "Nikunj A Dadhania" , Tom Lendacky , "Michael Roth" , Borislav Petkov , Borislav Petkov , Naveen Rao , David Kaplan , Pawan Gupta , "Kim Phillips" , Subject: [PATCH 2/3] cpu/bugs: Allow spectre_v2=ibrs on x86 vendors other than Intel Date: Tue, 24 Feb 2026 12:01:56 -0600 Message-ID: <20260224180157.725159-3-kim.phillips@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260224180157.725159-1-kim.phillips@amd.com> References: <20260224180157.725159-1-kim.phillips@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: satlexmb08.amd.com (10.181.42.217) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF0002992E:EE_|DM4PR12MB5961:EE_ X-MS-Office365-Filtering-Correlation-Id: 5bde4f99-bc26-45e0-b7c3-08de73cee5ec X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|82310400026|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?gykOjVudNgotv66cQhr0q4Htuq73rRXgsbtWShhxewochyvWouTp0hLTGodM?= =?us-ascii?Q?M6gqg91WZaq/FqfwADclETP6G5Z1UmTtKwUUSXtAQHTfZkFz0qXr2uJoQbm6?= =?us-ascii?Q?oqLEyHXgJh3sGEc7eiKUfYjT5rzHjXZ4pH4GHk7oyRtf4hqv/wVvZLj7YBlS?= =?us-ascii?Q?o0ApYwWd8cANKKB0CHbXxKO58ctQEjgI41llb0LGM2V4o8P5lgjTrjOxXVXg?= =?us-ascii?Q?y6BtGL68iowK9khlyP1ugDyxoukcyawXZDiWRQM8KgOv+01L+/jfcHU6auh9?= =?us-ascii?Q?8p9jI2vBjQ27mT6tF2JgUEOK3IvzMVMx63a80KIiCLDGmmkjQRzhZGkcXPAj?= =?us-ascii?Q?TlCrwqTyPmmpifx/ZvbDXAVsZWWOnbG8tP4+/dywx6RhAuz8pwXuUQS9uHCs?= =?us-ascii?Q?wMzDVPsAoWXB9ZYdfFq7zlm9Xog9aQHO28VIWAtVDpvn0JXAaLHu6M0YM3ej?= =?us-ascii?Q?l9MtOZKFk/AotZzuwvkhkRL5sKlA5Lcv2WF8ebii0IUw2UXxNClt4e18OLKl?= =?us-ascii?Q?YaRIOu5V1tFipMZfljG8B2ROkoBEtDCSpigcfvITYoRhFcItGqx9F3+k/0qu?= =?us-ascii?Q?tIPv27MIrKmyorwjYZAuRUbOfner2gB/8YQlnTqiUmap2qRVNRS/SJrAZOv6?= =?us-ascii?Q?YU8FifXX8GRHpz/XNjScxR6HPCIYe5j6+qLdCboVPTBHEUqZGbUYW2ceiyn3?= =?us-ascii?Q?cdfwYaq/gyhlhseaHQp1PDCpqn16mwaDT8WcsYT0wg1eE+s9+M63fu3XtQDt?= =?us-ascii?Q?W/F54uOW9bPuUnKFNQ6rRByh8+3GFSQXHtrWyMYidyepbfRtaFRFY93xfUaU?= =?us-ascii?Q?jR7cHCKrBIx2jdVxQVAr7QvafLDYzaWMCC3ojP4rf6P67aMFon+BDi2cEg1T?= =?us-ascii?Q?I1EA1B4S174toakH2zosovS4l9qVIr84K8utBVUb73t51rKaoVz8S0sy+Fh4?= =?us-ascii?Q?5+pFGcFwYJ58QYQiJ/6GeX1nsgpHoSheW6tFVr9cr51Bnn/dosD5ZeIDJAc3?= =?us-ascii?Q?hrRaIuwZEGNwyX7pvhfZg0jx1paWk/rnUT7QSgI0MQZa7fuuvoG2pjtWXSi5?= =?us-ascii?Q?NNLEUgPPi6kEf9n2k30/9bI4As9nTM0a0ppE7oP8yeTIaUSEUpmqPgi2fU2S?= =?us-ascii?Q?1r80Q1jDZDGT0WiF5hksqkbzQVcXRBx+Y9vgHv/TdJtCrO1IyhhvMuowNTI2?= =?us-ascii?Q?8tl7jKhVGR2kHBGbxkWnCGpmc6/IUecCApjI3WcNH845kpOtOK7ht7BZwwCr?= =?us-ascii?Q?tiT7XFKnE/KPrZWVL0IP+foLuOzmSvxWimHI9f4HB/sBBW0c/qS0SzQkw4nC?= =?us-ascii?Q?ksdsJMinjSbSMc/lknOUXnRGlHM1NO0V+ljaakvOA/lfEf0ZVwrwNd3gCjpB?= =?us-ascii?Q?cG42vKiuZBP3TrGxiRgBMLpZ7QszegsAFSdFUPB5v3Ko4UgIKqA6GqlWRgqd?= =?us-ascii?Q?ATPktBvRIjiVifkEZrkLQzHgwysCzqd/u92v1BAQ3NKm8vVu66OrjWAb/Ha7?= =?us-ascii?Q?USD0OuUld2Czxpjzj/4Mv9evaktnHiR5UM22pHX+k01Hlg7QJWR8nuOjA14o?= =?us-ascii?Q?02gg9YLkDCjwJjt85UzOG4OozFUisnOg2RHScADhCXQVNPetzajJEMfjPION?= =?us-ascii?Q?OMWP1aAjHNb//FWR/7v4lRZCd8isPrSpzjqYpeOyfyPLjdsGuJCK0IpoUTDQ?= =?us-ascii?Q?Q44Ztw=3D=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700013)(82310400026)(376014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: cnH2Vlt+RsXF8e6MrOGZ0kxqgImBI+nf4E57GJeu8ra1mlOSdJw/UEY/TmsD0H2E6vceHjGmRI7R0wzn8k45GjEL5wnv0IGm1jBGaNylI+kwkb6KBuSlFHgdN07vhnYtMKNWx8U+8z8isKFhhY5mqlL0xhhtvyg9D/vKZzIwBbCSgphtTRVN98+wLT2wFpmiamIXzLJSDQl28Ent6Ht4Y1SmW/gdZP/yUNXZMSpdN23yfb3T2RRJ4IBa6ercL859hamsx3dgSJ7dfD7hbjrYB16cyDrhTBUfY8FR6Do6iKbWOQSkKFcKQ+fbGpQVCGmLp2i7G1T+k3BTwVwwPGQegAvsgUr2AXVM9IjCmoFeNs4ap51+p5wZAAPLk0oSjEs2uH5vMQf97bRjj76Hnj62ntMEZulhs1leC0WAVWWpxC2v+U1iArniXH3433PxMXOS X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2026 18:02:39.0712 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5bde4f99-bc26-45e0-b7c3-08de73cee5ec 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=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF0002992E.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5961 Content-Type: text/plain; charset="utf-8" This is to prepare to allow legacy IBRS toggling on AMD systems, where the BTB Isolation SEV-SNP feature can use it to optimize the quick VM exit to re-entry path. There is no reason this wasn't allowed in the first place, therefore adding the cc: stable and Fixes: tags. Fixes: 7c693f54c873 ("x86/speculation: Add spectre_v2=3Dibrs option to supp= ort Kernel IBRS") Reported-by: Tom Lendacky Cc: Pawan Gupta Cc: Borislav Petkov (AMD) Cc: stable@kernel.org Signed-off-by: Kim Phillips --- arch/x86/kernel/cpu/bugs.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 4eefbff4b19a..67eff5fba629 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -2154,11 +2154,6 @@ static void __init spectre_v2_select_mitigation(void) spectre_v2_cmd =3D SPECTRE_V2_CMD_AUTO; } =20 - if (spectre_v2_cmd =3D=3D SPECTRE_V2_CMD_IBRS && boot_cpu_data.x86_vendor= !=3D X86_VENDOR_INTEL) { - pr_err("IBRS selected but not Intel CPU. Switching to AUTO select\n"); - spectre_v2_cmd =3D SPECTRE_V2_CMD_AUTO; - } - if (spectre_v2_cmd =3D=3D SPECTRE_V2_CMD_IBRS && !boot_cpu_has(X86_FEATUR= E_IBRS)) { pr_err("IBRS selected but CPU doesn't have IBRS. Switching to AUTO selec= t\n"); spectre_v2_cmd =3D SPECTRE_V2_CMD_AUTO; @@ -2247,7 +2242,7 @@ static void __init spectre_v2_apply_mitigation(void) pr_err(SPECTRE_V2_EIBRS_EBPF_MSG); =20 if (spectre_v2_in_ibrs_mode(spectre_v2_enabled)) { - if (boot_cpu_has(X86_FEATURE_AUTOIBRS)) { + if (boot_cpu_has(X86_FEATURE_AUTOIBRS) && spectre_v2_enabled !=3D SPECTR= E_V2_IBRS) { msr_set_bit(MSR_EFER, _EFER_AUTOIBRS); } else { x86_spec_ctrl_base |=3D SPEC_CTRL_IBRS; --=20 2.43.0 From nobody Fri Apr 17 00:17:50 2026 Received: from CH1PR05CU001.outbound.protection.outlook.com (mail-northcentralusazon11010037.outbound.protection.outlook.com [52.101.193.37]) (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 34D322BDC1B; Tue, 24 Feb 2026 18:02:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.193.37 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771956178; cv=fail; b=FkNrIdx/SwpcTn/0pIrxGlyQ2ZcibQyuEEWRO0stPfPEB1OZDq8r6B462KpEAjkTR/zyoODUuJPKr5ktA0QhTHlMmJBdMvS2ChtWMP1PTjKyyxiDAvGj6l/F7phdUEy4i0NWyr/f01yj8iX2wHWENdKImtPXpk1QhjrYVv50CNw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771956178; c=relaxed/simple; bh=zaXbjq4mtARusu1csw0kvpq5okBZhUbkcCNtZz6TDHk=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=FO3FtQjBaRyI55THqiH15xvFDkpIvsfwbBGzv8FoqFMk7plBF+OQ6L5U+ajijCaj9Z9SO/GhweUY9EcGNneFoL56jP49l+eW8dTbqhDU2a3tygjAn4OmPTWXskSs0XXjfMTS9ef7DBLAonOW9iTvI3GoIeXJ678N8zG+tuEiHNw= 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=tbnjjaRE; arc=fail smtp.client-ip=52.101.193.37 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="tbnjjaRE" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ogYsSH+3PkzHS8X8pxt0aSVqFCqW8gfY/OwMOKyJ014MZQfWoy7Q3lxMeMP1NAqZY3ztpeT8ghIo8nc9OmnpGjZ3rg2rpx4sOaIl4Xe8I/fcAGqA9BoqXA9/53Oe/VfuXNbKnE/OwkzkTo5WJnES9mYaz7Gaw4Ntrr+j/6m2g/Bg6pljsVPNp2lxESCapxfqlAGWB9B74I1nYg/vN+RhbFp7gMqvZfwdVp+IsZRkwD4B3x8om0nt7Kc5EKPXrGSjApLQpfaib0dGN/5vrJZ+PTW4/iQwefWhJD2oT997gNV/EUJqYthcGDqBy1UOyLAZKtiWu8lgvqOvALPXjXavqw== 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=GaO+M+H17Rg9ZGjPSsN3VVzsUoyC0KEne62dErKCQFI=; b=U+lfBqQYrg9iXTnBftps9qNkBuWgdf29fHPYN3X7BnTThM8+mIjdKPun2lC84kRyHzUF9ywCzjkwhVsFkJg3KbHySjKX/vHhN6qdZaZPacJlH7eOZaCPQlEGw7MTazq9GblqsZJIxBxq2Q2vhfRLyujla442rrYASDv4XwXfn05wAibszJOnTHu3xpIXKipfKvBLdMt2dBSC5iml9k4+lHKrjTkIXEQoA7UYlqeEj4P6J70x+VxQPD73HgR8acjdw1DlxXWX1aPobE155iaeo7YPhpDTu+v2VHrWirj7qHtENaIe9oceT/5pkF1ftWZJaOFMAVEeTP2sC15wa+D24Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org 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=GaO+M+H17Rg9ZGjPSsN3VVzsUoyC0KEne62dErKCQFI=; b=tbnjjaRExpphERNwbQowELLhurJCY0O905/bO0c7glMy5TJmL/KwNe2Ns5Pyn7BRLRbp/0vxw7SmTo9N7z8mdZQevEe6J5Y69y67AWHXbc1oosQi/ojiBUuNyBJ83C+0xM/zCmZbBAnhNORzvgLtcL/zJXLJAjkQI2YR3ZPEcYQ= Received: from BN0PR04CA0070.namprd04.prod.outlook.com (2603:10b6:408:ea::15) by IA0PR12MB8693.namprd12.prod.outlook.com (2603:10b6:208:48e::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9632.22; Tue, 24 Feb 2026 18:02:52 +0000 Received: from BL02EPF0002992E.namprd02.prod.outlook.com (2603:10b6:408:ea:cafe::12) by BN0PR04CA0070.outlook.office365.com (2603:10b6:408:ea::15) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9632.22 via Frontend Transport; Tue, 24 Feb 2026 18:02:39 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by BL02EPF0002992E.mail.protection.outlook.com (10.167.249.59) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9632.12 via Frontend Transport; Tue, 24 Feb 2026 18:02:50 +0000 Received: from dryer.amd.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Tue, 24 Feb 2026 12:02:49 -0600 From: Kim Phillips To: , , , CC: Sean Christopherson , Paolo Bonzini , K Prateek Nayak , "Nikunj A Dadhania" , Tom Lendacky , "Michael Roth" , Borislav Petkov , Borislav Petkov , Naveen Rao , David Kaplan , Pawan Gupta , "Kim Phillips" Subject: [PATCH 3/3] KVM: SEV: Add support for SNP BTB Isolation Date: Tue, 24 Feb 2026 12:01:57 -0600 Message-ID: <20260224180157.725159-4-kim.phillips@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260224180157.725159-1-kim.phillips@amd.com> References: <20260224180157.725159-1-kim.phillips@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: satlexmb08.amd.com (10.181.42.217) To satlexmb07.amd.com (10.181.42.216) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF0002992E:EE_|IA0PR12MB8693:EE_ X-MS-Office365-Filtering-Correlation-Id: ef3edea9-4d4c-47dc-9bd0-08de73ceecc8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|82310400026|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?KpBnSk4paXZJID6rphy4KUP0jVJTLwDp0x+mwz2dPlVeOErNUs74xkXr3VuW?= =?us-ascii?Q?4DWPHYonHrGT3DXslbAyU0KUvfizFLnkpsx3qwTtH1hXjkeULTpbWz6YPn4a?= =?us-ascii?Q?mN9rJJdRLI9O1/xMbsbMrw5Z30Pq3mDCxGVNwicfI9VWV6eLCJiYjLklFArD?= =?us-ascii?Q?KEVIhzfTqOL3VQUDF+MDFE1cPJtYp3qPBx0Y0v8SHOn9Flji9J3Nv4c/NklT?= =?us-ascii?Q?nQsFybfhpTLcrSIq+YXFLLlBlrdw3Wy9zTgWhYiqmef3oeVjGK8c6X0GXEnp?= =?us-ascii?Q?+NS77V3gGfCh6tiXocL+u08BLDBxu6hyVHWodADw5HBbLZ7Zq0b9GNOLdglM?= =?us-ascii?Q?ISDT60KHEMtXQNZ18vQiWlWNVUVc8bMgSF2Mk/Us3oJz+uX9Yyn2Zp6PmCQt?= =?us-ascii?Q?+4Qb0bMO8pvJsSHEYJ8As1NmePoBkGkxDG0V3c5haL3AV49ihogz0zNQmYa8?= =?us-ascii?Q?UqKIl4LT62iQF7P/IwAfDex4ltHGAqL7BHlJVvAPYE5d7NB1v0KSnDNWnT1H?= =?us-ascii?Q?cj7H9elToSsj+sjq6QYjhp5cTDumZLERdThWMF1ka1azP1a8j66JRzvEkk5C?= =?us-ascii?Q?iHyE9++xI2Qn/oiVHYD5zs3zxeKHcfBv/44tNbkAlBL4UA6syji0V/YqqeFh?= =?us-ascii?Q?JBf1z1eiNkyzFEkLJkcqZ7/1AoUp4DYrnUN0I9YEy9y94YlU49/Pq39MGzpk?= =?us-ascii?Q?ZgbexcStkO3mKKnr34fjHxgJ1zGTmRfeFM7b17dEZwgtKuvkxKyxq/tEtyAA?= =?us-ascii?Q?afIc7qyZRQWBY7NpOEDMh5Tuuv4TG4gbkaate9zkFZz4TMoveJfqaJAgdU8c?= =?us-ascii?Q?wCxQlDfh5Fq5W7Q3RS1nV8iRc5NtRctWmMn6E8hvUNgjmHKL261e00V58G+/?= =?us-ascii?Q?l3e3B8/Wjg4sno3YiSqez+Oed1hUfa6nEzSmU5bd9ndgADxZXF5RALHNF1nl?= =?us-ascii?Q?boDjM9W5mNh/767FsTtfZ52nJa8PEV31xEEtLJ93a45HIWYTV77RVHaDqp22?= =?us-ascii?Q?Vbvpy90+jlWbNGcVcnNrTAxJpLD4XcSbsBpU0e7A7W8RmX4BPrkXBNQObajP?= =?us-ascii?Q?XxT+++Ob7Dcrw4Cz0n1CTW2aBBR/oER2YwtkQIhAo/Udiu8OIWXI28IOu2Kl?= =?us-ascii?Q?wa1qjqOz7jLfXAih7b4qRRoF4cERJgH678uhnfUgiw8oFFc+475Pu3LuACjQ?= =?us-ascii?Q?6caoKUBN7vtRSiK+5m0aQeloIyDDi2iSHRWD7G5tscQ46pOoiR73qb3JawXI?= =?us-ascii?Q?AmqSru5X9IVCzLnkTLlY3H7Obw9WVSnI0pnDoxWwJLvsNejKutCy4Y8Rv9uu?= =?us-ascii?Q?8aqTXeI5kJwwrq/nQRK9wOpip0QJPQt3FwjpAf0d0YFI2yUojC3LeOi5ynZG?= =?us-ascii?Q?ejQ12G3SogR8HJvwztCYRqKY2xOtkyKidNX3JwqsM8qi0Fiqhjeu0yC31rYu?= =?us-ascii?Q?1fMv3+nPUR/f+MDLyNrIubYtnWDStAbiMNJFNMypIWmlDJ5866vu+uAmFMpF?= =?us-ascii?Q?CfnN/LTnj0P4KGyy26x0t/DHA18lMn7sg9wLhe6Gi9hDHAf73r8cyjt1ukgv?= =?us-ascii?Q?g36Vd380FnucJ+2fdxT4AnoE/tr+5hWozS27GSxYJbEFKufjB7sLbAvm7olm?= =?us-ascii?Q?hFAD0fYaw4RmcafEuDw/qc+bDORQVg1Sk+WX7THLol22iL5JAmldiZJo0OMx?= =?us-ascii?Q?A0+fCw=3D=3D?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(82310400026)(36860700013)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gtvcl/qdeZDB2qeFMD4CXWerLlvCIrXBGatoIWWwYdLUxlYfJmJqk7S2EpHdgqmHBqehRoErELW6NnEswJEn39v+UrqTSxUnyUU/fJibrfrRXX4QG8QhS/Bxj5YY2tAoxd8ohZj00NZZk2mjTe3m6yzvZVe09QqGiY/j1jhqolNJCHS3ydJhlNKRRfD6WtmLj04IndA8x/OFk+g9wd0sStUTaIW2lc5IVmvUz/votLrbEZxJ0L8yHg4TGqGrAZwqOuyOuTSjQSNoSdRmCJeBad5NglJnYNt2fH+jNLUMs/+zr5vzSglj0hYLueR3vrjle8S1WPe5/a1Fw/v/SRwKfBcn49OqNmrw5vxq4+iKhz1aVSy9cvDw8PR0lyvEJZIWC1ryH5U4a4+pW5XViBDkZJIeyVWuBqvztYIY+iSVsLxUHsLBSP33Qh/uKIiNOWRx X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2026 18:02:50.5786 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ef3edea9-4d4c-47dc-9bd0-08de73ceecc8 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=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF0002992E.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB8693 Content-Type: text/plain; charset="utf-8" This feature ensures SNP guest Branch Target Buffers (BTBs) are not affected by context outside that guest. CPU hardware tracks each guest's BTB entries and can flush the BTB if it has been determined to be contaminated with any prediction information originating outside the particular guest's context. To mitigate possible performance penalties incurred by these flushes, it is recommended that the hypervisor runs with SPEC_CTRL[IBRS] set. Note that using Automatic IBRS is not an equivalent option here, since it behaves differently when SEV-SNP is active. See commit acaa4b5c4c85 ("x86/speculation: Do not enable Automatic IBRS if SEV-SNP is enabled") for more details. Indicate support for BTB Isolation in sev_supported_vmsa_features, bit 7. SNP-active guests can enable (BTB) Isolation through SEV_Status bit 9 (SNPBTBIsolation). For more info, refer to page 615, Section 15.36.17 "Side-Channel Protection", AMD64 Architecture Programmer's Manual Volume 2: System Programming Part 2, Pub. 24593 Rev. 3.42 - March 2024 (see Link). Link: https://bugzilla.kernel.org/attachment.cgi?id=3D306250 Signed-off-by: Kim Phillips --- arch/x86/include/asm/svm.h | 1 + arch/x86/kvm/svm/sev.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/arch/x86/include/asm/svm.h b/arch/x86/include/asm/svm.h index edde36097ddc..2038461c1316 100644 --- a/arch/x86/include/asm/svm.h +++ b/arch/x86/include/asm/svm.h @@ -305,6 +305,7 @@ static_assert((X2AVIC_4K_MAX_PHYSICAL_ID & AVIC_PHYSICA= L_MAX_INDEX_MASK) =3D=3D X2AV #define SVM_SEV_FEAT_RESTRICTED_INJECTION BIT(3) #define SVM_SEV_FEAT_ALTERNATE_INJECTION BIT(4) #define SVM_SEV_FEAT_DEBUG_SWAP BIT(5) +#define SVM_SEV_FEAT_BTB_ISOLATION BIT(7) #define SVM_SEV_FEAT_SECURE_TSC BIT(9) =20 #define VMCB_ALLOWED_SEV_FEATURES_VALID BIT_ULL(63) diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index ea515cf41168..3c0278871114 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -3167,6 +3167,9 @@ void __init sev_hardware_setup(void) =20 if (sev_snp_enabled && tsc_khz && cpu_feature_enabled(X86_FEATURE_SNP_SEC= URE_TSC)) sev_supported_vmsa_features |=3D SVM_SEV_FEAT_SECURE_TSC; + + if (sev_snp_enabled) + sev_supported_vmsa_features |=3D SVM_SEV_FEAT_BTB_ISOLATION; } =20 void sev_hardware_unsetup(void) --=20 2.43.0