From nobody Sat Feb 7 06:55:22 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+82594+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one); dmarc=pass(p=none dis=none) header.from=groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1634962492461630.3339610011744; Fri, 22 Oct 2021 21:14:52 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id llUAYY1788612xRvajGmmjae; Fri, 22 Oct 2021 21:14:52 -0700 X-Received: from NAM12-BN8-obe.outbound.protection.outlook.com (NAM12-BN8-obe.outbound.protection.outlook.com [40.107.237.61]) by mx.groups.io with SMTP id smtpd.web11.2842.1634962491303690893 for ; Fri, 22 Oct 2021 21:14:51 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gSRZxrgG7GJNqRjBJHciuT1O3ZEEkt1zBlNuGo7/TQNxcMsOimDET+fRL7FfDhV2pnwq1OJ2kpY2LFKXTKAJ0Zu5gLdkdsi+RG04RP8RhyJLHbnCpbA30EhmDkJzMu64CXOSTwTMW8HkpH8dm5LHGYsS/rfCiMqXwT3J/DVvBHykKyOg3HHrCi9N3lGPOKtBrxL2GQ2Ykkjl0dUqWUMH2KHq8oXbMhW9L5vtip6veOUHh/1R9h6FBCy0Rb0QkHmtXYxbamtzEQe6f8KtbhN4Hq2jHMZGuf459JGsCLL5mVfDb4kvLPhdZHRKDtfsVow+iVGAxENbVdTuhALGNK5Y1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=J4EYiTwmfbfr8sO7aGxNLaRJ5SaNghSiw5L2jEgGUKk=; b=U93QintO9zTbxa7Rz8NWh291hdCkRDP+yeUyKbpLvmMzYZruwDhfRqTqX1XJM7xGdJw33jWuKsvAJQ/CHGj9h6i83H8zNLR5o+gM9njeLzTXUaviuJDWtIpZkIF8c/ltLXJC/V8X0D0JWnB/lnuam4TsQCqoYsD4vvWsU/9iNU4jVIbqpsk/YtIkGHpvwKZ19pAfmKuY9Tqj7A/b6joZ11Sim12sCAU9W6KjsDoGVw67Kq+5TkAjUkVWPOcB7vSgXxRttUgYyPxHgUlZnHNFSc+ZbKJ2z1I7SNMUsb1I6Va7l9NQH9rqByVcZi3XBP/LMsisZM0/E+Cdjg5/4bAjsw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=edk2.groups.io 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 X-Received: from BN6PR2001CA0036.namprd20.prod.outlook.com (2603:10b6:405:16::22) by MWHPR1201MB0271.namprd12.prod.outlook.com (2603:10b6:301:57::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.18; Sat, 23 Oct 2021 04:14:48 +0000 X-Received: from BN8NAM11FT063.eop-nam11.prod.protection.outlook.com (2603:10b6:405:16:cafe::8b) by BN6PR2001CA0036.outlook.office365.com (2603:10b6:405:16::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.16 via Frontend Transport; Sat, 23 Oct 2021 04:14:48 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; edk2.groups.io; dkim=none (message not signed) header.d=none;edk2.groups.io; dmarc=pass action=none header.from=amd.com; Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+82594+1787277+3901457@groups.io; helo=mail02.groups.io; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; X-Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT063.mail.protection.outlook.com (10.13.177.110) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.4628.16 via Frontend Transport; Sat, 23 Oct 2021 04:14:48 +0000 X-Received: from sbrijesh-desktop.amd.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.15; Fri, 22 Oct 2021 23:14:44 -0500 From: "Brijesh Singh via groups.io" To: CC: James Bottomley , Min Xu , "Jiewen Yao" , Tom Lendacky , "Jordan Justen" , Ard Biesheuvel , Erdem Aktas , "Michael Roth" , Gerd Hoffmann , Brijesh Singh , Michael Roth Subject: [edk2-devel] [PATCH v11 30/32] OvmfPkg/PlatformPei: mark cpuid and secrets memory reserved in EFI map Date: Fri, 22 Oct 2021 23:13:47 -0500 Message-ID: <20211023041349.1263726-31-brijesh.singh@amd.com> In-Reply-To: <20211023041349.1263726-1-brijesh.singh@amd.com> References: <20211023041349.1263726-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cba7c7b8-2d5a-44dd-36ac-08d995dba6ee X-MS-TrafficTypeDiagnostic: MWHPR1201MB0271: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: h2m+aceKGqEdZWWwQlBicr4wNueCoo322HQdZ7SwNm6kuGQwDa6PIr9YiEVmBvotsfTylkJlJb5KzjqMRHa/HIWxAgJrp0CvgGQrxSnra8/zGXKRtFRfiZqxC0ZdPN18gj7Fi6Bp4myVaXXXr2uSM02BqrsAQYLq33cu2hHrxsCiI9LiXxRGSd2sfEwyGYzCvRE5bN3E9s5ta2ihhH3+TkleIelKmyD+IoWK4pUz+cRN5WEPTvcvQqkCbPnqAAvAw3aB0xx4aGHXlAT2DUNWRY+5DX/mySof9QYaAud26qXAJxhrKDyx9tqZMXOL9bfKrAH0ciqBEyqYC5P4iCn0q9EOKZPepkp6EEbY9nCwW+kov1HDFv6ntjki/aOi5j5iW8xqpe5tgKlRqBq/Di7as2081NcuvuAvALK8JKXvZx99b6LW49L6G7oT4Km10nMQG3U7/JFy5Z/sTf70QPcJ4Tz6nLfy6zXv8abm1JjS+fLNvbJHmhJ3IEUzoxFR+nb+iOWYlG5zrl4F8F3kGnpQHIOhGPVGHmrq6hra31t8pXD7/TU0ZV5kh6gpshP1agqBIA3Pog0TFj6HxSfpdu6diCY08ds3oiPTJL5+IIfv2yyVCGZhnDRcHsanRXJTAUYV5yCS3UsrjYUYxr0GiOB+d6ykqzxPBN6IycfM5KO3yKMYfwCDMIF00UsGkE+jflTSDeYOijB0OU+0TmOHNJyDnf8apZ6O8cF5B8NGBCcGSjU= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Oct 2021 04:14:48.0211 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cba7c7b8-2d5a-44dd-36ac-08d995dba6ee X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT063.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR1201MB0271 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,brijesh.singh@amd.com X-Gm-Message-State: qTUoN18MgbZEr3WdIvJvpczxx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1634962492; bh=MxXK8trm2OntTlw+7n0GxmG4PWdzblHbnu30+UxXAFs=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=r9ds1IHWZgIWiP4ek6Wf2Y2ZrWEwMhEPee18BdLr98T/1dre2cFsBrrrUblgFeGffTD cTHYm+Ng1xM6+JcZVoRCslncdLQW7Yf0TOSeHRFNXov6F7Qnnv4OIVjq2oy/6nr86cF9v j9EY/IRZtqfqaXlOs5/wt0CMOpN87eVuBXU= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1634962493652100116 Content-Type: text/plain; charset="utf-8" When SEV-SNP is active, the CPUID and Secrets memory range contains the information that is used during the VM boot. The content need to be persist across the kexec boot. Mark the memory range as Reserved in the EFI map so that guest OS or firmware does not use the range as a system RAM. Cc: Michael Roth Cc: James Bottomley Cc: Min Xu Cc: Jiewen Yao Cc: Tom Lendacky Cc: Jordan Justen Cc: Ard Biesheuvel Cc: Erdem Aktas Cc: Gerd Hoffmann Acked-by: Gerd Hoffmann Signed-off-by: Brijesh Singh --- OvmfPkg/PlatformPei/PlatformPei.inf | 4 ++++ OvmfPkg/PlatformPei/Platform.h | 5 +++++ OvmfPkg/PlatformPei/AmdSev.c | 31 +++++++++++++++++++++++++++++ OvmfPkg/PlatformPei/MemDetect.c | 2 ++ 4 files changed, 42 insertions(+) diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/Plat= formPei.inf index 3c05b550e4bd..1c56ba275835 100644 --- a/OvmfPkg/PlatformPei/PlatformPei.inf +++ b/OvmfPkg/PlatformPei/PlatformPei.inf @@ -111,6 +111,8 @@ [Pcd] gUefiCpuPkgTokenSpaceGuid.PcdGhcbHypervisorFeatures =20 [FixedPcd] + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfCpuidBase + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfCpuidSize gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIMemoryNVS gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory @@ -121,6 +123,8 @@ [FixedPcd] gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecGhcbBackupSize gUefiOvmfPkgTokenSpaceGuid.PcdOvmfWorkAreaBase gUefiOvmfPkgTokenSpaceGuid.PcdOvmfWorkAreaSize + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSnpSecretsBase + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSnpSecretsSize =20 [FeaturePcd] gUefiOvmfPkgTokenSpaceGuid.PcdCsmEnable diff --git a/OvmfPkg/PlatformPei/Platform.h b/OvmfPkg/PlatformPei/Platform.h index 8b1d270c2b0b..4169019b4c07 100644 --- a/OvmfPkg/PlatformPei/Platform.h +++ b/OvmfPkg/PlatformPei/Platform.h @@ -102,6 +102,11 @@ AmdSevInitialize ( VOID ); =20 +VOID +SevInitializeRam ( + VOID + ); + extern EFI_BOOT_MODE mBootMode; =20 extern BOOLEAN mS3Supported; diff --git a/OvmfPkg/PlatformPei/AmdSev.c b/OvmfPkg/PlatformPei/AmdSev.c index 7da6370113f0..e71c601aa716 100644 --- a/OvmfPkg/PlatformPei/AmdSev.c +++ b/OvmfPkg/PlatformPei/AmdSev.c @@ -410,3 +410,34 @@ AmdSevInitialize ( ASSERT_RETURN_ERROR (PcdStatus); =20 } + +/** + The function performs SEV specific region initialization. + + **/ +VOID +SevInitializeRam ( + VOID + ) +{ + if (MemEncryptSevSnpIsEnabled ()) { + // + // If SEV-SNP is enabled, reserve the Secrets and CPUID memory area. + // + // This memory range is given to the PSP by the hypervisor to populate + // the information used during the SNP VM boots, and it need to persist + // across the kexec boots. Mark it as EfiReservedMemoryType so that + // the guest firmware and OS does not use it as a system memory. + // + BuildMemoryAllocationHob ( + (EFI_PHYSICAL_ADDRESS)(UINTN) PcdGet32 (PcdOvmfSnpSecretsBase), + (UINT64)(UINTN) PcdGet32 (PcdOvmfSnpSecretsSize), + EfiReservedMemoryType + ); + BuildMemoryAllocationHob ( + (EFI_PHYSICAL_ADDRESS)(UINTN) PcdGet32 (PcdOvmfCpuidBase), + (UINT64)(UINTN) PcdGet32 (PcdOvmfCpuidSize), + EfiReservedMemoryType + ); + } +} diff --git a/OvmfPkg/PlatformPei/MemDetect.c b/OvmfPkg/PlatformPei/MemDetec= t.c index d736b85e0d90..058bb394f0df 100644 --- a/OvmfPkg/PlatformPei/MemDetect.c +++ b/OvmfPkg/PlatformPei/MemDetect.c @@ -821,6 +821,8 @@ InitializeRamRegions ( { QemuInitializeRam (); =20 + SevInitializeRam (); + if (mS3Supported && mBootMode !=3D BOOT_ON_S3_RESUME) { // // This is the memory range that will be used for PEI on S3 resume --=20 2.25.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#82594): https://edk2.groups.io/g/devel/message/82594 Mute This Topic: https://groups.io/mt/86530743/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-