From nobody Wed Feb 11 08:12:58 2026 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+80603+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+80603+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 1631557221435859.3716728993243; Mon, 13 Sep 2021 11:20:21 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id aTqqYY1788612xBb5iML7PW7; Mon, 13 Sep 2021 11:20:21 -0700 X-Received: from NAM10-MW2-obe.outbound.protection.outlook.com (NAM10-MW2-obe.outbound.protection.outlook.com [40.107.94.43]) by mx.groups.io with SMTP id smtpd.web09.834.1631557217859046702 for ; Mon, 13 Sep 2021 11:20:20 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VGx9g3rCoFDT1Zoe4K6LXpbik3hTnA0EqPOuv+21upQmfTO8oFsB/cxyOw7CiJC6Hn2lFl5V1mc2QDkwWnyMBfwF46C7wvyz9XGqNNOmxIOA/ZphmudTZpKDdrxEIfxdtrm2pIfoD9Itfq9EzE8s8M0EBaO5cnoQtAiR41MA1ac4TLHLNjYThZmsS9Q424hYeeqlI7hongBTZ8cqNQQC6sKFfV06cUSTklKT4KFKeTbtHu6i1apQCUwP8odvqGNdwU54jOJrJ1dPEldLRpFOg4JH/HbqJMTZC6U7F8zCMUT2DqKw9z5eU9yheBrxEd5rm1YEn8ibpeJJ7tH20EeDow== 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=vsOIadVNgiLnDh0xvI415DcIIdFmL0cCwQm35itIbMk=; b=k8jBbJhgC505eFyx2dElQfRSfgTobTniJC1lN2ghB1bkYdm/IpO4PvEWnJzby63tjZQellAkEGp4XiVgj33B8G0SOkvkWuxhNtejdo20c44/pcOQvq7BAMVa0QBEeOI2mlXzGpWhsB2xq1y3bPN1rG8j1bbAoYhQnbwKqXHAQlGxsqmEDFEHZOAVDBLNg1JYzW5S5AqtLch+luF3EAHJdonmWG1rTpLxbvqSR/OzYulghIGN1uuQ6KgzT/nKacCk9BTD4EkdvogKBVQKy4cbEuXnSK241rtkZ+GKVJxmXG3/qHvH9Xjmr1hBBm7rtx1ANzZOuPh3xWx8E+tGkzNvgQ== 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 SN6PR12MB2830.namprd12.prod.outlook.com (2603:10b6:805:e0::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14; Mon, 13 Sep 2021 18:20:17 +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.4500.019; Mon, 13 Sep 2021 18:20:17 +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 v7 23/31] OvmfPkg/PlatformPei: set the Hypervisor Features PCD Date: Mon, 13 Sep 2021 13:19:33 -0500 Message-ID: <20210913181941.23405-24-brijesh.singh@amd.com> In-Reply-To: <20210913181941.23405-1-brijesh.singh@amd.com> References: <20210913181941.23405-1-brijesh.singh@amd.com> X-ClientProxiedBy: SA9P221CA0012.NAMP221.PROD.OUTLOOK.COM (2603:10b6:806:25::17) To SN6PR12MB2718.namprd12.prod.outlook.com (2603:10b6:805:6f::22) MIME-Version: 1.0 X-Received: from sbrijesh-desktop.amd.com (165.204.77.1) by SA9P221CA0012.NAMP221.PROD.OUTLOOK.COM (2603:10b6:806:25::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Mon, 13 Sep 2021 18:20:16 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 012f15c0-9779-466a-95a8-08d976e32332 X-MS-TrafficTypeDiagnostic: SN6PR12MB2830: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3276; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Message-Info: BOT00dHFLpnL5ARHhY7Ufjbuxxn0M3dqycB6Dtvi3jvuf/afjTyT9f4iH4rlWhnkC1Lzw/FlEyAQcX0EYQxzy9sJI4DI90DEuQEGy4kPMM3PKJoDh9IdylC/A4S/5gVwQcJI7Q94bxeQbykZHOBdMfNnOwCdMJsmXWW45dP2NjBrcjWU6VLWup7WlALRnWPWhWsLTdBBtNYP9ReO6u/X27I+3l4fWthwsgPWQQiIschn/JAMy7t0/wj5FA5xoLp/mxeuRnJp1yEkmq8O0X0meFJYIGVxIxwf0oeUy7SbKPHWtmxYH2mR44s/ms/C2kkljgv6xp3niM77P49ZB0ZdwnZaWtZoddVUJ6Y4AUzz9BZWDWypMMeJ16Rg8Wrin7ywu008CcXKEXVJ8nL2JZ8tO1psaPuQ3fd2DOKBj7sqhfhYoE31/8ZbbiVcvZT9DKh8p0VnZPJtki6sO30aSBarnv7Zp17JVO4NZaS3uuTcCrdGIlanPdaQjgsVyCIQS5HQG8BoPlg8EN4iHWf6CGDd/eGUyE6cKy8A03Dxb69xFrEaer88wh8SPiSWOqhavSvArrr2g9fazY++Q+kpltSmX8PMFNbUD1BUf4yaQQJLpQUfG8PKmevAsSXfVLGDc+lCMD4qXtuJFMhMl7IpzG0cQwbCA0eVyHIKvgsKLe7EdIDP59SqIlDiyoTAtDd9+y1tUPKdPZKG9kHFQhB31ktJi8gBQGTmRO8vnybug04M84iSjQcO9HtsjO7x5W2222a6E6d3NkiKfDo+iJOQilYygg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Rt0ZV9jcIjnG1Pjj5ysN8fHNVS7GPoka+WvXUvgrASRqNv4Xt2++qiFy5EbB?= =?us-ascii?Q?7qSxS5dzypi9PGJ3C6vPjqLixqhaW/CgiRnwvCQ2NeOIe7iGc3h7jKYDdXkl?= =?us-ascii?Q?eyvhorOB50p0VfHox2snoRs70o85qQlb66DGwO5tKOBfMgih7DWlMPbKFwyp?= =?us-ascii?Q?hq0U3cRdj7UyCI14hEWpuIQ8F2Y+qLhqdG3Fu1HQ+dlRGSTq9O6hwD5ew1/5?= =?us-ascii?Q?OshlOftZxtEgeNRFBR8pKCo0nIbDMdpGL20uJOl+D57va6mIQZYCps9Bacur?= =?us-ascii?Q?c1G4lgqJ25QsJUaXNImPmbdXvTmvP8u8lN1xBt4M/9aVsycbmime2a72+eQv?= =?us-ascii?Q?uo2dpXNjSSwdGduPU/v8G9zwX/NGw9USdK/aj8c1jsXeFHM4GEK8MQb15I0g?= =?us-ascii?Q?samKIzSiFM2ZXbjhonl/qlrzBnTg6cN3dwomStgRbk5cBzf+fpY0SGDRNsVV?= =?us-ascii?Q?dnVxxmNT+d17EF0wL9cSVRoE1wzq2/pfvJ85wA568zCoTOcz3IMhHu4jBRmF?= =?us-ascii?Q?LFk4Q1KisL7K2QuByvvTRX71cLiIkFNw7SKlJteuwArgKj7ssMRhe2EnmSrK?= =?us-ascii?Q?ofEtO0rgVOUrAbLSBCngrRKmAfTZfdCdWVdtVPDl60/cjCBHSXpAclXUcJ4S?= =?us-ascii?Q?lYshWUpVk6bBwimRZmdEYscniQo7IdZ27S6kIWtHT2whqD+iU1znJ3fgl/ME?= =?us-ascii?Q?pSJ3r1Q2eP1JDQa1ZaKl/ps9S03vpXZgrgKxAAp63jwT6FMeRhDEMQ85Y/5P?= =?us-ascii?Q?2C8vfeAyoxpkzWD3GD1naU8dAz0l2E6BlihfkgGLDgjSiPo178NtxbQyD3gF?= =?us-ascii?Q?qj4omjL6BDPs1o1NBueig4m5GiB2rOsntw8Pc0NRxSzGOhQTKDm/5n8570OO?= =?us-ascii?Q?/9W1TJunWQr+n/6ELeZo6y+VaZ6Euu7lKi96MfYrV6z9paZLsISn3ohF3c8Q?= =?us-ascii?Q?011JKfZrsKncJSwy3J5QFzcxKCJYGwK8fltp9bWgxOWIHeRLc6ufULBl6Pvn?= =?us-ascii?Q?k7M9UXOsXO3bE2yn6v26RL6/v94KYtBmwQteJfvkVC3b2ewxvGddrLugqZeL?= =?us-ascii?Q?F2RNa70A0nD/CxD2Oe+tmyBweRMvP/8DvLFmBsCxtBvab0+ZGphRgL0Bigu+?= =?us-ascii?Q?IyCITfvrGZHSPLqcwady6mzdw14lcwci+qnKrhqYZBrDGnPi4jJzLvnH4WbL?= =?us-ascii?Q?d29hKlwAZqr21Uho9dxzb61tLvixQBc8rOnU+jagccQ4teEWsSxHHQTFeI6P?= =?us-ascii?Q?MIayQzsl+KRGB641GxPY7fK3nd4l00peBO2BTtO+GXhUJcscHrpgDzgUUeYJ?= =?us-ascii?Q?DDqjBWEh+lW5qP0G2LadWGuZ?= X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 012f15c0-9779-466a-95a8-08d976e32332 X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2718.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Sep 2021 18:20:17.1626 (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: CW2KoekxgT7nIW638LjPjCt+fmP+QW7DhIyBqfipPsGFCyQuFvsEsO07YdUlO4XjMCXgNdOHdm+JApVZ9/VEOg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR12MB2830 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: ngU1qyZUJkPo9CEMcfpYySrix1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1631557221; bh=bKIPqckFSDM/Yzrioc/nhk4rvTBWNNbfLUqJk1ssx4o=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=R8eYuTUMynBmTqYHpeWwZi54Llaod26ns4J5/xgyik+uJT8xzKvb9KLVay3MVVyVX5j hmTHYyuP/OJr52QeD3ibh7x1zh0lGmbSJejFywy0o7w+WU77XdJ6e8pE66VFu51h6nTd1 vyG5lR1GhsvmVwAQ+Ymto0uMVajwUYiRqRc= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1631557222950100013 Content-Type: text/plain; charset="utf-8" BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3275 Version 2 of the GHCB specification added the support to query the hypervisor feature bitmap. The feature bitmap provide information such as whether to use the AP create VmgExit or use the AP jump table approach to create the APs. The MpInitLib will use the PcdGhcbHypervisorFeatures to determine which method to use for creating the AP. Query the hypervisor feature and set the PCD accordingly. 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: Jiewen Yao Signed-off-by: Brijesh Singh --- OvmfPkg/PlatformPei/PlatformPei.inf | 3 ++ OvmfPkg/PlatformPei/AmdSev.c | 56 +++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/Plat= formPei.inf index 233b9494f64b..d048b692f155 100644 --- a/OvmfPkg/PlatformPei/PlatformPei.inf +++ b/OvmfPkg/PlatformPei/PlatformPei.inf @@ -62,6 +62,7 @@ [LibraryClasses] MtrrLib MemEncryptSevLib PcdLib + VmgExitLib =20 [Pcd] gUefiOvmfPkgTokenSpaceGuid.PcdOvmfPeiMemFvBase @@ -107,6 +108,8 @@ [Pcd] gUefiCpuPkgTokenSpaceGuid.PcdCpuApStackSize gUefiCpuPkgTokenSpaceGuid.PcdSevEsIsEnabled gUefiCpuPkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr + gUefiCpuPkgTokenSpaceGuid.PcdGhcbHypervisorFeatures + =20 [FixedPcd] gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress diff --git a/OvmfPkg/PlatformPei/AmdSev.c b/OvmfPkg/PlatformPei/AmdSev.c index 5e2c891309d4..b71a4a7304f7 100644 --- a/OvmfPkg/PlatformPei/AmdSev.c +++ b/OvmfPkg/PlatformPei/AmdSev.c @@ -24,6 +24,12 @@ =20 #include "Platform.h" =20 +STATIC +UINT64 +GetHypervisorFeature ( + VOID + ); + /** Initialize SEV-SNP support if running as an SEV-SNP guest. =20 @@ -36,11 +42,22 @@ AmdSevSnpInitialize ( { EFI_PEI_HOB_POINTERS Hob; EFI_HOB_RESOURCE_DESCRIPTOR *ResourceHob; + UINT64 HvFeatures; + EFI_STATUS PcdStatus; =20 if (!MemEncryptSevSnpIsEnabled ()) { return; } =20 + // + // Query the hypervisor feature using the VmgExit and set the value in t= he + // hypervisor features PCD. + // + HvFeatures =3D GetHypervisorFeature (); + PcdStatus =3D PcdSet64S (PcdGhcbHypervisorFeatures, HvFeatures); + ASSERT_RETURN_ERROR (PcdStatus); + + // // Iterate through the system RAM and validate it. // @@ -91,6 +108,45 @@ SevEsProtocolFailure ( CpuDeadLoop (); } =20 +/** + Get the hypervisor features bitmap + +**/ +STATIC +UINT64 +GetHypervisorFeature ( + VOID + ) +{ + UINT64 Status; + GHCB *Ghcb; + MSR_SEV_ES_GHCB_REGISTER Msr; + BOOLEAN InterruptState; + UINT64 Features; + + Msr.GhcbPhysicalAddress =3D AsmReadMsr64 (MSR_SEV_ES_GHCB); + Ghcb =3D Msr.Ghcb; + + // + // Initialize the GHCB + // + VmgInit (Ghcb, &InterruptState); + + // + // Query the Hypervisor Features. + // + Status =3D VmgExit (Ghcb, SVM_EXIT_HYPERVISOR_FEATURES, 0, 0); + if ((Status !=3D 0)) { + SevEsProtocolFailure (GHCB_TERMINATE_GHCB_GENERAL); + } + + Features =3D Ghcb->SaveArea.SwExitInfo2; + + VmgDone (Ghcb, InterruptState); + + return Features; +} + /** =20 This function can be used to register the GHCB GPA. --=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 (#80603): https://edk2.groups.io/g/devel/message/80603 Mute This Topic: https://groups.io/mt/85582713/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-