From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mx.groups.io with SMTP id smtpd.web10.66942.1670910783325464166 for ; Mon, 12 Dec 2022 21:53:03 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=jTrN90az; spf=pass (domain: intel.com, ip: 192.55.52.120, mailfrom: min.m.xu@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1670910783; x=1702446783; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=1CKM24KFkW9wDZUf6PclVfHNQcWw0nYNAKr1IFRgVUs=; b=jTrN90azj+oZFeiVWUrq2SU7zkS65Eec42z5x2Yoh1gb7N1valkhlyB3 N54sDBuwKO2vE5+ONBMXwE0hjxWkb+LVQM6A37QGKANkwqNZxy7fGHphH GK7/8Vk2jCz31cFhnbt+Nv92XHCtp5oVw6G7K+25G+OVwuo7Krv/E3Tdg qwktJGLA3zyWpOzzhqSXaZF9ayZmdPu2wg/jBfpMn0aO7XK9YgnmPMMYC 4Ml5098aeJ1SMhkuzsAebxqSan9dBanT46GO7HExReUgD5bmHUx8Qx9j5 K99kY0C49rXaWs6+SEwZGiGx6bsmjf41PeRXkbyc/JdMwu/akl9wDmQO9 g==; X-IronPort-AV: E=McAfee;i="6500,9779,10559"; a="316751903" X-IronPort-AV: E=Sophos;i="5.96,240,1665471600"; d="scan'208";a="316751903" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Dec 2022 21:52:59 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10559"; a="977328426" X-IronPort-AV: E=Sophos;i="5.96,240,1665471600"; d="scan'208";a="977328426" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by fmsmga005.fm.intel.com with ESMTP; 12 Dec 2022 21:52:58 -0800 Received: from orsmsx612.amr.corp.intel.com (10.22.229.25) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16; Mon, 12 Dec 2022 21:52:58 -0800 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx612.amr.corp.intel.com (10.22.229.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16 via Frontend Transport; Mon, 12 Dec 2022 21:52:58 -0800 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (104.47.55.173) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.16; Mon, 12 Dec 2022 21:52:57 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IBAUbo+EcX/GK5LWg0Tx/P8muvSRixOlmM8Jn9SICfqZrLG9yIz/5bsW+RyvCcHlOFzpxgbio9lcoZkvRy0JC34nHXjnLua0kx86/+PD6ppOiZWxeaqZz32Td5ee5i90O/EkEbb0JNT83rke6jpKpjoPoecNowIkNTf6dRfDFEvLBiz+fBwJC40w0+YnZiVieeeDFOknzy/Yv8ECLxAyxwZTJO6B2GqOwcepxNI0/7e6yJzCX4QlKRCQgVMSUXspV/qVnxVzOZgb1t8ZsJMisgxI3nAhioK1As7VOD/ooyNb85I1V/u70FZRJEvAHQEGUX+W8BKqhGTWZoC7YYIeAg== 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=opTHGkXCRHjnwBIwRrqOWTpPNtpepFVWl471RvXme1M=; b=OBiif4XOtinwZC5wepAVEqExXAmz66YV2euLwoNQgmgRLdS7W0Nbb4qLcyB7qb+gsQu4uEMPxHdjRRtsGbrp4wdF7QLHKjs7rnli5PnTWoTe4FG1658zQAWaYLKTAu64iVWdatFd/Yzz06lpkMIvRidop00H7a6hRNmycBOfwvMBbJv9862FfPBqKKYf65EkBjUZM2kygaTX32IHw25xJ/hp9Wypd5b0cGHDHLq863UN7rw1VS//ib9v/L7uov3BLHk6tbniGUn39S8DMotQjPyDONDUG972PAVAK2PwW8vk5YHFHIOp6aDwUa/3buY1aRUIcAE131zA9zJ2W4ONEA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from SJ0PR11MB5069.namprd11.prod.outlook.com (2603:10b6:a03:2ad::6) by BL1PR11MB5253.namprd11.prod.outlook.com (2603:10b6:208:310::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.19; Tue, 13 Dec 2022 05:52:54 +0000 Received: from SJ0PR11MB5069.namprd11.prod.outlook.com ([fe80::10be:d81f:bb30:52d0]) by SJ0PR11MB5069.namprd11.prod.outlook.com ([fe80::10be:d81f:bb30:52d0%5]) with mapi id 15.20.5880.014; Tue, 13 Dec 2022 05:52:54 +0000 From: "Min Xu" To: "devel@edk2.groups.io" , Tom Lendacky CC: "Aktas, Erdem" , James Bottomley , "Yao, Jiewen" , Gerd Hoffmann , "Xu, Min M" Subject: Re: [edk2-devel] [PATCH V2 3/4] OvmfPkg/IoMmuDxe: Add SEV support for reserved shared memory Thread-Topic: [edk2-devel] [PATCH V2 3/4] OvmfPkg/IoMmuDxe: Add SEV support for reserved shared memory Thread-Index: AQHZDrawjKkGDFNlv0uZ54j/1+s7Iq5rUA+w Date: Tue, 13 Dec 2022 05:52:53 +0000 Message-ID: References: <20221213054824.53-1-min.m.xu@intel.com> <1730444AD2D72EE9.23954@groups.io> In-Reply-To: <1730444AD2D72EE9.23954@groups.io> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: SJ0PR11MB5069:EE_|BL1PR11MB5253:EE_ x-ms-office365-filtering-correlation-id: 12b346f5-eac9-437a-7821-08dadcce4717 x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: AWm6FlFWEdu0eWU6FHV4ERg2a0vgqY1tcjeVnYP+U4hvgRkBrqVFSVyL1isTDexxQkbauMOWsYnWliFBUw2/bjTYq40GnOrIKFXBMxVoR9t2lUeCr8pLieKnOVQAOh8GxUFxhcYXdlngbQRU41ffX/v1a13I9Gku47W1Yx93emshlaxTXub9s9Kx8wcCUAk1JbyGUmkDjSy16ir5Asq0c212bAdrZtV4QX8VOZTD3sqPPaSJa3ARP5jBDvbWpmXYJHpWd87ySAzz7vYLHnk75/95k0QWKToeG4+4H5dIIdYCiagfagZo30dfesgNtAtHgCgGZEMNx08TejEByw4ldGr5JN+13cmBrwbHOqRpE3CfGnE1Uk7XPzenv1QDZb3cHWS2zNkOjuvGVGiZG40kXVf1D349pWjOyqWTCnlXf/C+NkCRB0xutPz8PugtnAYT8IjUPt+Hp3Mua2Og13MDn7z/o+8Hbocv22WhtIqrjoDjIgZ+BQmyzvgAOBEkCF81lAOp71niRWyv3gLG8VMf3ehKn2c9mVOkf71jNEAPVS1EgdXgrP9IsyvOdCAcLFpzz3l8CLyb8JvNjysAwheNWEki2htRAgcwzDLjVo0XKFtR5WGfDfaoEyFiSCPoU2NBTsQVfoukrbojikbTwB7uzAPROvaU0WrYyp5V6zosF67F1mto5nnt0BkBU8i1KLbQk+OiOeqCDUEiVEiNYi6hlgHq5kuBVPpGDri7mFQ0c9HGEknJ+OK9W5nTCy+PqdmFhtKoRAFB3PKFHxqHmR9M3Q== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SJ0PR11MB5069.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(6029001)(376002)(136003)(346002)(39860400002)(396003)(366004)(451199015)(66899015)(82960400001)(2906002)(122000001)(38100700002)(55016003)(83380400001)(71200400001)(8936002)(7696005)(53546011)(186003)(64756008)(6506007)(66476007)(66556008)(66446008)(4326008)(66946007)(76116006)(8676002)(5660300002)(38070700005)(52536014)(316002)(41300700001)(54906003)(110136005)(26005)(33656002)(9686003)(107886003)(86362001)(966005)(478600001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?Jqu5s/rV2cWX+pcf1yRHBTThgtEULe89zoNthZnkoAwJeBeFYplVoYwgKxKQ?= =?us-ascii?Q?QOyVSuNgO3UD+bKu4C5zc+s+iBOq0/vR6jHkKed8Iz40jdQIKygJh4AC6GYS?= =?us-ascii?Q?dSxtaPElGcgchFahqae86oN8p0Gyq84QB1RPfNHpIX8iiOXu5DdSUTRlQNeV?= =?us-ascii?Q?kQ39YIfiMf/8e0RmWaOEBwdQpYGOFOu6h8QdB67hq0dmU6C+eDDA4kdL8GkK?= =?us-ascii?Q?dUiebDeIiAy7kzFZnqyAXga+oJsBsBRxMtpaK+D2Qc+7dMTkEIN7AFGY6qja?= =?us-ascii?Q?lsWcQPn/Sm0LvWUWs4NqhPkCAWICa3VpeQGtI4ZnS2ATVV32tlRfmsrrblDF?= =?us-ascii?Q?B3XDeZQK/lvcUxvToH9XSSDls9iXCMR1ftZJVbJ72/dsAQItTKLiNp52dEBT?= =?us-ascii?Q?y2MiFNY2KSLANnrBvJH0J7Hms4lLEKRARSSSqXhJ1ExtlMND7pKC4hs9jxqu?= =?us-ascii?Q?Q+TgbN4QVC6vAqyEH/dBTz5d+de/jndSd5ZUJxR3J9CINtNZiB5Uqk1eTqe4?= =?us-ascii?Q?lgvwXkC+pSqemStYoD9HqTGwzVJhheuuLkJW5OUOJk64nj5wHI8w748I9LbO?= =?us-ascii?Q?T+RJfhxUfoka5bZHantkFNL2VAZNMn19kn0MFONJNft4z7Sa+imcN0tBMC5q?= =?us-ascii?Q?8HzlmdSbScHDMzIRVCLyoX/9Eju6Ig2yJny9S5RovgmcOYNBveNTZ18PJp+l?= =?us-ascii?Q?iE4343OOcjPCqgK+pVkZ/tm+P8LtPlGrlG+2nZ4VlIXb+248XVgniQRQL4AB?= =?us-ascii?Q?qxO7CQ0cSOBEYcRDBSnC91krANgp0XZLXdr6sdtdCrUp+IK7HpRd62gUhomU?= =?us-ascii?Q?nHvf+mPCP5EomQm8pRHJLrGpiJN5lux1fg/F/7/rUiW7X9KI5AP/ckHSDDkk?= =?us-ascii?Q?Dm8AdyDibP8trG9mGGpvjvuiRRnMlVFc/MD7T+ZxW9WE21yqh3ELKdzX0Af7?= =?us-ascii?Q?iyrofPdjBaaoQl/dLcSVsF0SBxCchLNufTqXgLgtPmbe0OERPSBdFUjU4BAp?= =?us-ascii?Q?nChXUnIJ7tLnmXdrcgkatMh+8+zX7acz+BdCTzxN/o30uE2gO7g+g+YSvJVW?= =?us-ascii?Q?rgpomypjCRBDAD0PXllwRNglY5tYXPY4SlXEY4WsHtz/Xq7OWnRVFvW9dsKX?= =?us-ascii?Q?0m+7HyD72nG3AxZDqLkpzXMO6JB2a2XOFWmmm7xrZuk+q6yNXXEYrJPGV/dP?= =?us-ascii?Q?KfT+h+zNVh0iG8ijv1B26sAYTClgmrfRTZ22H4U97f2RohnrsCAi8yevA6Zx?= =?us-ascii?Q?7JW+IecwDDUAbyRimyG+Lhd1Kk1LL7OwVFoaQjvizbBBNxQybbsLl8taXroh?= =?us-ascii?Q?+q6EgGkatjIybv57GiIY6ZmqFch2fEdGV0cq/FGZXtQH3RCXk6jz44h//qPV?= =?us-ascii?Q?RpR/vUpA8+a6+0MoeFL0x4N3KM0A2OFk1v87iG8mkrCFBduluWnpB3c8AV2E?= =?us-ascii?Q?vgWzi5nzUikJ7mmp60CAmiYn7SQRS55pmWHvWMx9OTHfQHXAEvsG840dY+47?= =?us-ascii?Q?ewCEFKAMXuHaexEftK/OITJcUKfke8lW+c9KPG0ndfDm7rhrnT2fmjxLew/W?= =?us-ascii?Q?DBR7ErCHsGQ2UhATKyZgkWSSrZoprzjfIJ2SYhh3?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SJ0PR11MB5069.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 12b346f5-eac9-437a-7821-08dadcce4717 X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Dec 2022 05:52:53.9971 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: YcGJUP1TaAjCNMEAqghNOg95t9v75QydOKURG4naMpAMVsA8mjwK9C5r3AcclI1WdofLc5NL+N1Aq9QbmjrNAw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR11MB5253 Return-Path: min.m.xu@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi, Tom I cannot apply the patch extracted from your mail with the git am command. = So I have to manually port the patch. Please check and test if the patch is= correct. Thanks Min > -----Original Message----- > From: devel@edk2.groups.io On Behalf Of Min Xu > Sent: Tuesday, December 13, 2022 1:48 PM > To: devel@edk2.groups.io > Cc: Tom Lendacky ; Aktas, Erdem > ; James Bottomley ; Yao, > Jiewen ; Xu, Min M ; Gerd > Hoffmann ; Yao, Jiewen > Subject: [edk2-devel] [PATCH V2 3/4] OvmfPkg/IoMmuDxe: Add SEV support > for reserved shared memory >=20 > From: Tom Lendacky >=20 > Add support to use the reserved shared memory within the IoMmu library. > This improves boot times for all SEV guests, with SEV-SNP benefiting the = most > as it avoids the page state change call to the hypervisor. >=20 > Cc: Erdem Aktas > Cc: James Bottomley > Cc: Jiewen Yao > Cc: Min Xu > Cc: Gerd Hoffmann > Acked-by: Jiewen Yao > Signed-off-by: Tom Lendacky > --- > OvmfPkg/IoMmuDxe/CcIoMmu.c | 81 +++++++++++++++++----------------- > OvmfPkg/IoMmuDxe/IoMmuBuffer.c | 54 ++++++++++++++++++----- > 2 files changed, 83 insertions(+), 52 deletions(-) >=20 > diff --git a/OvmfPkg/IoMmuDxe/CcIoMmu.c > b/OvmfPkg/IoMmuDxe/CcIoMmu.c index 1479af469881..e5cbf037c50d > 100644 > --- a/OvmfPkg/IoMmuDxe/CcIoMmu.c > +++ b/OvmfPkg/IoMmuDxe/CcIoMmu.c > @@ -223,30 +223,33 @@ IoMmuMap ( > goto FreeMapInfo; > } >=20 > - if (CC_GUEST_IS_SEV (PcdGet64 (PcdConfidentialComputingGuestAttr))) { > - // > - // Clear the memory encryption mask on the plaintext buffer. > - // > - Status =3D MemEncryptSevClearPageEncMask ( > - 0, > - MapInfo->PlainTextAddress, > - MapInfo->NumberOfPages > - ); > - } else if (CC_GUEST_IS_TDX (PcdGet64 > (PcdConfidentialComputingGuestAttr))) { > + if (MapInfo->ReservedMemBitmap =3D=3D 0) { > // > // Set the memory shared bit. > // If MapInfo->ReservedMemBitmap is 0, it means the bounce buffer is > not allocated > // from the pre-allocated shared memory, so it must be converted to > shared memory here. > // > - if (MapInfo->ReservedMemBitmap =3D=3D 0) { > + if (CC_GUEST_IS_SEV (PcdGet64 (PcdConfidentialComputingGuestAttr))) = { > + // > + // Clear the memory encryption mask on the plaintext buffer. > + // > + Status =3D MemEncryptSevClearPageEncMask ( > + 0, > + MapInfo->PlainTextAddress, > + MapInfo->NumberOfPages > + ); > + } else if (CC_GUEST_IS_TDX (PcdGet64 > (PcdConfidentialComputingGuestAttr))) { > + // > + // Set the memory shared bit. > + // > Status =3D MemEncryptTdxSetPageSharedBit ( > 0, > MapInfo->PlainTextAddress, > MapInfo->NumberOfPages > ); > + } else { > + ASSERT (FALSE); > } > - } else { > - ASSERT (FALSE); > } >=20 > ASSERT_EFI_ERROR (Status); > @@ -396,30 +399,30 @@ IoMmuUnmapWorker ( > break; > } >=20 > - if (CC_GUEST_IS_SEV (PcdGet64 (PcdConfidentialComputingGuestAttr))) { > - // > - // Restore the memory encryption mask on the area we used to hold th= e > - // plaintext. > - // > - Status =3D MemEncryptSevSetPageEncMask ( > - 0, > - MapInfo->PlainTextAddress, > - MapInfo->NumberOfPages > - ); > - } else if (CC_GUEST_IS_TDX (PcdGet64 > (PcdConfidentialComputingGuestAttr))) { > - // > - // Restore the memory shared bit mask on the area we used to hold th= e > - // plaintext. > - // > - if (MapInfo->ReservedMemBitmap =3D=3D 0) { > + if (MapInfo->ReservedMemBitmap =3D=3D 0) { > + if (CC_GUEST_IS_SEV (PcdGet64 (PcdConfidentialComputingGuestAttr))) = { > + // > + // Restore the memory encryption mask on the area we used to hold = the > + // plaintext. > + // > + Status =3D MemEncryptSevSetPageEncMask ( > + 0, > + MapInfo->PlainTextAddress, > + MapInfo->NumberOfPages > + ); > + } else if (CC_GUEST_IS_TDX (PcdGet64 > (PcdConfidentialComputingGuestAttr))) { > + // > + // Restore the memory shared bit mask on the area we used to hold = the > + // plaintext. > + // > Status =3D MemEncryptTdxClearPageSharedBit ( > 0, > MapInfo->PlainTextAddress, > MapInfo->NumberOfPages > ); > + } else { > + ASSERT (FALSE); > } > - } else { > - ASSERT (FALSE); > } >=20 > ASSERT_EFI_ERROR (Status); > @@ -924,16 +927,14 @@ InstallIoMmuProtocol ( > } >=20 > // > - // Currently only Tdx guest support Reserved shared memory for DMA > operation. > + // For CC guests, use reserved shared memory for DMA operation. > // > - if (CC_GUEST_IS_TDX (PcdGet64 (PcdConfidentialComputingGuestAttr))) { > - mReservedSharedMemSupported =3D TRUE; > - Status =3D IoMmuInitReservedSharedMem (); > - if (EFI_ERROR (Status)) { > - mReservedSharedMemSupported =3D FALSE; > - } else { > - DEBUG ((DEBUG_INFO, "%a: Feature of reserved memory for DMA is > supported.\n", __FUNCTION__)); > - } > + mReservedSharedMemSupported =3D TRUE; > + Status =3D IoMmuInitReservedSharedMem (); > + if (EFI_ERROR (Status)) { > + mReservedSharedMemSupported =3D FALSE; } else { > + DEBUG ((DEBUG_INFO, "%a: Feature of reserved memory for DMA is > + supported.\n", __FUNCTION__)); > } >=20 > return EFI_SUCCESS; > diff --git a/OvmfPkg/IoMmuDxe/IoMmuBuffer.c > b/OvmfPkg/IoMmuDxe/IoMmuBuffer.c index 1e77d8a57402..3139d10f4c2d > 100644 > --- a/OvmfPkg/IoMmuDxe/IoMmuBuffer.c > +++ b/OvmfPkg/IoMmuDxe/IoMmuBuffer.c > @@ -9,7 +9,9 @@ > #include > #include > #include > +#include > #include > +#include > #include > #include "IoMmuInternal.h" >=20 > @@ -139,6 +141,7 @@ IoMmuInitReservedSharedMem ( > UINTN TotalPages; > IOMMU_RESERVED_MEM_RANGE *MemRange; > EFI_PHYSICAL_ADDRESS PhysicalAddress; > + UINT64 SharedAddress; >=20 > if (!mReservedSharedMemSupported) { > return EFI_UNSUPPORTED; > @@ -163,12 +166,25 @@ IoMmuInitReservedSharedMem ( > MemRange->StartAddressOfMemRange =3D PhysicalAddress; >=20 > for (Index2 =3D 0; Index2 < MemRange->Slots; Index2++) { > - Status =3D MemEncryptTdxSetPageSharedBit ( > - 0, > - (UINT64)(UINTN)(MemRange->StartAddressOfMemRange + Inde= x2 > * SIZE_OF_MEM_RANGE (MemRange) + MemRange->HeaderSize), > - EFI_SIZE_TO_PAGES (MemRange->DataSize) > - ); > - ASSERT (!EFI_ERROR (Status)); > + SharedAddress =3D (UINT64)(UINTN)(MemRange- > >StartAddressOfMemRange > + + Index2 * SIZE_OF_MEM_RANGE (MemRange) + MemRange->HeaderSize); > + > + if (CC_GUEST_IS_SEV (PcdGet64 (PcdConfidentialComputingGuestAttr))= ) > { > + Status =3D MemEncryptSevClearPageEncMask ( > + 0, > + SharedAddress, > + EFI_SIZE_TO_PAGES (MemRange->DataSize) > + ); > + ASSERT (!EFI_ERROR (Status)); > + } else if (CC_GUEST_IS_TDX (PcdGet64 > (PcdConfidentialComputingGuestAttr))) { > + Status =3D MemEncryptTdxSetPageSharedBit ( > + 0, > + SharedAddress, > + EFI_SIZE_TO_PAGES (MemRange->DataSize) > + ); > + ASSERT (!EFI_ERROR (Status)); > + } else { > + ASSERT (FALSE); > + } > } >=20 > PhysicalAddress +=3D (MemRange->Slots * SIZE_OF_MEM_RANGE > (MemRange)); @@ -190,16 +206,30 @@ > IoMmuReleaseReservedSharedMem ( > EFI_STATUS Status; > UINT32 Index1, Index2; > IOMMU_RESERVED_MEM_RANGE *MemRange; > + UINT64 SharedAddress; >=20 > for (Index1 =3D 0; Index1 < ARRAY_SIZE (mReservedMemRanges); Index1++)= { > MemRange =3D &mReservedMemRanges[Index1]; > for (Index2 =3D 0; Index2 < MemRange->Slots; Index2++) { > - Status =3D MemEncryptTdxClearPageSharedBit ( > - 0, > - (UINT64)(UINTN)(MemRange->StartAddressOfMemRange + Inde= x2 > * SIZE_OF_MEM_RANGE (MemRange) + MemRange->HeaderSize), > - EFI_SIZE_TO_PAGES (MemRange->DataSize) > - ); > - ASSERT (!EFI_ERROR (Status)); > + SharedAddress =3D (UINT64)(UINTN)(MemRange- > >StartAddressOfMemRange > + + Index2 * SIZE_OF_MEM_RANGE (MemRange) + MemRange->HeaderSize); > + > + if (CC_GUEST_IS_SEV (PcdGet64 (PcdConfidentialComputingGuestAttr))= ) > { > + Status =3D MemEncryptSevSetPageEncMask ( > + 0, > + SharedAddress, > + EFI_SIZE_TO_PAGES (MemRange->DataSize) > + ); > + ASSERT (!EFI_ERROR (Status)); > + } else if (CC_GUEST_IS_TDX (PcdGet64 > (PcdConfidentialComputingGuestAttr))) { > + Status =3D MemEncryptTdxClearPageSharedBit ( > + 0, > + SharedAddress, > + EFI_SIZE_TO_PAGES (MemRange->DataSize) > + ); > + ASSERT (!EFI_ERROR (Status)); > + } else { > + ASSERT (FALSE); > + } > } > } >=20 > -- > 2.29.2.windows.2 >=20 >=20 >=20 >=20 >=20