From nobody Fri Dec 19 08:04:02 2025 Delivered-To: importer@patchew.org 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+80103+1787277+3901457@groups.io; helo=mail02.groups.io; 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+80103+1787277+3901457@groups.io; arc=fail (BodyHash is different from the expected one) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1630513078515668.0735380003067; Wed, 1 Sep 2021 09:17:58 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 39pnYY1788612xWLGoR2cBfZ; Wed, 01 Sep 2021 09:17:58 -0700 X-Received: from NAM10-BN7-obe.outbound.protection.outlook.com (NAM10-BN7-obe.outbound.protection.outlook.com [40.107.92.76]) by mx.groups.io with SMTP id smtpd.web12.165.1630513077014031814 for ; Wed, 01 Sep 2021 09:17:57 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TUcRnckaWPo2x5dHh+Pc8WCEfi9RQd9/N2xTj6zza4w4kpO8TPKvGLztOJodDrIMLtynHcGJA8d/d3uaIQu0JwFmfKe1jSDRS4zpsoP0ATW6vw8a+SpbdXV3trex/TKIEXicJ24m9rDyZl4ed+I1WS8LzzO9jInbnxAaLuyOLYdyzCfDIXUAtDvhGxVk7pBR/nnHmMv8XTU+W8wEO7KjYd4efUlB1LKcMJWO5QRgsRw2PGoF0xbg0edMRluoJoXZYUGrKozB6bR6ZG1vuUg11T1BGAan1q0cwgbcExu7nDgGIfEZbLYiwPFahnzZ/N10SHxPalLF8gA9L7nFmdmjJw== 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; bh=0cAck3GUVGG3XDoaGy8JYF5AgZvUawhcQTCvX8en/pE=; b=MKZOWQko0MEL73XpnSN9mQVpCUvx2unxVvTQ+TjFrkjS9V/QbRM9El4TV8wQ47uxWJ8D6T4d/37T/NoHLR2XHOmx0ZzsQqRyD/A2mbL5eJr6RKt4CCSU4BpIrW/2r64kpPonDdbxrRlFT/HPv991E0P60+Uf7V7X7nx+GpDO+TBE6ADBnuTdx7F/2YyXL8Z8rFGW+ldfppA5KjkU3YRsDPP5bAv7hQKD1mkJEtq+YPRP1mfmmvaJd3dIJJ8B5XfO4sKRF04F/f4ZW2a8rO/iNe1YWEHuAzVRcHjmrOPRjbd33EjkJ4jG4ztl3vwmwtg4MQ0xL6xGJRehc/sBKlNYyA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none X-Received: from SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) by SA0PR12MB4512.namprd12.prod.outlook.com (2603:10b6:806:71::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.17; Wed, 1 Sep 2021 16:17:55 +0000 X-Received: from SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::78b7:7336:d363:9be3]) by SN6PR12MB2718.namprd12.prod.outlook.com ([fe80::78b7:7336:d363:9be3%6]) with mapi id 15.20.4457.025; Wed, 1 Sep 2021 16:17:55 +0000 From: "Brijesh Singh via groups.io" To: devel@edk2.groups.io 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 v6 27/29] OvmfPkg/PlatformPei: mark cpuid and secrets memory reserved in EFI map Date: Wed, 1 Sep 2021 11:16:44 -0500 Message-ID: <20210901161646.24763-28-brijesh.singh@amd.com> In-Reply-To: <20210901161646.24763-1-brijesh.singh@amd.com> References: <20210901161646.24763-1-brijesh.singh@amd.com> X-ClientProxiedBy: SN4PR0501CA0062.namprd05.prod.outlook.com (2603:10b6:803:41::39) To SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Received: from sbrijesh-desktop.amd.com (165.204.77.1) by SN4PR0501CA0062.namprd05.prod.outlook.com (2603:10b6:803:41::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.12 via Frontend Transport; Wed, 1 Sep 2021 16:17:55 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1cad0b5f-9344-4cf0-4434-08d96d640e44 X-MS-TrafficTypeDiagnostic: SA0PR12MB4512: X-MS-Exchange-Transport-Forked: True 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: Kmh3QkkD4zVId3lhEhtO29LFY6x+OvEI/oGAiGfHciemCsMplB9hknYdgQwGTsNOl7ipmyUYowYLdso1+5/cEBH5jJwy9Ghjo6LzR0WP+EaPxD03Zk2ISN47pzDjqssOA5D4MDlnXL5L3slOTsZatiGfmZ5b+jWW9O8Xa+ypz5XpVmLmvg83rvGV6Wqn9LWDS9lRZUd8z83OI4Sa8vlxYGGnj7P+N1r96eCLYJW8G0lrdp0E7Wkfc4Btt4F7Ge0nxsHJwDaMeL61Iyzqb/exI44ENwSJBgCZT1Ri5bQwETZR+kZtawDpqa21B91RookTd4yk9KyuC2L8FzdwhiyTLuwFljtIY1SJMmHeeT7OBLg17Ye4RqV47ptvvSfkI/VEyjMsNiFiyQv8j9pLhAiekl8PQePMzFX8fDLsFzsy2nuQ1YmMP21H4Fsnnj9xGj5cMPIr+MOZLXYVE52c/tnmQHmqGVLrB0PmgjM6IL/rNSbzvznzo+nYs0zo9gKpELGzKjdW4izfU+IzEXv9hhzQ3DNcKNS8MzytjXtuOVED3/ZvTXvJlPtEy6EgSt2t+1yfUoRPnCrvV/ojOGwf/XF8mc7TSyUGmMd8ONUaozFCjkIjYzsSnJ7vqLBbiWTh+VaV4hfp86sHa5UjEhVtadO3XmE5qr2mQ7ar3BbFjE3xnC9wEi+790FwPFBtoBiIN19PD7Uwdzja2rGTDqDKKl+SfA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?lbFMgvAy3n2YHQ5miAfX4zmPpABKicXTk71bHoGohoUGL4Gps3KaaB1nKRVR?= =?us-ascii?Q?JhnfvQWRkrbZ9rtf/rLYoTqCUdRXinZG++9Y40LmeXtHKCZaYcHTrANh8AGd?= =?us-ascii?Q?sHcbC1aLfD3Z2JUP7cIG17WllJYaPPgG4M4758/U/mTKL/B59QA9kSHregPS?= =?us-ascii?Q?nBwadl9qRdJlBYV/59KqR90qdLyBbaUTK5UVCzudoR+HX18sS2/+1Ad/vClO?= =?us-ascii?Q?0inp2Idh3y0JKKre7SD4TZhDLlxk0u8/xkC5hXH1guKS1t0o8LTJ43Jm4MWg?= =?us-ascii?Q?WJ5S84Dpo0lL05sJkWuYNAhrJ1qOKjJLe3x/Wr2ZCILo+eZC7RuqizbevJU3?= =?us-ascii?Q?gXmKB2mdLACYkFYZoVKMqanxquPIfJXivLeOcj3A8QhznsFCOuIqIR6/FvCZ?= =?us-ascii?Q?E1HCu3J2GaJKKe3bd5FqUP84DlMFb6xjiDcsEteVS8lzRnMR5k6mqvSCrQGm?= =?us-ascii?Q?wemt/RU7VPHYlpLJEnRmM3NFcWphc5Iq0Jm6zD7xv7GlLEJv9l14YiMyTj2J?= =?us-ascii?Q?izmY96oGuEZLTqDX6n0JKdKWbwSbswllEK9STTim3UN3I4eVdxPnyjRAmPxc?= =?us-ascii?Q?q0z9n1Axvhn2iHSQrDrHvTtJgMOjxQTKE/17I82TMOr8O6WLAvqGgRSMtPOr?= =?us-ascii?Q?JL1CwXS1NJG2/UTQf0CrIO7LDmxE9U918SbW6rCG+o9m/YiY4lz3AhdVQvSI?= =?us-ascii?Q?Q/e7tvTpMVTRrVocGgTdRZcDfKx9B+6tiWIcDM4AVOjk1jpB42m+Y6y7woWK?= =?us-ascii?Q?jAbnmECQvQLa2zzweiygsk1uP3L9gZZWkTdnbIOwRN9kiCu6c56Rv0SYftk/?= =?us-ascii?Q?o2K/6fIAtOx6vFqtGdWUTPX+L+nLPsKjyhXTpvhV2DXBmQkOykuoIgF3lKdU?= =?us-ascii?Q?HxAzn7z+McZnRk0476boChrbuyxy1DMvgcHaeD6hgvfld92CVCfVxPvBcndP?= =?us-ascii?Q?vru6ewUonORJGzdBFh1km+2V/2iFfd3wie9to2hCI6BIVGg2R+uNCZXccnx4?= =?us-ascii?Q?p8QOHy/PIFTb5mtUK8UqXj/Q8HXoC15ZDJXtlNIaLEcokk9+F0r1Lmh4dO0B?= =?us-ascii?Q?khtdZNMm1uZml5YIw2FFGC1bR+COVxBjx49EVJad8ekWQ4BmNTIQe5pBbzlZ?= =?us-ascii?Q?sfudOMR6d+fVGFX3RyFWOwSalSJG2jS6ZMOg67WlQumZY55E5DQmHGX1VZHp?= =?us-ascii?Q?Ub0k8tWr/pAcHEoim5zmjoDovRnFI9YdNpNdOEKXSYWjdRF7vLbWtu7DFRTP?= =?us-ascii?Q?ldgl4UkpRUX7pjXLT0XGf3HudEZBujk22em8FsFqX3uiaoqyiRSQWAgmZhnG?= =?us-ascii?Q?4e4OEKiAhiXGphGWT9fzOCrK?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1cad0b5f-9344-4cf0-4434-08d96d640e44 X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2718.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Sep 2021 16:17:55.4826 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: iE/fEkTp65S/5gIdMeHk/JIMJiR/MBwmQmUw9EDbCi9oN4aI4ShWtL8NgcSmJsaVqUtHYAfy5c1iWZKGg02ebA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB4512 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: 66WaIu4u1YHd2Abp2OVKnNGXx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1630513078; bh=L2TXykE+Ur3bxD2PLPprc/pu1lQ6EDzVchzDEwTTu30=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=hH/neX7Nr5kYgdiR9YRTJKvqmJWbehbK97vbV1wAyrse+gwDHjfRgpoauGtUCQXBpZF XYdR+fZjtEtap+B2tBNTkSJjKEVp3DkzHLbgSK0Q2PyvE0zzkcaoLQtUDjzOPnslr0GHE MjGBoHKydbBhGmKT7Z5JdAo+6KTLc5peeWM= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1630513079436100066 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 Signed-off-by: Brijesh Singh --- OvmfPkg/PlatformPei/PlatformPei.inf | 6 ++++++ OvmfPkg/PlatformPei/MemDetect.c | 21 +++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/Plat= formPei.inf index 8c9795095a10..82a0ee721da2 100644 --- a/OvmfPkg/PlatformPei/PlatformPei.inf +++ b/OvmfPkg/PlatformPei/PlatformPei.inf @@ -122,6 +122,12 @@ [FixedPcd] gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSecGhcbBackupSize gUefiOvmfPkgTokenSpaceGuid.PcdOvmfWorkAreaBase gUefiOvmfPkgTokenSpaceGuid.PcdOvmfWorkAreaSize + gUefiCpuPkgTokenSpaceGuid.PcdSevEsWorkAreaBase + gUefiCpuPkgTokenSpaceGuid.PcdSevEsWorkAreaSize + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSnpSecretsBase + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSnpSecretsSize + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSnpCpuidBase + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfSnpCpuidSize =20 [FeaturePcd] gUefiOvmfPkgTokenSpaceGuid.PcdCsmEnable diff --git a/OvmfPkg/PlatformPei/MemDetect.c b/OvmfPkg/PlatformPei/MemDetec= t.c index 2c2c4641ec8a..564c3dabc487 100644 --- a/OvmfPkg/PlatformPei/MemDetect.c +++ b/OvmfPkg/PlatformPei/MemDetect.c @@ -817,6 +817,27 @@ InitializeRamRegions ( { QemuInitializeRam (); =20 + 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 (PcdOvmfSnpCpuidBase), + (UINT64)(UINTN) PcdGet32 (PcdOvmfSnpCpuidSize), + EfiReservedMemoryType + ); + } + if (mS3Supported && mBootMode !=3D BOOT_ON_S3_RESUME) { // // This is the memory range that will be used for PEI on S3 resume --=20 2.17.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 (#80103): https://edk2.groups.io/g/devel/message/80103 Mute This Topic: https://groups.io/mt/85306688/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-