From nobody Mon Jun 8 05:24:50 2026 Received: from BL2PR02CU003.outbound.protection.outlook.com (mail-eastusazon11011028.outbound.protection.outlook.com [52.101.52.28]) (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 CF60625B0B1; Tue, 2 Jun 2026 20:00:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.52.28 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780430454; cv=fail; b=agDGa7g3pGaD3zv9MhkgXcWM0m3hKAtrf3ZgiLEMq7e6dsbOSa/PoWOV3ol4ZLCtgeRQ+vLG9EB1naffUbrTpu5e/3qgjI829ImGxupxmRHEIKyC8eJx+NR01tetmlrCq9b+mxk3cBTbZdvg1IPXNIwvY+M+kQy0mzQtIweod7E= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780430454; c=relaxed/simple; bh=qNne5VMGQOD/O3+Cd6I+LIBLef+3u6k7e8k60/RiBvs=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=YGNTGfXTKTpzHRGjti/3UWfy8OkhTSvI2R8zvs5gUN/tyKUCRMM4g02Zuz6AK6iuDUtN7do9bq8PjAWs0DwpBnCq/8IWHomjONypfpdV5NUr874gv00uNY1biw7vdTeOF6h/T5aCc6VLg5tUtpYPyIZyEMKKQpowMgE8xdIyeR0= 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=izqsbHZx; arc=fail smtp.client-ip=52.101.52.28 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="izqsbHZx" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=M3ypDD+CplXoBFSO+b3eRRkNwLC9/mcFrHaqUzsN69l2oeQxOZ95TL0xr9qh+t5fkNZPGIS0oLhvRSzYj6P6uPV95sg7SJBMk94g47VRjx5txrBls0zBHDGsNSgjwMuSsRlefUEqvTPltjiOGBC13HbISUR+cJd0qI1cRdlSahnGFwQbHCiR800huF8JCgPTciKRVDA8n78SMFXZraBqeBitrxmu9kFWUIo26Ivw2l0eWkPE/sFClBRxTzS+MFs/831vZe88sUc9pmVTdEUSnoWockHREP8gNFNjFIHCBM3Baj9vx7+Hsd6tCP5somwKnVKXlCs59MOz2ClBQHgnHA== 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=PCDOnhB1r84DFebnA0uIqT7RVcTpPgdZ+0ZSZTF7ZMY=; b=odESz0XzxKH1Ve+2blyl5pD/K5nZwns7SY4zsCDLwuuUGd8f/pbr2GY9jVnqkASuZ3t6TqeiZeChHfVNWsR/2e413K4apoetMe0Q1+LYQkrO52MbuzMFUWhy4szioCM7AOBT6ADtarh7KrjNHRDtdyEs/44deD0fxMW7KHEH82SCnPsTJNwHjWRVy3tPJ8b8xvNiUbm8omVCnUAh+gLfzuC9GosEnc6R74XAU0dTLfsPK4EtA4FwlVFhRWd8+Gzn86FpF/fUqh4AP+nsME8fJOQF+yFHz0Wp8gyXGurXO1XCIKeQFK+z4WU8MgTuLsb4TPYHEuxZ7/NLEUcUBISzTw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=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=PCDOnhB1r84DFebnA0uIqT7RVcTpPgdZ+0ZSZTF7ZMY=; b=izqsbHZxve9BDkD0VT6P/7KMrDECMbUa3NaqTGYCa06RURpv9lwrcLo3yZ1tK5MW33H6yRVnFa4fRSwp37UOd9j6EZH3K5Nl7UpJIw25TUuB46nxcfzZ+prKV5nMalOzOeoE0R6MP7p1ECATkWkVfZabzDDHITkwOXxBIVoIG8U= Received: from BN9PR03CA0635.namprd03.prod.outlook.com (2603:10b6:408:13b::10) by LV9PR12MB9832.namprd12.prod.outlook.com (2603:10b6:408:2f3::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.92.7; Tue, 2 Jun 2026 20:00:50 +0000 Received: from BN1PEPF00006002.namprd05.prod.outlook.com (2603:10b6:408:13b:cafe::c) by BN9PR03CA0635.outlook.office365.com (2603:10b6:408:13b::10) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.92.7 via Frontend Transport; Tue, 2 Jun 2026 20:00: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=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by BN1PEPF00006002.mail.protection.outlook.com (10.167.243.234) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.92.5 via Frontend Transport; Tue, 2 Jun 2026 20:00:49 +0000 Received: from nigeria-2635-os.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.41; Tue, 2 Jun 2026 15:00:48 -0500 From: Ashish Kalra To: , , , , , , , , , , , CC: , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v6 1/6] x86/cpufeatures: Add X86_FEATURE_AMD_RMPOPT feature flag Date: Tue, 2 Jun 2026 20:00:38 +0000 Message-ID: <5f587ed487c037ce6a1174fa8cdf25112d2c8eac.1780427587.git.ashish.kalra@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: 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: BN1PEPF00006002:EE_|LV9PR12MB9832:EE_ X-MS-Office365-Filtering-Correlation-Id: e1cf1bbb-bf7b-4695-03cf-08dec0e1a4e2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|1800799024|7416014|36860700016|921020|3023799007|18002099003|22082099003|56012099006|11063799006; X-Microsoft-Antispam-Message-Info: fUKWtnabKenVcL46OOPy1jnNfbrQPdr5ykNqhoJxgOfas4B7aiF3rYQLO4CKKxbF3uHxdvKMCgNf9zZlnSapasGrnVKiDcxyUQgw1a+kHC1gm4b+nQz41Ouc/E6mcXZCNx0kpEyLSXr/723C/JUtkiHMkiyOqV6Wa1wDZBb10jIVlEyaT6sYelu1OYXoPznDgf92mFn+PHh6/M88hkHmbuJwTjtYGfSdDOMi6XPO2t1lW5FJ9B4LZVuVNq4JajhuKVyCAnSYSxfMcwLrsWCL5LH5n1gKj4L96P1vOSzJK4LNkMKBfLaRZpposzV1PONR6crAoYaLMZYotI/fnucc9TH8l6EC86EyDtEAAK4YhjPaNzYr8uTBj/ItY3d20fMN9KduBBaBsmVpsLdqAPuUqE16gQdwspJ0iiX5qGuKzMpwQ6SBZCd6GFXrgoIcpEzkZffETebKOMTab8xj5tBN/to2UrRP48yK5Rsyc0dPF6i6FvuuCrLtwC8q46oYrZCLJdfD3fT7N/AT1vcFFF7psUX0Q9wHbljVY0bRED45TX0vQhuV7u49/jyLJSJhMkxooFLs9rsXftySO2hKPpfSWMp0oRpCgLMLSZh+vqwvtk3LYyefznJ688qCNYlMeDfEz41FAt9qXCg9Bu3Y16KDZIZpB8NK13lYnMeVJY6aak1MUA0tCh6FqN5DNI2BJdV5hfTx4oBENAxai3XHPcaDT9PLmiLq/EcZekotI5qmhfBA96gAuoMDm7iZDV78Ka8FlxJO90TtjcSD63LVHripKg== 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)(7416014)(36860700016)(921020)(3023799007)(18002099003)(22082099003)(56012099006)(11063799006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qBJnVQcIkpkxfjL64dwIm85ftGA2dUyM47hUHWrLJUZDMbgDwt0WePeNo8GlXtDVpSXItE6Y7t0byGKBACQ9wgygnsnEJ3SrZpKIg8ZgJH03RgrCljwdBkXcyQ1fVaVKr3YXVo0/SKIV6VDgtu7u5tyOAzohioyscplNaSAV3BCU+VEVcYIouJ/qwIPZjnofdLB9CBOVaejdygqC9Tk7GsxwTqflY6uFHhjNvhodFl6DtzMYMGgYABSCkvnjmgORS3Zy+jyi6XGEZjsjlXnENTCsP6nE2/Zp/dI9aZXtyG4ayItfyfZClUd01sQHJr1ZvabrEoq/aALMMlmWYwToSWsHlnSh4ISA9gPvxtaeN/zle8PtK6OfprQ7UDAQkIQFQp5AiP2f4oRE8WFza3vXNBZzQ3Pl9WPy8n+WuMbEX1L4Cu25BYeGFb7Um06SviUb X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2026 20:00:49.9343 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e1cf1bbb-bf7b-4695-03cf-08dec0e1a4e2 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: BN1PEPF00006002.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV9PR12MB9832 Content-Type: text/plain; charset="utf-8" From: Ashish Kalra Add a flag indicating whether RMPOPT instruction is supported. RMPOPT is a new instruction that reduces the performance overhead of RMP checks for the hypervisor and non-SNP guests by allowing those checks to be skipped when 1-GB memory regions are known to contain no SEV-SNP guest memory. For more information on the RMPOPT instruction, see the AMD64 RMPOPT technical documentation. Suggested-by: Borislav Petkov (AMD) Reviewed-by: Dave Hansen Reviewed-by: Ackerley Tng Signed-off-by: Ashish Kalra --- arch/x86/include/asm/cpufeatures.h | 2 +- arch/x86/kernel/cpu/scattered.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpuf= eatures.h index 1d506e5d6f46..794cc96b8493 100644 --- a/arch/x86/include/asm/cpufeatures.h +++ b/arch/x86/include/asm/cpufeatures.h @@ -76,7 +76,7 @@ #define X86_FEATURE_K8 ( 3*32+ 4) /* Opteron, Athlon64 */ #define X86_FEATURE_ZEN5 ( 3*32+ 5) /* CPU based on Zen5 microarchitectur= e */ #define X86_FEATURE_ZEN6 ( 3*32+ 6) /* CPU based on Zen6 microarchitectur= e */ -/* Free ( 3*32+ 7) */ +#define X86_FEATURE_RMPOPT ( 3*32+ 7) /* Support for AMD RMPOPT instructi= on */ #define X86_FEATURE_CONSTANT_TSC ( 3*32+ 8) /* "constant_tsc" TSC ticks at= a constant rate */ #define X86_FEATURE_UP ( 3*32+ 9) /* "up" SMP kernel running on UP */ #define X86_FEATURE_ART ( 3*32+10) /* "art" Always running timer (ART) */ diff --git a/arch/x86/kernel/cpu/scattered.c b/arch/x86/kernel/cpu/scattere= d.c index 937129ce6a96..021c0bf22de2 100644 --- a/arch/x86/kernel/cpu/scattered.c +++ b/arch/x86/kernel/cpu/scattered.c @@ -67,6 +67,7 @@ static const struct cpuid_bit cpuid_bits[] =3D { { X86_FEATURE_PERFMON_V2, CPUID_EAX, 0, 0x80000022, 0 }, { X86_FEATURE_AMD_LBR_V2, CPUID_EAX, 1, 0x80000022, 0 }, { X86_FEATURE_AMD_LBR_PMC_FREEZE, CPUID_EAX, 2, 0x80000022, 0 }, + { X86_FEATURE_RMPOPT, CPUID_EDX, 0, 0x80000025, 0 }, { X86_FEATURE_AMD_HTR_CORES, CPUID_EAX, 30, 0x80000026, 0 }, { 0, 0, 0, 0, 0 } }; --=20 2.43.0 From nobody Mon Jun 8 05:24:50 2026 Received: from SJ2PR03CU001.outbound.protection.outlook.com (mail-westusazon11012038.outbound.protection.outlook.com [52.101.43.38]) (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 3D4BB19E839; Tue, 2 Jun 2026 20:01:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.43.38 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780430490; cv=fail; b=qvpX1kgIHsozclnfXmUZ2fvq39uQs7LOq/Eg2LyP7eYNJVKSiy2syYWenUy8tiq6AOG4I9AX3FkHkuF3YT5qQa8P2F8DUpyjhMCrd24neawqjqZ8p+kKywe89+Ss4257DTuvZLpownzy6p8A68+rOWN2toPQ19QuYUPDiNYiDwM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780430490; c=relaxed/simple; bh=SSOOG1LVHQGHMUKKbg9XodfzeBIF57QChs1b/WWG14k=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=H4pHoGV486AlFQLWKlzXmBNzTBKsnSUWms5tnsgOmkXxZ9QKtIq4vv3kXpALqevMmHsE8Kt1mxLX4s1th0BchhQAIFCLc/Jcs3FVQh4Hw7UDh5TKAHCYeRgS/bpOSaZMyVrcH7bpmREAXlLygZtmdsCDcFKwC4eVewq8glKyuLI= 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=YxjLe9/v; arc=fail smtp.client-ip=52.101.43.38 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="YxjLe9/v" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=pakVE84Ek4+v9D8yD80zz68Cz4JwrNPbfF4HjcJ0347p0wCC3KUzQcc62V4XLL/IPsm0tZKBN9qI2f1iUEQISlorgNmJJjcQtiMIMECM/C9INEX5h11eb2XmfLbPZCM6FHJKunU7UWEWgch4y3os5weiDGWmla7pYPwffuI6JTMQXFFRMDqX8qbk0jGE60xbeEJPSkAsFQVcw2JNssTnnMAob83HIt2gpFs7GKNjT1Vb390lWFUSwrdI7s+zD24U3kKQou5Eu8xSVmmyJedklTDke1uBuRpOnepFPPWXKSrLHjPcI29JCR6oZa1jJ+FiO/FubZcoikBcImHNuhbF5g== 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=7rXhOIvLRwypTDA/L/Bw3+MgcaxELs/Iu5LxXfvmdeY=; b=eOYmqiSDO67So3z9BLeLKGkRH2fRczOAgmQ5W2knlW58LuDvGMmNMHZEypP9n+Oc5Yj7KdKklz9ucGsGnWW06yGlzPxFDD7iIgjJ0qktWwMrqLOjMAUZr73CE/6UrKR3aKDKpxdklSTLBNhe6YLCi0GzkktgqJaqWo8Gjz2z3FoZ8XLeXqkvkVexvktcH1DuEH4ygVbfUWQcebq8yCX4SymeDP6lORl4xIh6yEkeDzowOwnoGC4Sz7trDVPV2bQZW6F0nPoNAXfVzqesE+aPBA4XSF2wLTgW9nEa0Z56Y0y3KZ4NgV3BoxRmuejUxt+znxBzjrgFmB7oKViSRa7e1g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=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=7rXhOIvLRwypTDA/L/Bw3+MgcaxELs/Iu5LxXfvmdeY=; b=YxjLe9/vbTBOnhSJJAgbo2GBpMuVhsI/y9XHN6yp2rQJlu3aO0p77d5ruFgn+5hexuZGTsrWz+iQVLFi0CZFpvPM1st6M92ENSJrpXse+pouDC7ByCxa7kirKaHtTGtGFbv2YiCRT26ELyVhQNBOTJf2jND004dNnMgUB0YZeO0= Received: from BN9PR03CA0646.namprd03.prod.outlook.com (2603:10b6:408:13b::21) by SA5PPF0EB7D076B.namprd12.prod.outlook.com (2603:10b6:80f:fc04::8c5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.92.7; Tue, 2 Jun 2026 20:01:21 +0000 Received: from BN1PEPF00006002.namprd05.prod.outlook.com (2603:10b6:408:13b:cafe::7c) by BN9PR03CA0646.outlook.office365.com (2603:10b6:408:13b::21) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.71.16 via Frontend Transport; Tue, 2 Jun 2026 20:01:19 +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 BN1PEPF00006002.mail.protection.outlook.com (10.167.243.234) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.92.5 via Frontend Transport; Tue, 2 Jun 2026 20:01:19 +0000 Received: from nigeria-2635-os.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.41; Tue, 2 Jun 2026 15:01:12 -0500 From: Ashish Kalra To: , , , , , , , , , , , CC: , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v6 2/6] x86/sev: Initialize RMPOPT configuration MSRs Date: Tue, 2 Jun 2026 20:01:03 +0000 Message-ID: <87d473d05c26458773b7957fb96e9b2948641753.1780427587.git.ashish.kalra@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: 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: BN1PEPF00006002:EE_|SA5PPF0EB7D076B:EE_ X-MS-Office365-Filtering-Correlation-Id: 5bf7d7fe-c448-4d90-fbd6-08dec0e1b6b6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700016|82310400026|376014|7416014|1800799024|921020|6133799003|56012099006|11063799006|3023799007|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: M+qlEg3qK8rkU6u0Zudbm94VMIihPxvDdNO1oGkI8+w9GUZo+t21LipoQkPUdrM6WaqNVsRouybEmfXcLBDuHfidqramv1u8BNtEyxmRqzFYIVgfKoAoEPfoFgqHzVwzj2YE3Q6N5xWlytTUrV+8rxkGFL09U+Htjma6ODNVlruRlJC79PQtiG4PgK3IIHOfeYfeiMTLERuXwZNPxNGzVC9JBuXwtvm81JrQ1DP5w+GFKu85ry+jHD6DvY8Skp3f3wE866xP1WnWwPoS1IyAVIlhPY6YqDKIYx1nvQZoNpodhV203HD3qN+2fO0rUPazZjXGnY7oi7g9dn7SJJtRrwwLn9Ug/WX7axlmfyFSHx1d0YZa5IuFkg0w1czUNOD7Kj8Hba65/ePGvkrZWeyL7REiY7CBfLyJfmfo7BjEqikmTeBl0nkkHiQOddJRYLHXT7NjYEuno4ACTXQhBUbl5x7v9rArrIfvy/R1k8zRfkENEoux6omhHZxTaetNbXcA3eItk8TErGzF7ZVgmwuVfLzOugWKVirdzdv+mTghcbn4uAmL19Pzs716ebS37/Kz/Rel7hn2DdsAbC3HSnokZ0dVfE9pMrmtj4nrRVZsEzeyQy7ZYiemOfj0UbASHZL2h4T0IyElRC3os9Zt+R8tHiiNQOU1EoMUd9INrD+rtVFP2TZVZPBxFl8uVpWGjnuEsnXT7+pC8I3WE3gragQMRj+X0P0urOooLKpKSB3Oz6OFYvroTdY0yJ1dH+tSCIMBVdzhgiR147cCzdoXwGDJZg== 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)(36860700016)(82310400026)(376014)(7416014)(1800799024)(921020)(6133799003)(56012099006)(11063799006)(3023799007)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: aYhsUCXu0RCH2+pTA325kgJO/pynYwgMyfxB/wAjZkfCFoEAaoqjDA4YfN/ik49YXPNZfCAOYgToWOS30QnNBbSTg+MCvI8js+vd5CR8uK+Xq1k3n0GPLlWm6GUwxB5duaOPNiEr6RENC3jgpAverDzSu2SEjiMlTJa9aIgXnW/E/eXlWQTg4FaDzM6S4Y6uz6IskPOLZ+9n/CVj+UzUZYoqMEeahTHvIDS3coW0UUa1zsZ7KXEJVUJowZ0Aq5fLq9FGaV61Wqt5pZvP8p2aNrYoCwzav1BPPetsQaxwvBDnolUxBEtJyQjBTK1g8MCQx+UZ6rj1k0gzwq1vQC3o4B7mNN1+ycVSDB4HGYLm3XhfPczmMMAjvjGLALDNCFSlXFSB/4KWi1KGuKur4dbAwG7beAz6SM5+XB+CWC9pU1OHvNU9F2yXRR1rJUxc7FLA X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2026 20:01:19.8496 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5bf7d7fe-c448-4d90-fbd6-08dec0e1b6b6 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: BN1PEPF00006002.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA5PPF0EB7D076B Content-Type: text/plain; charset="utf-8" From: Ashish Kalra The new RMPOPT instruction helps manage per-CPU RMP optimization structures inside the CPU. It takes a 1GB-aligned physical address and either returns the status of the optimizations or tries to enable the optimizations. Per-CPU RMPOPT tables support at most 2 TB of addressable memory for RMP optimizations. Initialize the per-CPU RMPOPT table base to the starting physical address. This enables RMP optimization for up to 2 TB of system RAM on all CPUs. Additionally, add support to setup and enable RMPOPT once SNP is enabled and initialized. Suggested-by: Thomas Lendacky Suggested-by: Dave Hansen Reviewed-by: Dave Hansen Signed-off-by: Ashish Kalra --- arch/x86/coco/core.c | 1 + arch/x86/include/asm/msr-index.h | 3 ++ arch/x86/include/asm/sev.h | 2 + arch/x86/virt/svm/sev.c | 65 +++++++++++++++++++++++++++++++- drivers/crypto/ccp/sev-dev.c | 3 ++ 5 files changed, 73 insertions(+), 1 deletion(-) diff --git a/arch/x86/coco/core.c b/arch/x86/coco/core.c index 989ca9f72ba3..7fdef00ca8f2 100644 --- a/arch/x86/coco/core.c +++ b/arch/x86/coco/core.c @@ -172,6 +172,7 @@ static void amd_cc_platform_clear(enum cc_attr attr) switch (attr) { case CC_ATTR_HOST_SEV_SNP: cc_flags.host_sev_snp =3D 0; + setup_clear_cpu_cap(X86_FEATURE_RMPOPT); break; default: break; diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-in= dex.h index 86554de9a3f5..28540744f1eb 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -761,6 +761,9 @@ #define MSR_AMD64_SEG_RMP_ENABLED_BIT 0 #define MSR_AMD64_SEG_RMP_ENABLED BIT_ULL(MSR_AMD64_SEG_RMP_ENABLED_BIT) #define MSR_AMD64_RMP_SEGMENT_SHIFT(x) (((x) & GENMASK_ULL(13, 8)) >> 8) +#define MSR_AMD64_RMPOPT_BASE 0xc0010139 +#define MSR_AMD64_RMPOPT_ENABLE_BIT 0 +#define MSR_AMD64_RMPOPT_ENABLE BIT_ULL(MSR_AMD64_RMPOPT_ENABLE_BIT) =20 #define MSR_SVSM_CAA 0xc001f000 =20 diff --git a/arch/x86/include/asm/sev.h b/arch/x86/include/asm/sev.h index 594cfa19cbd4..6fd72a44a51e 100644 --- a/arch/x86/include/asm/sev.h +++ b/arch/x86/include/asm/sev.h @@ -662,6 +662,7 @@ static inline void snp_leak_pages(u64 pfn, unsigned int= pages) __snp_leak_pages(pfn, pages, true); } int snp_prepare(void); +void snp_setup_rmpopt(void); void snp_shutdown(void); #else static inline bool snp_probe_rmptable_info(void) { return false; } @@ -680,6 +681,7 @@ static inline void snp_leak_pages(u64 pfn, unsigned int= npages) {} static inline void kdump_sev_callback(void) { } static inline void snp_fixup_e820_tables(void) {} static inline int snp_prepare(void) { return -ENODEV; } +static inline void snp_setup_rmpopt(void) {} static inline void snp_shutdown(void) {} #endif =20 diff --git a/arch/x86/virt/svm/sev.c b/arch/x86/virt/svm/sev.c index 8bcdce98f6dc..089c9a14edc7 100644 --- a/arch/x86/virt/svm/sev.c +++ b/arch/x86/virt/svm/sev.c @@ -124,6 +124,9 @@ static void *rmp_bookkeeping __ro_after_init; =20 static u64 probed_rmp_base, probed_rmp_size; =20 +static cpumask_t rmpopt_cpumask; +static phys_addr_t rmpopt_pa_start; + static LIST_HEAD(snp_leaked_pages_list); static DEFINE_SPINLOCK(snp_leaked_pages_list_lock); =20 @@ -488,9 +491,13 @@ static bool __init setup_segmented_rmptable(void) static bool __init setup_rmptable(void) { if (rmp_cfg & MSR_AMD64_SEG_RMP_ENABLED) { - if (!setup_segmented_rmptable()) + if (!setup_segmented_rmptable()) { + setup_clear_cpu_cap(X86_FEATURE_RMPOPT); return false; + } } else { + /* Note that Segmented RMP must be enabled to enable RMPOPT. */ + setup_clear_cpu_cap(X86_FEATURE_RMPOPT); if (!setup_contiguous_rmptable()) return false; } @@ -555,6 +562,21 @@ int snp_prepare(void) } EXPORT_SYMBOL_FOR_MODULES(snp_prepare, "ccp"); =20 +static void rmpopt_cleanup(void) +{ + int cpu; + + cpus_read_lock(); + + for_each_cpu(cpu, &rmpopt_cpumask) + wrmsrq_on_cpu(cpu, MSR_AMD64_RMPOPT_BASE, 0); + + cpus_read_unlock(); + + cpumask_clear(&rmpopt_cpumask); + rmpopt_pa_start =3D 0; +} + void snp_shutdown(void) { u64 syscfg; @@ -563,11 +585,52 @@ void snp_shutdown(void) if (syscfg & MSR_AMD64_SYSCFG_SNP_EN) return; =20 + rmpopt_cleanup(); + clear_rmp(); on_each_cpu(mfd_reconfigure, NULL, 1); } EXPORT_SYMBOL_FOR_MODULES(snp_shutdown, "ccp"); =20 +void snp_setup_rmpopt(void) +{ + u64 rmpopt_base; + int cpu; + + if (!cpu_feature_enabled(X86_FEATURE_RMPOPT)) + return; + + cpus_read_lock(); + + /* + * The RMPOPT_BASE MSR is per-core, so only one thread per core needs + * to set up the RMPOPT_BASE MSR. + * + * Note: only online primary threads are included. If a core's + * primary thread is offline, that core is not covered. CPU hotplug + * is not currently supported with SNP enabled. + */ + + for_each_online_cpu(cpu) + if (topology_is_primary_thread(cpu)) + cpumask_set_cpu(cpu, &rmpopt_cpumask); + + rmpopt_pa_start =3D ALIGN_DOWN(PFN_PHYS(min_low_pfn), SZ_1G); + rmpopt_base =3D rmpopt_pa_start | MSR_AMD64_RMPOPT_ENABLE; + + /* + * Per-CPU RMPOPT tables support at most 2 TB of addressable memory + * for RMP optimizations. Initialize the per-CPU RMPOPT table base + * to the starting physical address to enable RMP optimizations for + * up to 2 TB of system RAM on all CPUs. + */ + for_each_cpu(cpu, &rmpopt_cpumask) + wrmsrq_on_cpu(cpu, MSR_AMD64_RMPOPT_BASE, rmpopt_base); + + cpus_read_unlock(); +} +EXPORT_SYMBOL_FOR_MODULES(snp_setup_rmpopt, "ccp"); + /* * Do the necessary preparations which are verified by the firmware as * described in the SNP_INIT_EX firmware command description in the SNP diff --git a/drivers/crypto/ccp/sev-dev.c b/drivers/crypto/ccp/sev-dev.c index 78f98aee7a66..217b6b19802e 100644 --- a/drivers/crypto/ccp/sev-dev.c +++ b/drivers/crypto/ccp/sev-dev.c @@ -1478,6 +1478,9 @@ static int __sev_snp_init_locked(int *error, unsigned= int max_snp_asid) } =20 snp_hv_fixed_pages_state_update(sev, HV_FIXED); + + snp_setup_rmpopt(); + sev->snp_initialized =3D true; dev_dbg(sev->dev, "SEV-SNP firmware initialized, SEV-TIO is %s\n", data.tio_en ? "enabled" : "disabled"); --=20 2.43.0 From nobody Mon Jun 8 05:24:50 2026 Received: from CH4PR04CU002.outbound.protection.outlook.com (mail-northcentralusazon11013037.outbound.protection.outlook.com [40.107.201.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 0435D25B088; Tue, 2 Jun 2026 20:01:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.201.37 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780430506; cv=fail; b=B0y1h0p3fwxzrrTqyzxo9b6H2+DdRfIX0qNsQXDVBattHGsGfaUXLN3/qFwNG6EGwGk+fmGNDM3WF1RPYjddSF/tGdUIf+V3nRLonpGGBroMIvrHVdWjst9NYOHqxG/HWFG6E8kk7Sd8COv3ELRzm5BUzaisiu0GqdCYVGvVm9M= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780430506; c=relaxed/simple; bh=76wyUAO5Yt9o3ibdWis6iI6xeckgWorxMh/mVHpj5l4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=E3ryVrH3McphZTBVtWeCoLsXSxARkHYhTUGbXfnxr5KMzEN68a6IleDknjFMl1ULobymTyBqwC3PWbTJEaCTrtd3aYCnYO8bKy6TwOq35vvloWfKpQ0nLpT3TLSXydcm8epZ8ITDQZmefMEYe2v70zz8/vfrqaghDVpl2oc6/OE= 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=L+JCHHGw; arc=fail smtp.client-ip=40.107.201.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="L+JCHHGw" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=hSDo/oNyBycAOyxzoW8wIbM+BciWelU9f8VlyYQf46gkIXNH3uZTaqmwQPTfChb9o7RDWLmodArd0QecW0OIamfn07+BUlESbq4+eWB4KMOW5HDdZHQhm7LYzm51tH93+q5ySHCebx/NXyJmOFh1zVzyvk5f9tC4dIkRgiWwS9IlYn21V/xs8Dm+0MbPbSRA61fKbysut9gjpmCDQrRin94ZiY64SU/2oe27XlZEUKpzZ3kA9Brzwvc1v6nLQipjBH0pLZ/nYPw+Uh+H97lH4cTnb5lysJBqi97ZZ1JGv8JH0t9avI1Jp96Rk3+C7wtOro7CtHRSC63i7Sk4hIJCyA== 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=GVE3nW1+AyLS5etEKcagC+UdBq7Qa0Y/SFYlPQ3MBF4=; b=J+ze8cE8HfNQfpxA+oFubAPIV8VSNouEKpuUcxrsQf1qxZJ/VrsdUNXtW8M7UEsIXU/Ail6DGJ+6cCmFRSjwbD8JzXRNWbwz7F2mOr8ksE3bNBPkJ7YGeON7I0ug/66QKoeKJ6t+BXoTPKF50VZt711uYJzEEIYZKD4QeXpDZhiXUrd5Z6mt5kJaZeRyCeoHNjnPCRyHG1UN9uhFmZmVvcSPeQmvN+7dqr3bsPn7yF96JcTny0gcwvKuoAXVgU/VCC4LJYVAo9LI387CcO+GghYbh42Lz1INCGbKMrgiBsO7wPXHLrj0H7K3rQ/0TEV1/U8NVVrYiiC31bZ8j3BUDA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=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=GVE3nW1+AyLS5etEKcagC+UdBq7Qa0Y/SFYlPQ3MBF4=; b=L+JCHHGwz7qY0p/ne2vmustKmwb7klyi6Wb+5gM/dAxlT+nSgozyUJcJE8Wj+v2dFyauU+vR2Q8bzm1atp5YX0NA+V3JN4Se75YmrZ1GbthidtmD1vZfv8UyW1aPhaL7ORa3Ca1kI6+S7o8oGLXufK320m9+BbqKZch4AtbuawE= Received: from BN9PR03CA0202.namprd03.prod.outlook.com (2603:10b6:408:f9::27) by MN0PR12MB5980.namprd12.prod.outlook.com (2603:10b6:208:37f::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.92.7; Tue, 2 Jun 2026 20:01:38 +0000 Received: from BN1PEPF00006000.namprd05.prod.outlook.com (2603:10b6:408:f9:cafe::27) by BN9PR03CA0202.outlook.office365.com (2603:10b6:408:f9::27) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.92.7 via Frontend Transport; Tue, 2 Jun 2026 20:01:38 +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 BN1PEPF00006000.mail.protection.outlook.com (10.167.243.232) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.92.5 via Frontend Transport; Tue, 2 Jun 2026 20:01:38 +0000 Received: from nigeria-2635-os.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.41; Tue, 2 Jun 2026 15:01:37 -0500 From: Ashish Kalra To: , , , , , , , , , , , CC: , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v6 3/6] x86/sev: Add support to perform RMP optimizations asynchronously Date: Tue, 2 Jun 2026 20:01:28 +0000 Message-ID: <29adedba9e093ec0c9aaafa006f4e822ac872d8a.1780427587.git.ashish.kalra@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: 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: BN1PEPF00006000:EE_|MN0PR12MB5980:EE_ X-MS-Office365-Filtering-Correlation-Id: 1de2cf56-0655-44f0-f577-08dec0e1c1e4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|36860700016|82310400026|1800799024|921020|3023799007|22082099003|18002099003|6133799003|56012099006|11063799006; X-Microsoft-Antispam-Message-Info: cYgNgOTnZFyY8XXpPls20QydYcUDq3oytNGtPWVEAVBsbAcRb0mk+7dnXWk3d2P74I3a+KXl6SqCu40RrDjEM7REWYhbkirXufeDBSSrr0B39mA9sOnFOKMZemWLJ9wmRO6CIrKGMmcLU8LAKKxGYKOGO06zLbSoh+FjocK7guBUJ5aUGBTdjXgGn59kVfZmjb50uO70W8N2JT5EXsdn1mzbnJOdhnbkB5iLVPCvVGnx4TqCAUx/WgxSn7LIIagmxZPvQaiW/L6EKqcvaBWaH4O2C6pnULXbXmmlA0x7VztKRMaSpmuzlUbITy3r7YZVwV47wzWfxn7n19e7amjEVQYIFJgcdCZ0Ag7PBt/4NABXpzBdek8p+juirWbwyIyYH0biYTNOH4prUkwj4myJe9nUyoXMIH3HHW6mBodnsiBsY3aD98rpfe609vrP5aiaDHHUJuXatD2d4kJ64eYZwPq2YUdjWdbiE+Nq1ibLVQXKKd3wmKxOjkJ/q1yAJtCWYHssT4mgseDUQHoyzevW1h1ghOR3VZ2Lq8+jeo2m+qLm5bczSYINXib0PYwEraLkygfVYDS4s/WqsAa0vYeREHHxXXAQMzyGu67Jc6d1M3rh/JTwYeQI6EWDGXQUo/q7ocBCpL6C910iCVAklX8LD83HkMXXbrje6XM/RC12TroG+k4sKlWDo2BnkHIX/gXV/RwWYU1C7c/EL6YKuPQOsxmeHFfhKOf833GCUM1AscPo9pVLVF+r8rcNZc1qSVce2GjBmrHhY2SO00Tyvz+r7g== 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)(7416014)(36860700016)(82310400026)(1800799024)(921020)(3023799007)(22082099003)(18002099003)(6133799003)(56012099006)(11063799006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dJaKN5KmPtFvswn4W6S4rYko8VXb9que9wjZdRqFaPaS73ARu/TeFXrktN+87eIG7P09SKIpP8NsGVd12FJUcEjvgL+y7RqBf78DI+XukP70cX/80Ylxqj82dt60iilNl11jZRq0bw19DX16GYaJxrkXLo3Vbwmuj7yGVf8NZuxFd8CvhNA8FLo/oZNQIqjgnPuoAkmW3uRnAeZt+5vtVUOfmBaZXZIu2z6YV4OE+cusfm3mZbucvCzGGpM+2jzd1se0nagJo/Lu/ptssODPN27Zha8idDkbXlditFg2ZRCmP5jkh3EjGJDglAnSvKBv1WCBBYz2+ZSzb0C7nPkP/BnOCRy2s8w5WAPHyiMQp8FHqAksAH6m3Uet2HjNfS8ZvHdk68n+WhpSlzjIcxWq5TCA3JuA1cHGEfrTeqRzg3VcVkS8S7sKhfx2v6WpSwj6 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2026 20:01:38.6065 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1de2cf56-0655-44f0-f577-08dec0e1c1e4 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: BN1PEPF00006000.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB5980 Content-Type: text/plain; charset="utf-8" From: Ashish Kalra When SEV-SNP is enabled, all writes to memory are checked to ensure integrity of SNP guest memory. This imposes performance overhead on the whole system. RMPOPT is a new instruction that minimizes the performance overhead of RMP checks on the hypervisor and on non-SNP guests by allowing RMP checks to be skipped for 1GB regions of memory that are known not to contain any SEV-SNP guest memory. Add support for performing RMP optimizations asynchronously using a dedicated workqueue. Enable RMPOPT optimizations for up to 2TB of system RAM starting from the lowest physical memory address aligned down to a 1GB boundary at RMP initialization time. RMP checks can initially be skipped for 1GB memory ranges that do not contain SEV-SNP guest memory (excluding preassigned pages such as the RMP table and firmware pages). As SNP guests are launched, RMPUPDATE will disable the corresponding RMPOPT optimizations. Suggested-by: Thomas Lendacky Suggested-by: Dave Hansen Reviewed-by: Ackerley Tng Signed-off-by: Ashish Kalra --- arch/x86/virt/svm/sev.c | 196 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 193 insertions(+), 3 deletions(-) diff --git a/arch/x86/virt/svm/sev.c b/arch/x86/virt/svm/sev.c index 089c9a14edc7..d7e40a5fe5ca 100644 --- a/arch/x86/virt/svm/sev.c +++ b/arch/x86/virt/svm/sev.c @@ -19,6 +19,7 @@ #include #include #include +#include =20 #include #include @@ -125,7 +126,18 @@ static void *rmp_bookkeeping __ro_after_init; static u64 probed_rmp_base, probed_rmp_size; =20 static cpumask_t rmpopt_cpumask; -static phys_addr_t rmpopt_pa_start; +static phys_addr_t rmpopt_pa_start, rmpopt_pa_end; + +enum rmpopt_function { + RMPOPT_FUNC_VERIFY_AND_REPORT_STATUS, + RMPOPT_FUNC_REPORT_STATUS +}; + +#define RMPOPT_WORK_TIMEOUT 10000 + +static struct workqueue_struct *rmpopt_wq; +static struct delayed_work rmpopt_delayed_work; +static DEFINE_MUTEX(rmpopt_wq_mutex); =20 static LIST_HEAD(snp_leaked_pages_list); static DEFINE_SPINLOCK(snp_leaked_pages_list_lock); @@ -566,6 +578,14 @@ static void rmpopt_cleanup(void) { int cpu; =20 + guard(mutex)(&rmpopt_wq_mutex); + + if (!rmpopt_wq) + return; + + cancel_delayed_work_sync(&rmpopt_delayed_work); + destroy_workqueue(rmpopt_wq); + cpus_read_lock(); =20 for_each_cpu(cpu, &rmpopt_cpumask) @@ -574,7 +594,8 @@ static void rmpopt_cleanup(void) cpus_read_unlock(); =20 cpumask_clear(&rmpopt_cpumask); - rmpopt_pa_start =3D 0; + rmpopt_pa_start =3D rmpopt_pa_end =3D 0; + rmpopt_wq =3D NULL; } =20 void snp_shutdown(void) @@ -592,6 +613,134 @@ void snp_shutdown(void) } EXPORT_SYMBOL_FOR_MODULES(snp_shutdown, "ccp"); =20 +static inline bool __rmpopt(u64 pa_start, u64 op_type) +{ + bool optimized; + + asm volatile(".byte 0xf2, 0x0f, 0x01, 0xfc" + : "=3D@ccc" (optimized) + : "a" (pa_start), "c" (op_type) + : "memory", "cc"); + + return optimized; +} + +static void rmpopt(u64 pa) +{ + u64 pa_start =3D ALIGN_DOWN(pa, SZ_1G); + u64 op_type =3D RMPOPT_FUNC_VERIFY_AND_REPORT_STATUS; + + __rmpopt(pa_start, op_type); +} + +/* + * 'val' is a system physical address. + */ +static void rmpopt_smp(void *val) +{ + rmpopt((u64)val); +} + +/* + * RMPOPT optimizations skip RMP checks at 1GB granularity if this + * range of memory does not contain any SNP guest memory. + */ +static void rmpopt_work_handler(struct work_struct *work) +{ + cpumask_var_t follower_mask; + phys_addr_t pa; + int this_cpu; + + pr_info("Attempt RMP optimizations on physical address range @1GB alignme= nt [0x%016llx - 0x%016llx]\n", + rmpopt_pa_start, rmpopt_pa_end); + + if (!alloc_cpumask_var(&follower_mask, GFP_KERNEL)) + return; + + /* + * RMPOPT scans the RMP table, stores the result of the scan in the + * reserved processor memory. The RMP scan is the most expensive + * part. If a second RMPOPT occurs, it can skip the expensive scan + * if they can see a cached result in the reserved processor memory. + * + * Do RMPOPT on one CPU alone. Then, follow that up with RMPOPT + * on every other primary thread. Followers are "designed to" + * skip the scan if they see the "cached" scan results. + */ + cpumask_copy(follower_mask, &rmpopt_cpumask); + + /* + * Pin the worker to the current CPU for the leader loop so that + * this_cpu remains valid and the RMPOPT instruction executes on + * the correct CPU. + * + * Use migrate_disable() rather than get_cpu() to prevent + * migration while still allowing preemption. + */ + migrate_disable(); + this_cpu =3D smp_processor_id(); + + if (cpumask_test_cpu(this_cpu, follower_mask)) { + /* + * Current CPU is a primary thread in rmpopt_cpumask. + * Run leader locally and remove from follower mask. + */ + cpumask_clear_cpu(this_cpu, follower_mask); + + for (pa =3D rmpopt_pa_start; pa < rmpopt_pa_end; pa +=3D SZ_1G) + rmpopt(pa); + } else if (cpumask_intersects(topology_sibling_cpumask(this_cpu), + follower_mask)) { + /* + * Current CPU is a sibling thread whose primary is in + * rmpopt_cpumask. RMPOPT_BASE MSR is per-core, so it + * is safe to run the leader locally. Remove the sibling's + * primary from the follower mask as this core is already + * covered by the leader. + */ + cpumask_andnot(follower_mask, follower_mask, + topology_sibling_cpumask(this_cpu)); + + for (pa =3D rmpopt_pa_start; pa < rmpopt_pa_end; pa +=3D SZ_1G) + rmpopt(pa); + } else { + /* + * Current CPU does not have RMPOPT_BASE MSR programmed. + * Pick an explicit leader from the cpumask to avoid #UD. + */ + int leader_cpu =3D cpumask_first(follower_mask); + + if (WARN_ON_ONCE(leader_cpu >=3D nr_cpu_ids)) { + migrate_enable(); + goto out; + } + + cpumask_clear_cpu(leader_cpu, follower_mask); + + cpus_read_lock(); + for (pa =3D rmpopt_pa_start; pa < rmpopt_pa_end; pa +=3D SZ_1G) + smp_call_function_single(leader_cpu, rmpopt_smp, + (void *)pa, true); + cpus_read_unlock(); + } + + migrate_enable(); + + /* Followers: run RMPOPT on remaining cores */ + cpus_read_lock(); + for (pa =3D rmpopt_pa_start; pa < rmpopt_pa_end; pa +=3D SZ_1G) { + on_each_cpu_mask(follower_mask, rmpopt_smp, + (void *)pa, true); + + /* Give a chance for other threads to run */ + cond_resched(); + } + cpus_read_unlock(); + +out: + free_cpumask_var(follower_mask); +} + void snp_setup_rmpopt(void) { u64 rmpopt_base; @@ -600,11 +749,35 @@ void snp_setup_rmpopt(void) if (!cpu_feature_enabled(X86_FEATURE_RMPOPT)) return; =20 + guard(mutex)(&rmpopt_wq_mutex); + + /* + * Guard against re-initialization. When SNP_SHUTDOWN_EX is issued + * with x86_snp_shutdown=3D0, snp_shutdown() is not called and + * rmpopt_cleanup() is skipped, but snp_initialized is still cleared. + * A subsequent __sev_snp_init_locked() would call snp_setup_rmpopt() + * again, leaking the existing workqueue, delayed work, debugfs + * entries, and cpumask state. + */ + if (rmpopt_wq) + return; + + /* + * Create an RMPOPT-specific workqueue to avoid scheduling + * RMPOPT workitem on the global system workqueue. + */ + rmpopt_wq =3D alloc_workqueue("rmpopt_wq", WQ_UNBOUND, 1); + if (!rmpopt_wq) { + pr_err("Failed to allocate RMPOPT workqueue\n"); + return; + } + cpus_read_lock(); =20 /* * The RMPOPT_BASE MSR is per-core, so only one thread per core needs - * to set up the RMPOPT_BASE MSR. + * to set up the RMPOPT_BASE MSR. Likewise, only one thread per core + * needs to issue the RMPOPT instruction. * * Note: only online primary threads are included. If a core's * primary thread is offline, that core is not covered. CPU hotplug @@ -628,6 +801,23 @@ void snp_setup_rmpopt(void) wrmsrq_on_cpu(cpu, MSR_AMD64_RMPOPT_BASE, rmpopt_base); =20 cpus_read_unlock(); + + INIT_DELAYED_WORK(&rmpopt_delayed_work, rmpopt_work_handler); + + rmpopt_pa_end =3D ALIGN(PFN_PHYS(max_pfn), SZ_1G); + + /* Limit memory scanning to 2TB of RAM */ + if ((rmpopt_pa_end - rmpopt_pa_start) > SZ_2T) { + pr_info("RMPOPT coverage limited to 2TB; memory above 0x%llx not optimiz= ed\n", + rmpopt_pa_start + SZ_2T); + rmpopt_pa_end =3D rmpopt_pa_start + SZ_2T; + } + + /* + * Once all per-CPU RMPOPT tables have been configured, enable RMPOPT + * optimizations on all physical memory. + */ + queue_delayed_work(rmpopt_wq, &rmpopt_delayed_work, 0); } EXPORT_SYMBOL_FOR_MODULES(snp_setup_rmpopt, "ccp"); =20 --=20 2.43.0 From nobody Mon Jun 8 05:24:50 2026 Received: from CY7PR03CU001.outbound.protection.outlook.com (mail-westcentralusazon11010022.outbound.protection.outlook.com [40.93.198.22]) (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 671B1282F1F; Tue, 2 Jun 2026 20:02:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.198.22 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780430532; cv=fail; b=gKFCHyhKTXpmlMJPTh/sxT5I1QTy2AArNyKHh9ORShvkbuZ4lVWgUFuAcRdDLw7ET5YxjTrgtifmAA6bU0cWXnEa85CeRdwy5fts4umFwxZtlCmPhQgzLRVEYjAtQOvbtwoiNovfb30y0b+ZpayriImtu1c6QG0T8Th6+Ss0h3M= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780430532; c=relaxed/simple; bh=xpAkeaTs1Q+E07KtSeVlwCrMaIRpl9mZy4WRf6MhplY=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=cyl2DFslTLmdcDlbb79F8wLvDQrghtifqC9Iaguamfawvady1fvXcU27Gu55x44/jCI4KA6J9hlzL7eg99+KfoBxPEq8+DGUUQZrR5X02WHpoDVlfT4TwHyIFzvRqLj7hivVGnVhTEa4jbCo1GZMR+Ok/P3FpK6kFTvbZSnyeik= 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=a69Ml8iq; arc=fail smtp.client-ip=40.93.198.22 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="a69Ml8iq" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=n8RPMtGRj5SFqmgtA/MDkJjZVDX6sV2GltCFely5OioBjjRAt0GHXubCBal8STScuBvPK/tTwdaumDOP7yn9h8uEiRk2xnLnJkxWNcVndOHnKLc50v3gLEYGmUcqKTPNOviXVzY9KOHjwudA2PmSz1uZHpWDidAAuFjpgT3fDuAgO7DxSka1xc9YJdrAewzX3pvulsPTpo7aB6qrIhB3IVPllaPGTeH/30/9VY36wO3ProO2U51tCdm9+i72b1y68wfDMmBS1by2Xq4YnqXT7Ud8rjpS+D8/GFpHrvrA08q5jM5lgClSLAaIofkiuGFm8qUtdzgmM/RXfFnYfA7Bng== 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=A4X916o7nBvaPF/sO8XCm1SJuVQr5O3EdzfPAE4Kssc=; b=ciTdkBbxcbN+mbchDTZVU1pe7CeIpGx+Lli/o0F6dYfLWgLt0A8xB0iQm8QNgxpc8gvc7AeiogUAGgZCl1sRVJwDo3k0jZOLfvkKNIjyVYKTOv+NXqe5I5Ohiqxaa4Hsl5DTcWkkXLT7+O7UGTj0UXFFQ1qCNmg7lAVCtVriiX2RquGYbanpBSV49j2EVXrX1YGOW6MIkvxepuIUbfBNvDWqrJkDYSXM8Ixnvm1LKf/7xUc77E6wakT1KlX7bywfYvfGLmnkUDO17/OsxpW1c4S7KEDyQhkOfilmACCbxKmt+AKeb6d2LUoaQve4x30ur+GjxHd/FFeEH1NRxv5bxQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=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=A4X916o7nBvaPF/sO8XCm1SJuVQr5O3EdzfPAE4Kssc=; b=a69Ml8iq8xUSYK9uhnmueYT0Gu6on86HxF3OGKDEwB9a6XxSp6ler/xVE1pmtUiRHsq2tSXoqRvFaa2nOGEgitVTs5DbEGtNar3bk+OKs/lZgpExN0H0jtzC6sBBjNafmhc3Vt7DcoCXMMAnzUuq1CB0Ia+Rf6qolPyiOS5moXk= Received: from BN9PR03CA0205.namprd03.prod.outlook.com (2603:10b6:408:f9::30) by DM4PR12MB6374.namprd12.prod.outlook.com (2603:10b6:8:a3::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.92.7; Tue, 2 Jun 2026 20:02:01 +0000 Received: from BN1PEPF00006000.namprd05.prod.outlook.com (2603:10b6:408:f9:cafe::24) by BN9PR03CA0205.outlook.office365.com (2603:10b6:408:f9::30) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.92.7 via Frontend Transport; Tue, 2 Jun 2026 20:02: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=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by BN1PEPF00006000.mail.protection.outlook.com (10.167.243.232) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.92.5 via Frontend Transport; Tue, 2 Jun 2026 20:02:01 +0000 Received: from nigeria-2635-os.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.41; Tue, 2 Jun 2026 15:01:59 -0500 From: Ashish Kalra To: , , , , , , , , , , , CC: , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v6 4/6] x86/sev: Add interface to re-enable RMP optimizations. Date: Tue, 2 Jun 2026 20:01:44 +0000 Message-ID: <3abe3f20a0bfe7518edadd3d36ca57b4189ca46d.1780427587.git.ashish.kalra@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: 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: BN1PEPF00006000:EE_|DM4PR12MB6374:EE_ X-MS-Office365-Filtering-Correlation-Id: 6cd7c6ab-ae24-4a94-c8e3-08dec0e1cf8d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700016|7416014|376014|82310400026|1800799024|921020|6133799003|22082099003|18002099003|11063799006|56012099006; X-Microsoft-Antispam-Message-Info: zJHi5nQnN1dJ3kXQh+VDJKam7L8f8ZgrrTvQu/2/3XUnSzDiZJFWEA9DeAgeCeXOJP9rDwNCs4tZhAVjSYRmz6Dh0pLnsle/Z8DmmPR0WoJzIH3JFg/J1p0iP75K89KHvRRHuZjJ69NQADXwxSwV6rkQPKHJiyYK/r7WQyjvCwQ6yO5WnL0CTmG6ReTLRuCUivXiGGGnI2/r3hwnMgIxavgL01YYS7aAWUq7AUBG75RuM2dxpl9UHIS84iz0UdLi15O1X2cXiwFXPqa9CieQyH7jvQYMd22sv268+zF3Lk5xnb0mexlG9HI4KXiZwEtiAlne+CE5YTtBL52ri1kQNUZ6UJOnGPacZxyfb6vBQFi+gg1Id26o3+RWO7SwBfyaQ20Ncv2NX+u8YhaKJ2LnpRmGh2rQJ/6KQwtkHUVSIeiNyCQ7sL+zjdEjTQ1JBX5QMuc3NqWxQ9C6kEsE9sIAVaK4zOXwDy4Krt5W9EF4jmSLK5Puqm/CfU9oYH9yos6Ju7dgV+QFV2JPQST9BZ4Fyw8KdXZYyeMaRQAoU9tdsRqBLkhAgrH35keqSkvPVeOtnT57OK8+DP8NeaDMvzTing5Ez8dTpm4L+4R5QpGvPF8OPhIcTui7v1e2O/QPj8UZC3IgBCZQw4D7JhS6D/ExFYEdnGQOcM+ema1oMVR6wR06KEgXUbayu4iaPddj5waBD9DGO03ig+GyNCE8lPMbcnU7E9r9lWQz5O8adYiNXG5nF+trareqKf8HORGQQUU/3IiRGMJc1SqDMM5e3qkSGg== 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)(36860700016)(7416014)(376014)(82310400026)(1800799024)(921020)(6133799003)(22082099003)(18002099003)(11063799006)(56012099006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dvL6pRHVrcC81cBAOMcIlkC5pHHn6idrOGaIPUALNeLeF8oSkyqCtVEGL1WNU/ixZVfhA3gBIH+OdfiW1Y40sVuJbCKUwi79zDEn4568Q5EiKLS6FZd/yXv97Zz5KmicttN9TNnvcohp87I0JTYF0oO/zNq6D/8afjidebBgtO0qDviNv7Rr57fG83Xu6BvpVsAFNc6Qy16Zr8j28yM5rRAPcWAhHwSgnUFFAqZutQvTUG6qnXjguKEAC7mBFNjruKPJliTqyMhnXm5X7sM/Zx4Nn84Sl3S5HVgLIk7p6xIezK0fDpZh3fv+AbRv3HIVvg20P9j2XSc+3naDWhKxMb2TgDDKPtjwMiylJUe4P18qsvsTxTJDi+ew9eEuSnKdW8GFYsuktisFfDPPNNHpqsqyl0oGrA32CqrNpMQkh3mpgdKMSUo8hsn39TpiaVMu X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2026 20:02:01.5165 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6cd7c6ab-ae24-4a94-c8e3-08dec0e1cf8d 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: BN1PEPF00006000.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6374 Content-Type: text/plain; charset="utf-8" From: Ashish Kalra RMPOPT table is a per-CPU table which indicates if 1GB regions of physical memory are entirely hypervisor-owned or not. When performing host memory accesses in hypervisor mode as well as non-SNP guest mode, the processor may consult the RMPOPT table to potentially skip an RMP access and improve performance. Events such as RMPUPDATE can clear RMP optimizations. Add an interface to re-enable those optimizations. Reviewed-by: Ackerley Tng Signed-off-by: Ashish Kalra --- arch/x86/include/asm/sev.h | 2 ++ arch/x86/virt/svm/sev.c | 15 +++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/arch/x86/include/asm/sev.h b/arch/x86/include/asm/sev.h index 6fd72a44a51e..09b1c5d33790 100644 --- a/arch/x86/include/asm/sev.h +++ b/arch/x86/include/asm/sev.h @@ -662,6 +662,7 @@ static inline void snp_leak_pages(u64 pfn, unsigned int= pages) __snp_leak_pages(pfn, pages, true); } int snp_prepare(void); +void snp_rmpopt_all_physmem(void); void snp_setup_rmpopt(void); void snp_shutdown(void); #else @@ -681,6 +682,7 @@ static inline void snp_leak_pages(u64 pfn, unsigned int= npages) {} static inline void kdump_sev_callback(void) { } static inline void snp_fixup_e820_tables(void) {} static inline int snp_prepare(void) { return -ENODEV; } +static inline void snp_rmpopt_all_physmem(void) {} static inline void snp_setup_rmpopt(void) {} static inline void snp_shutdown(void) {} #endif diff --git a/arch/x86/virt/svm/sev.c b/arch/x86/virt/svm/sev.c index d7e40a5fe5ca..4442ecae3d18 100644 --- a/arch/x86/virt/svm/sev.c +++ b/arch/x86/virt/svm/sev.c @@ -741,6 +741,21 @@ static void rmpopt_work_handler(struct work_struct *wo= rk) free_cpumask_var(follower_mask); } =20 +void snp_rmpopt_all_physmem(void) +{ + if (!cpu_feature_enabled(X86_FEATURE_RMPOPT)) + return; + + guard(mutex)(&rmpopt_wq_mutex); + + if (!rmpopt_wq) + return; + + queue_delayed_work(rmpopt_wq, &rmpopt_delayed_work, + msecs_to_jiffies(RMPOPT_WORK_TIMEOUT)); +} +EXPORT_SYMBOL_GPL(snp_rmpopt_all_physmem); + void snp_setup_rmpopt(void) { u64 rmpopt_base; --=20 2.43.0 From nobody Mon Jun 8 05:24:50 2026 Received: from BYAPR05CU005.outbound.protection.outlook.com (mail-westusazon11010023.outbound.protection.outlook.com [52.101.85.23]) (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 32A8C2F290A; Tue, 2 Jun 2026 20:02:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.85.23 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780430568; cv=fail; b=IuV23bIEfVuAnxIxIiaDotxRUBH2r64RSbxgWVLoTWvqe7X0Qnkl/xQH6Gzp4VP4wy/WVjqAPwtBH8byhWHRMC17KEzC4XcTcr8b8Oa/khJngCf3Jg1nJxoV4JS8gef6QrfgA7G5xG2+CdyUWmrBUAWtQOKpxRQvNZJH4wif72w= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780430568; c=relaxed/simple; bh=vuGdLL/e7nbmHBQa3VVs/TpNpujz2G3aM+7E5CDFFTs=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=r+QEvDH6xNNOtxlCukqFd4j9Yk/zalRHZBYOPUQAmCrRxEhr8hMmc6B776RGZYwCYzUu9SA1j21BLtlpUQqbQnXyUXwXf2N1qpfeYxoTURt5ILszHRlnzu7SxIwie3xzjpjnKgwwvytY4YP8PQgpuxj+oU+ISqwuznEzJrV8MPI= 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=qaju6R3i; arc=fail smtp.client-ip=52.101.85.23 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="qaju6R3i" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=CvZcyOz7XY5agCjDFVfCKdgJNZyXIpqooAbHSywJKmpja7bZNH4mPUcA94eVDtmRETV/fOHDyFDGvYVGQ1eTSZa9B9UpHr0kq/IgoZU7XffWDE1aWhSEDvURlvCSxH0ASvgwHmbxldwW+lCPEbOxfwMvzsOxNV6zvsP+zRvs5K/AW5peKEgTBd2pDzl7xF50U+WKqh0r5ZAi5Ayg7Rd6Kqs98h6OTUKBks57XOYTgIuLuNr1/o8Vr9kYZ5rPq0GsztTDDkvotB42Y53ZGzL7OyO1390qEGUpeIKwnie2O3sZEkbdcZkjcraO6vSPWiZOmp7iJiFEXZDEXOktgvJc7A== 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=1i1YVQlqnyjYXlJrMfo3dyWzHlnzJV9t5+x5bWLD990=; b=iADYdJNiEYEo1GKcDrPMSqVqHjcp2xCtcDA72Il3G7OzQQ1lZJ/Vt/157C7nEPCeiq6RQj/psJC20ln7wzEd5kUgLhWeC/JUbKereyK7FWOCtTMqi+cL+JjHl4Y8aYddCgzG+bzHNp2KJ4cwTPYacUP84epUlsVvpl6K6mBKtojRb2IAUQ3Kg2ICAHVQ/7govHpE9jIgxEIWju5+ET+FEzDUQ7wPf3655s/GZnF44j4Gwc2uARnaMFqhDJEXp1U5ekDLp9DAPtKTupuXoM/lEa36gP9x9gE5oMxosgLTshFrBvzzRobASVbepCeGffNY3Lkor5O0zqe6Wop7OcbhFg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=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=1i1YVQlqnyjYXlJrMfo3dyWzHlnzJV9t5+x5bWLD990=; b=qaju6R3iF8aSa3UBY5263UCCM3HgNYLZLHGF2yQZc3C9akaj9GyJgLGYldWFAeMIfp/9jKnqZ8KJ/a3HtJzOr4402kdmHN9Ad0Z5l3YGwjDsCpTPrF3rIUR8l8+S0CAVXS/896pVArxWZi3mb8ZY1xPOOdNsIKOlkoWd8cGXVkU= Received: from CY5PR19CA0098.namprd19.prod.outlook.com (2603:10b6:930:83::15) by DS2PR12MB9637.namprd12.prod.outlook.com (2603:10b6:8:27b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.92.7; Tue, 2 Jun 2026 20:02:43 +0000 Received: from CY4PEPF0000EDD4.namprd03.prod.outlook.com (2603:10b6:930:83:cafe::88) by CY5PR19CA0098.outlook.office365.com (2603:10b6:930:83::15) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.92.7 via Frontend Transport; Tue, 2 Jun 2026 20:02:42 +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 CY4PEPF0000EDD4.mail.protection.outlook.com (10.167.241.200) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.92.5 via Frontend Transport; Tue, 2 Jun 2026 20:02:41 +0000 Received: from nigeria-2635-os.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.41; Tue, 2 Jun 2026 15:02:40 -0500 From: Ashish Kalra To: , , , , , , , , , , , CC: , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v6 5/6] KVM: SEV: Perform RMP optimizations on SNP guest shutdown Date: Tue, 2 Jun 2026 20:02:28 +0000 Message-ID: <53da77d689a2281cf875cdf6b3a52a7980b5ef2a.1780427587.git.ashish.kalra@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: 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: CY4PEPF0000EDD4:EE_|DS2PR12MB9637:EE_ X-MS-Office365-Filtering-Correlation-Id: 323e3f9c-fbcf-45c4-20e6-08dec0e1e7b5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700016|82310400026|1800799024|376014|7416014|921020|56012099006|11063799006|22082099003|18002099003; X-Microsoft-Antispam-Message-Info: Mo4dIcmrerE4cq/VBDZ585xffs6YIjTCRDG/NyKjZ9joXkZRmK6Ekfb+C0Z71VW75vhc5Re5cm5FOJGnQLupgRcUp4CWN13oH2j7L4H4wP+DWIbZng+8ZGM9zemXG59mnzxMoz2uCDzEC/bdfMOYm8g1ajLU1EqxWUBDmE1ptdEy9faKcTdNcHwtw1E7R1FzpVZslNvZFdbuAiI1izjH9T9dDshSiQ/d0M2j550YlRyzi5shbHN4xy9+UKITVGeLcZuUOfotbIKHqQcyXhz08sN4IwtkiPNQrBieVDJu5X3B+QI+LAkqUJwoHu//78Hjc5XWu5phSahtYj1eLgTDNbkACZvqCwQiBuhcB3myRbb0czyM3nHNQ49Nk+soaRkrC/zoghopZMDKuvdEuV3fW8YMVh6eqkNBOBxRegPbwyNpF4ArHLEE+AHqBXiaKWuIQkwZhuoMxUtywxMP/FYB8n+AxSocADRmLrxk8g0gTbzI3M6+QMypkE+jJ8YoLfMVQke3Xxrt/cn+p0fPbECCAxymUVKVMlQDJs4JT0t+GlfEPdcgeVAvZnB6ruCK2UCZxvT5uYODvI4vY5MyYtcdnejHaCWnejkiJLyiJ08FiaPr46Bv4diA/F2vFMarUE5KS1jzCH0PXgLludHOvOfQnKR3Rc/GTmGNkOQOaOfDWFo1ClDNKQQR+2bl43HaEAHQyos8h+L+VLWsBTpbqs3YkmBtGlGgF0/3P1XvDsDvNtzEUEcVX2l8xh0S1J0mrCaGK8FRNDylYVNDPywJVMkMkA== 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)(36860700016)(82310400026)(1800799024)(376014)(7416014)(921020)(56012099006)(11063799006)(22082099003)(18002099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gI+fPd2iNRqPdEWjdYEHU/nbsqSKimYVKyWd9nyc2E+YsQwWfEUwfuYxcTESmUDv9KDOQ93CP4zUQP67n5EUjZ1+ZD8pHdLYe4so9stiRS6BQFYINAN2CvNH7IJ+pHjZFJFBYCQHCdSVfQJwLTvH4gILcNwOUBiMQffsK1ig7DKzb355M1fKX+PGmcLknUprRCzbhylcWgUbWo7HWpJNHlbyLaZeeyHInYNfgE06xM6ltUJfrTXXS3c56Xl6l/WqDFR7ICDI98VwdgFxO5oIHY1hExjAo1rT6zoyrNMmsteDn90UH3DvqZ9KFCPrP0U7NGm7aL/T4G7x07Xp7WIn2CWSyH5nsITRxu28plyVUO16fWMH+rCVM4RqZz5ijVaog+9+7up6B+8AkoMy4H1gH8ZBnzlqf+8oXMagUHF4ISJbTsFocRPJipSH6DtnS9j2 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2026 20:02:41.9870 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 323e3f9c-fbcf-45c4-20e6-08dec0e1e7b5 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: CY4PEPF0000EDD4.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS2PR12MB9637 Content-Type: text/plain; charset="utf-8" From: Ashish Kalra Pages are converted from shared to private as SNP guests are launched. This destroys exisiting RMPOPT optimizations in the regions where pages are converted. Conversely, guest pages are converted back to shared during SNP guest termination and their region may become eligible for RMPOPT optimization. To take advantage of this, perform RMPOPT after guest termination. Do it after a delay so that a single RMPOPT pass can be done if multiple guests terminate in a short period of time. Acked-by: Dave Hansen Reviewed-by: Ackerley Tng Signed-off-by: Ashish Kalra --- arch/x86/kvm/svm/sev.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index e107f368ed2d..29af6f6e603c 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -3005,6 +3005,8 @@ void sev_vm_destroy(struct kvm *kvm) */ if (snp_decommission_context(kvm)) return; + + snp_rmpopt_all_physmem(); } else { sev_unbind_asid(kvm, sev->handle); } --=20 2.43.0 From nobody Mon Jun 8 05:24:50 2026 Received: from SJ2PR03CU001.outbound.protection.outlook.com (mail-westusazon11012055.outbound.protection.outlook.com [52.101.43.55]) (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 E5B352CCB9; Tue, 2 Jun 2026 20:03:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.43.55 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780430592; cv=fail; b=sG78tw0cI6YArJ95ue8ge/4bMi6FMkn+u71t7fcLWNvhCz0KgPyGEeqzEWn7Cd6ZprgGxSwsddxup6DcALgQiRA81z9dO7AkINOr38iP6ZrsctUDowCZIePq3HChSsIySl9AmRWQmCmyf5grYSdi0MRSMjgXGmxJGRW2KhW8BYA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780430592; c=relaxed/simple; bh=KSY2VL8R2wTxxdRA9GXA3nPzwGL7qkwMgJGiq9IQrNM=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=NnwMYQ1nzmer8wfNysoOFxmSsem/jUf0sB7IwjdTfmTWAESfWsm18KVOclXrLvKdrRCOG8sNRC5ra3Zw1xOjHbKHjXTcOrhEeHuN91mwLbOlWhsDj/eA4bJCdNaiCXlDLGB3c1jdXJsI85d3ssNFKpWqDgBkp9/FspZKLJDw3Ic= 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=5JRKJQau; arc=fail smtp.client-ip=52.101.43.55 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="5JRKJQau" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=nBoSvzyIVG/DQ//rkjkVrJg7jA5IAxZI5bD75fwEy0xGhhkvOCxyrlYedhMLWIlRk1ul2my8iBCSWXyupiBzwhqAhGAPvD6j6F6nrrF/VhRyOFbaqvzA8ayPrY58GK/czntIEDUSRTciPqW2UNz/1vhaTC9qh8o8SMSHYddTUranEwu6M7IG13F6JGP4RmQYPM4U9Um/qRKrFKd6Z6gbXkFRsVvdjVC3vq5nbGzuBf5OYgauVgVs3ZdG4HTWkKObAl2L/LxpE5pp8uTNW5UYN60VcNsLCBl3hXxZFNpgyGUekizeqKTdrJO0lV/kcoMt49R6loMEYDdexNIc9uFi8Q== 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=hDsoHxLb3UP4QP2EFrbKgAYu8FmeYYAX1hQJkPDdNBY=; b=RLEIKhi/erdxbTgF4lXBjTz2bMybzuCTdLXrl1I6zJ3Ffg9z7oL3hvu53ErRjPsmYFY1Bz9+HV3jkPnzDOPp2kO8t7eFGfA8V3+z9L2s020Uo92NH1lmN83pvFBYbfDuT9X5gmgs3VS/6gGXbfHsE9jyZQFnOdkPLjjaVr7jt3MXiLXVywqu2jK2asFCnhwJkkjhYe1HqSHW4VRVIkurZuhJwu5nGBAR5r0kZ0uHz24ApaKn/Ls8DEYqSSSN2KPsEldN+KhNI6V5d7mGPJpUks/KUga1JRZjrlBweCxylzqR0sPCPq1qExj07GS6VCdBJ1q/W9gzopGvraPI3pkBWg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=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=hDsoHxLb3UP4QP2EFrbKgAYu8FmeYYAX1hQJkPDdNBY=; b=5JRKJQauX7X6dmXc8akOtWQKEdw7HHaFz9LJ1yVz5LA/Xm51uB2RZHeW+LzubNW0UC1kuGbKzPHvGwZXy3P8LdYG60vOnDjslhnaquY4Co1tY6j4H0mQgglXixdTBJdn7wiHesEweT3s0rkzODhG08hLrd7+i1gu2JQA0lc6aF8= Received: from PH0P220CA0004.NAMP220.PROD.OUTLOOK.COM (2603:10b6:510:d3::22) by CY5PR12MB6455.namprd12.prod.outlook.com (2603:10b6:930:35::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.71.16; Tue, 2 Jun 2026 20:03:03 +0000 Received: from CY4PEPF0000EDD7.namprd03.prod.outlook.com (2603:10b6:510:d3:cafe::3a) by PH0P220CA0004.outlook.office365.com (2603:10b6:510:d3::22) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.92.7 via Frontend Transport; Tue, 2 Jun 2026 20:03: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=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by CY4PEPF0000EDD7.mail.protection.outlook.com (10.167.241.203) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.92.5 via Frontend Transport; Tue, 2 Jun 2026 20:03:02 +0000 Received: from nigeria-2635-os.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.41; Tue, 2 Jun 2026 15:03:00 -0500 From: Ashish Kalra To: , , , , , , , , , , , CC: , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v6 6/6] x86/sev: Add debugfs support for RMPOPT Date: Tue, 2 Jun 2026 20:02:47 +0000 Message-ID: <0a956b779299d43f30d88c3a271c7f24cee22baf.1780427587.git.ashish.kalra@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: 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: CY4PEPF0000EDD7:EE_|CY5PR12MB6455:EE_ X-MS-Office365-Filtering-Correlation-Id: a6a9e022-2797-4481-2bbe-08dec0e1f3d6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700016|82310400026|1800799024|7416014|376014|3023799007|18002099003|22082099003|11063799006|6133799003|56012099006|921020; X-Microsoft-Antispam-Message-Info: AFbMIFuJd5v+pv4OlwQ2BeTkcwJHBOF2IV5aurofRqv6JQHwOhFD1H1AZ6d8XEnESkniPOUMp4wOV7m3+eaTYO0sN/2lrMMOS4R+L3ujIFtkCV7GmSWnsqPw/DTnfwn1v8xgwNWoPjtsKtZNnuO2Nvcr3matpdP57fjquwXEMmHwNf43a8LSLbf6rF9rzvz2P8R3xbXMt5haFYmr6CeFUZLv9mAhgMiIiQYN7SWpw9bus6TJnhe3vlnXCN1wWtfssni1bzpitQV6q6i6btbjM4bRUK+gTaaXvX89Gx+OgBWKPyRB0p1/Ehg9N2qh8gZdbw5RL6QyOIC1MSi1WJhTCmuMOnGzYL9W0N+kKJ26wgTXoiN+RX72ysbQRfltbgzyrf6Rrb+T/wz+qucDEOcRQoJjqlAB/dC+Wfl6CnWgOsAPgnzDaypuqgudGvCd7ylv7NS0akhVCoIIVWbOVWtg3ZpfW7CGRnNAC7AhLcoIP4gjYGAO+ns+hbFpa8U7ycT5/cvrWRT3YNs4J8a5rMI0donyQGHeMAvNViIjaf/DRWpJY4H7VmUhhb6JAU+HTxZNmL7BmNNSXG3fhyR2U6/oULUP2Rpm8cbHyi/3Vy+y+++d+nPvDIaDrSeh9Cz8z3KXjbWDU3oauVt205UNeiDvF24KFFsNdzOfVPSwwfMAVxCgojUbxvcQsZCHdCbh3dlHcA+HPI8rt5djHn3Fqv/1zvlYN78lb3V/Ixyq72LRHeHaxHvZkfY2THFhPaUygPQZ7SrFjg4StMpobT9f7KmXUA== 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)(36860700016)(82310400026)(1800799024)(7416014)(376014)(3023799007)(18002099003)(22082099003)(11063799006)(6133799003)(56012099006)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: V0IkaNvewaueA8t/0Ioxh9HOC1jEvRqNF2kPeXvaviGkI4D2yJXeZeJefbP3e49rrche7845mqEtPOVyQC1taVLUJukGDMkoH/9gE+xDBMB/TdZ1J8p7Rz9nwMtqDymwvhwD+wwPcJzsu7/jJ+94Rwop79Llqbv0J6Y9/PK7HsueI4mKqtVUA5yaniU9RfgHVCsXYXZgsukDZAqjm63wTqLMsVKEjJFlmO+lKFqnVlwExL7PAJd1CLKzO9Gt2KtcnSLPikkFKVUxwigLpirQDC4wEaWMPCluW1+u/jty9viCBeecvbvW4Fjnuep/cuA6ssxEEhkiJ5r1XvroRf0kBQl1H7bEBwXUdU3MxCh17x3isDyEDh/MxBlWf2jr0VCGTKI/eBN7un9jswJtCqfogQP7yhb4MfQDnJdyF0GlES2m5NbU8whHHEONw4zXLVt0 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2026 20:03:02.3766 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a6a9e022-2797-4481-2bbe-08dec0e1f3d6 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: CY4PEPF0000EDD7.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6455 Content-Type: text/plain; charset="utf-8" From: Ashish Kalra Add a debugfs interface to report per-CPU RMPOPT status across all system RAM. To dump the per-CPU RMPOPT status for all system RAM: /sys/kernel/debug/rmpopt# cat rmpopt-table Memory @ 0GB: CPU(s): none Memory @ 1GB: CPU(s): none Memory @ 2GB: CPU(s): 0-1023 Memory @ 3GB: CPU(s): 0-1023 Memory @ 4GB: CPU(s): none Memory @ 5GB: CPU(s): 0-1023 Memory @ 6GB: CPU(s): 0-1023 Memory @ 7GB: CPU(s): 0-1023 ... Memory @1025GB: CPU(s): 0-1023 Memory @1026GB: CPU(s): 0-1023 Memory @1027GB: CPU(s): 0-1023 Memory @1028GB: CPU(s): 0-1023 Memory @1029GB: CPU(s): 0-1023 Memory @1030GB: CPU(s): 0-1023 Memory @1031GB: CPU(s): 0-1023 Memory @1032GB: CPU(s): 0-1023 Memory @1033GB: CPU(s): 0-1023 Memory @1034GB: CPU(s): 0-1023 Memory @1035GB: CPU(s): 0-1023 Memory @1036GB: CPU(s): 0-1023 Memory @1037GB: CPU(s): 0-1023 Memory @1038GB: CPU(s): none Suggested-by: Thomas Lendacky Signed-off-by: Ashish Kalra --- arch/x86/virt/svm/sev.c | 128 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 128 insertions(+) diff --git a/arch/x86/virt/svm/sev.c b/arch/x86/virt/svm/sev.c index 4442ecae3d18..29695bb18991 100644 --- a/arch/x86/virt/svm/sev.c +++ b/arch/x86/virt/svm/sev.c @@ -20,6 +20,8 @@ #include #include #include +#include +#include =20 #include #include @@ -144,6 +146,15 @@ static DEFINE_SPINLOCK(snp_leaked_pages_list_lock); =20 static unsigned long snp_nr_leaked_pages; =20 +/* All users of rmpopt_report_cpumask must hold rmpopt_show_mutex. */ +static cpumask_t rmpopt_report_cpumask; +static struct dentry *rmpopt_debugfs; +static DEFINE_MUTEX(rmpopt_show_mutex); + +struct seq_paddr { + phys_addr_t next_seq_paddr; +}; + #undef pr_fmt #define pr_fmt(fmt) "SEV-SNP: " fmt =20 @@ -585,6 +596,8 @@ static void rmpopt_cleanup(void) =20 cancel_delayed_work_sync(&rmpopt_delayed_work); destroy_workqueue(rmpopt_wq); + debugfs_remove_recursive(rmpopt_debugfs); + rmpopt_debugfs =3D NULL; =20 cpus_read_lock(); =20 @@ -622,6 +635,10 @@ static inline bool __rmpopt(u64 pa_start, u64 op_type) : "a" (pa_start), "c" (op_type) : "memory", "cc"); =20 + if (op_type =3D=3D RMPOPT_FUNC_REPORT_STATUS) + assign_cpu(smp_processor_id(), &rmpopt_report_cpumask, + optimized); + return optimized; } =20 @@ -641,6 +658,115 @@ static void rmpopt_smp(void *val) rmpopt((u64)val); } =20 +/* + * 'val' is a system physical address. + */ +static void rmpopt_report_status(void *val) +{ + u64 pa_start =3D ALIGN_DOWN((u64)val, SZ_1G); + u64 op_type =3D RMPOPT_FUNC_REPORT_STATUS; + + __rmpopt(pa_start, op_type); +} + +/* + * start() can be called multiple times if allocated buffer has overflowed + * and bigger buffer is allocated. + */ +static void *rmpopt_table_seq_start(struct seq_file *seq, loff_t *pos) +{ + phys_addr_t end_paddr =3D rmpopt_pa_end; + struct seq_paddr *p =3D seq->private; + + if (*pos =3D=3D 0) { + p->next_seq_paddr =3D rmpopt_pa_start; + if (p->next_seq_paddr >=3D end_paddr) + return NULL; + return &p->next_seq_paddr; + } + + if (p->next_seq_paddr >=3D end_paddr) + return NULL; + + return &p->next_seq_paddr; +} + +static void *rmpopt_table_seq_next(struct seq_file *seq, void *v, loff_t *= pos) +{ + phys_addr_t end_paddr =3D rmpopt_pa_end; + phys_addr_t *curr_paddr =3D v; + + (*pos)++; + *curr_paddr +=3D SZ_1G; + if (*curr_paddr >=3D end_paddr) + return NULL; + + return curr_paddr; +} + +static void rmpopt_table_seq_stop(struct seq_file *seq, void *v) +{ +} + +static int rmpopt_table_seq_show(struct seq_file *seq, void *v) +{ + phys_addr_t *curr_paddr =3D v; + + guard(mutex)(&rmpopt_show_mutex); + + seq_printf(seq, "Memory @%3lluGB: ", + *curr_paddr >> (get_order(SZ_1G) + PAGE_SHIFT)); + + /* + * Query all online CPUs rather than just rmpopt_cpumask (primary + * threads only). The RMPOPT instruction only needs to run on one + * thread per core for the optimization to take effect, but debugfs + * reporting requires the RMPOPT status across all CPUs. + * Performance is not a concern for this diagnostic interface. + * + * This is safe because RMPOPT_BASE MSR is per-core and + * snp_prepare() ensures all CPUs are online when the MSR is + * programmed during snp_setup_rmpopt(). + */ + cpumask_clear(&rmpopt_report_cpumask); + on_each_cpu_mask(cpu_online_mask, rmpopt_report_status, + (void *)*curr_paddr, true); + + if (cpumask_empty(&rmpopt_report_cpumask)) + seq_puts(seq, "CPU(s): none\n"); + else + seq_printf(seq, "CPU(s): %*pbl\n", cpumask_pr_args(&rmpopt_report_cpumas= k)); + + return 0; +} + +static const struct seq_operations rmpopt_table_seq_ops =3D { + .start =3D rmpopt_table_seq_start, + .next =3D rmpopt_table_seq_next, + .stop =3D rmpopt_table_seq_stop, + .show =3D rmpopt_table_seq_show +}; + +static int rmpopt_table_open(struct inode *inode, struct file *file) +{ + return seq_open_private(file, &rmpopt_table_seq_ops, sizeof(struct seq_pa= ddr)); +} + +static const struct file_operations rmpopt_table_fops =3D { + .open =3D rmpopt_table_open, + .read =3D seq_read, + .llseek =3D seq_lseek, + .release =3D seq_release_private, +}; + +static void rmpopt_debugfs_setup(void) +{ + rmpopt_debugfs =3D debugfs_create_dir("rmpopt", arch_debugfs_dir); + + debugfs_create_file("rmpopt-table", 0400, rmpopt_debugfs, + NULL, &rmpopt_table_fops); +} + /* * RMPOPT optimizations skip RMP checks at 1GB granularity if this * range of memory does not contain any SNP guest memory. @@ -833,6 +959,8 @@ void snp_setup_rmpopt(void) * optimizations on all physical memory. */ queue_delayed_work(rmpopt_wq, &rmpopt_delayed_work, 0); + + rmpopt_debugfs_setup(); } EXPORT_SYMBOL_FOR_MODULES(snp_setup_rmpopt, "ccp"); =20 --=20 2.43.0