From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web10.191972.1673946130543481962 for ; Tue, 17 Jan 2023 01:02:10 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=ELCvGhdu; spf=pass (domain: intel.com, ip: 134.134.136.100, mailfrom: ray.ni@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673946130; x=1705482130; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=VofZSyIXe2PSA9pOnhacxIlSIjhc27h3u0PnSV6zfuY=; b=ELCvGhduUFr/OnQuhXily3cKCS+ex/BsTil0HFKWVhdyR2CV/lAVuTpF e0shj+xrerB9L30CY3SsinM1m5aSlvStp0FN/hIQOluE8XeifF+U6tzhI k6FBPyA9PAIdlYYsHbtPXNPPyx0SeyEK+a5vrbZjPovLNBKy6vfE9WnIT bTDf8oixZdCEZw7j/V3GLU/AG+Sok1WSwo3CYp0j5r9cZFPGAH/VS3PjJ wKQifh/92wHSvAiktSxQ1cd9v7R4BzC6t+4e/xX+QPDCU0LBHmuR6SHMZ Nx9tp+RUq9KLC5csL3Srzm1dIFtu03w5Hg2yVP/jbQVBnhWBuKf6fy7S0 g==; X-IronPort-AV: E=McAfee;i="6500,9779,10592"; a="389146157" X-IronPort-AV: E=Sophos;i="5.97,222,1669104000"; d="scan'208";a="389146157" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jan 2023 01:02:09 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10592"; a="904578519" X-IronPort-AV: E=Sophos;i="5.97,222,1669104000"; d="scan'208";a="904578519" Received: from fmsmsx602.amr.corp.intel.com ([10.18.126.82]) by fmsmga006.fm.intel.com with ESMTP; 17 Jan 2023 01:02:09 -0800 Received: from fmsmsx602.amr.corp.intel.com (10.18.126.82) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16; Tue, 17 Jan 2023 01:02:08 -0800 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16 via Frontend Transport; Tue, 17 Jan 2023 01:02:08 -0800 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (104.47.57.49) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.16; Tue, 17 Jan 2023 01:02:08 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FvfaoRHK/m+mQl9BmgD+Syl8huEKp0vtZxBB3Z1qVRU2zyTb810XM38zM61Kv+hpeEFkLGYXaNqYnM6G+EqC8++varES8aXPw9FZmxCYyXwPv7IDG8rcwHd+S6dBx7057efiJrI76xeFBwPpvd9aFVk35WAx9k2rQT91GaMWV+p8vYoP7CPCrBAuHMJUltAftmO+42o+hyCDGl+LTdk5aMWkLr45cJCY9t3mjs7q1IV3SHDIDFUh66bVKjE85w4eyybgF1nshg62J2xkkVxmMzrK/qQ1s+cPQjGP8KGmtQSbyVwySEuNH2rKkc8JxfIWGAafjcS531EjfLXZ7U20qg== 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=Ms4nYYYRn+ekNtXdIzBc+SBmX7z9oxj/aD+I2bX28Qo=; b=Ev/v4W4RbSW/Ib3dN6RGetLxphkzhy3HWx+qogz2aA4htozuhk4wSdQpd7PRzP3DarwLr2PTC9AONIs7/Ge4V0XpB3RAfQsZPg+du1VGbln6Lleq+RXeBTye86LoxppI2EZFIfgfqmANAy0msQZipL2UXQhsenl60jWLOA9Hg/Mb+c25cmLAn8j0ITM3ZWcsbY8OvcjZ8XYOa+C2CdTtErZ2FY2otBSZYslOEuQDZB75b7jef8RzOAIxsHcZZHU1tqJ043PrrMJfBkprtpG1x8Eya81OnHy0pJbtLHKxUGdu0aS8vBva3ILNqoJ1J+pxnTaliLlbQSIjwaPZGHH+2w== 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 MN6PR11MB8244.namprd11.prod.outlook.com (2603:10b6:208:470::14) by DM4PR11MB6239.namprd11.prod.outlook.com (2603:10b6:8:a7::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5986.19; Tue, 17 Jan 2023 09:02:01 +0000 Received: from MN6PR11MB8244.namprd11.prod.outlook.com ([fe80::f890:e4ec:e2d8:5831]) by MN6PR11MB8244.namprd11.prod.outlook.com ([fe80::f890:e4ec:e2d8:5831%3]) with mapi id 15.20.5986.023; Tue, 17 Jan 2023 09:02:01 +0000 From: "Ni, Ray" To: "Liu, Zhiguang" , "devel@edk2.groups.io" CC: "Kumar, Rahul R" , "Dong, Eric" , 'Gerd Hoffmann' Subject: Re: [PATCH] UefiCpuPkg: Fix SMM code hangs when InitPaging Thread-Topic: [PATCH] UefiCpuPkg: Fix SMM code hangs when InitPaging Thread-Index: AQHZH/9P2T/UYdbjFEWXX0eG9sRu/q6iZKyA Date: Tue, 17 Jan 2023 09:02:01 +0000 Message-ID: References: <20230104054118.280-1-zhiguang.liu@intel.com> In-Reply-To: <20230104054118.280-1-zhiguang.liu@intel.com> 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: MN6PR11MB8244:EE_|DM4PR11MB6239:EE_ x-ms-office365-filtering-correlation-id: 01fd7dfd-c656-4f6b-64b5-08daf8697f39 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: k/BE6vY2ymRWlXjKueDlYidXBbeVtnULeeTEKpwFpg1qjhwsolwfER/EqKT8fcKVYJjzR6ScjQX1kK3komKBoXSfctb4uXs93OrteIN4wqQpegFmLggfoYGcRKkbCgcgq3q0clSmATgu9QRwCa+Iq7LdL/tSfykXx5S8eVWEwoRLm2SbZqRNwNkfA4F9m1/1l/6SUKGx3nNIOXT022i9WXrUVy6sLinIKHx45IVsFtNPC496fWglfVE3bH0VNd3wZAQHkM2Kj8kXTR1XfQ26NPeAdyf3W+9RXVHOyf5hvwhyGpAYJ397aWFRyS0w/do7Gw/9n0QXwCt4A1jTDtOg06wvYy1dslMAfj9JL0BDqSET7LreNGN3+mUodLUlYDe7EvoFqBP0zjzP+RtEg46q1t4UJ97d3DwLUqUJWKjz2P5bcO8nEPR3tFZiUYy3Apu/2QoQRRaBxq1ouiy4vq+Sl3Fn7mnkh+T6M7IabTjBk5BfDgT3VCZ415hGm9MkBrYf00KgiqcFOT69y3pczoafnfapXx/DyvaBJ8AXmWpow8+f4sVukNK+E3Ok88v7LNhMcRfak4rjdnQ1kMUavPjtXxXDLJSsOPyIzNtR/wbmdr82OYnpJcVS2ouo8ca0d0hBpSkCAgIv5ebgklgfwW01sKIO9648cHENMjdQy8XccMVzF6u7Ya2kHNPfbJPq7B+2kEqlQRl2wGynS9G+tO7fIgLJSOXWsNt198jZl2feulo= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MN6PR11MB8244.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(376002)(39860400002)(366004)(396003)(136003)(346002)(451199015)(38070700005)(5660300002)(33656002)(86362001)(8936002)(41300700001)(38100700002)(82960400001)(122000001)(7696005)(966005)(53546011)(71200400001)(478600001)(110136005)(54906003)(83380400001)(52536014)(186003)(9686003)(19627235002)(6506007)(316002)(8676002)(66446008)(66476007)(66556008)(66946007)(26005)(76116006)(4326008)(64756008)(2906002)(55016003);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?7fhi9UlbnLr9HpHNWeR9Z5LkhBlhlpQekfmkiZUS1OszzMmQ3ocBIRaLg05g?= =?us-ascii?Q?4WVIAe6pu+McqhCgGKuGuIP//TScEnYN7ejf67K4kH5wCiQJqTpZCCUrS9LW?= =?us-ascii?Q?1CLZaR8swJ0Bc+yW44+lw2KDnxyMuT+Kr5ZTIaTmpx0yQgfb/+BOBpXkhW/L?= =?us-ascii?Q?VYhwuxJay3W7BZJ6xpub2GN9dHVD6d658hY6LxdAYZ/1qMNAnTrRip9AW9zK?= =?us-ascii?Q?9Mx9Rlzf1niDKz5jP265GvdTl64yiC/UMJH3DtU1Jo1sqoUlpv7aa2oqBOrU?= =?us-ascii?Q?JkswamO64t2XVS2GcBeeFqXr6HsQfXOusUvz5/wKWcoAMnIRuQlbtbOGj26g?= =?us-ascii?Q?VsnDaTnMMOz4fa3hn3zFGvUQbYrq2Q2EiwXZpcmpXdbRYzVXAcGsrx5EeeeD?= =?us-ascii?Q?uMUS86/McKNefsN0bH1yXcZWuJ6uVtTPVwPpSMzK+ffwUyVnURwsU36d81ja?= =?us-ascii?Q?Y+6LboRcDHK9Sel2XAW7TUHzhgMQe7tSGlvfqPZbDo0yJDXWTG2eUiFRgb9N?= =?us-ascii?Q?wTzj4O2kivQyrirNR8LjK+QI6XOBCcv+ueTgA8xe6bPaGfFp6Cv9E/9TJR/0?= =?us-ascii?Q?O20VU+bxoGYsfqk3IiYr9Ny+mg7W3ibaVI2SVga9yXTc7rsSEqm0pS0T+lg/?= =?us-ascii?Q?knLxjJXx9kKPX6pAu7UuLJ2sgjG687fF7G4S8ZP4GosqkzKO5oaqYWmjW2Lg?= =?us-ascii?Q?CF/Q84JbMZlYBQHBQf+GZwab49+mHL8HmKVQkIsfKKzLOKp/2skt047tMfd5?= =?us-ascii?Q?gPQV55T/47gNo4HrK9+hcYfDoYkaV6F6UBJyRUIHRYOQe058DIqCOA5554fT?= =?us-ascii?Q?eP1HlZuXqeiPfrLczI/xK1GTEEsWroV1aA5aPI3HDA5z1E/k39i/9mvjT/hw?= =?us-ascii?Q?C/OISpqsHXsocuqPkUyZXA3v5iBSf908DWS0iJjbmRuQAYwJaZaEzbOucms+?= =?us-ascii?Q?OSCvvbFnX/4LhM9EgHGxBGwPQ2jshWCDESfXHx1+9ZC3BODRksXlmNA0qFOx?= =?us-ascii?Q?xMn2DmlaOyRxcitkbYmLVF/CDPbP+qKZzbrJ5IaqAxyr4BStGAKLb210dWxP?= =?us-ascii?Q?nPHvPLF8ToBTWBOU4oWGBsXJ/05eIWFNi2H8/Ja1PzHHUmkz8zEfFb6FX5t6?= =?us-ascii?Q?DWbw1yVuRFIqPP3BxloNLI6QXsM/jbHUPr7p2dQ8DipUtXEKVSsT5bUutaya?= =?us-ascii?Q?UhFzdNo0JVNRye7mnxbvcVuRrI2C78zkd6CcNAF/kfKtuZ9NhJMhBpcTng0p?= =?us-ascii?Q?gALgvfDdFvIbafYKM7fcWYM7LqzqVTwf30TkabK9CwAiQf7XQw+3ogtrCDnM?= =?us-ascii?Q?OK72iPR7/z92PqhSltDQ8gHW+h0K7EmhJ67CLSNKXnRzCukBrqPy7INXPEyR?= =?us-ascii?Q?wq8r1rz4BV3lMNkUod5UAtglU9qSmug2hCBsqpryFEpxtknyU6ueog89+RDp?= =?us-ascii?Q?C7gQ3JjxpcqlBTiOaTy5AgWs9jwxPdd/4AH0NCSiq1Gp7GN2g6QweSgn0V4+?= =?us-ascii?Q?VSbnCzUbnDtH8e7koOCmtEc/ZtxMyVhZoRTFidXgfFzqMDjciDQ7pDKhfllo?= =?us-ascii?Q?q9P+3Ubkdrb/CKVh1AA=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN6PR11MB8244.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 01fd7dfd-c656-4f6b-64b5-08daf8697f39 X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Jan 2023 09:02:01.5912 (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: JTydgeBleN0k43sw7jbwgwfUogIyCurfx4ROX2bXi/Rd8c2/HFI/QzbknquqQI1zWuBMyiIbxh0X/B3GY0ebQQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR11MB6239 Return-Path: ray.ni@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable + Gerd. > -----Original Message----- > From: Liu, Zhiguang > Sent: Wednesday, January 4, 2023 1:41 PM > To: devel@edk2.groups.io > Cc: Liu, Zhiguang ; Ni, Ray ; K= umar, Rahul R ; Dong, > Eric > Subject: [PATCH] UefiCpuPkg: Fix SMM code hangs when InitPaging >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4246 >=20 > In function InitPaging, NumberOfPml5Entries is calculated by below code > NumberOfPml5Entries =3D (UINTN)LShiftU64 (1, SizeOfMemorySpace - 48); > If the SizeOfMemorySpace is larger than 48, NumberOfPml5Entries will be > larger than 1. However, this doesn't make sense if the hardware doesn't > support 5 level page table. >=20 > Cc: Ray Ni > Cc: Rahul Kumar > Signed-off-by: Eric Dong > Signed-off-by: Zhiguang Liu > --- > UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) >=20 > diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c b/UefiCpuPkg/PiSmmCpu= DxeSmm/SmmProfile.c > index c1efda7126..c597b39b8c 100644 > --- a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c > +++ b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c > @@ -1,7 +1,7 @@ > /** @file > Enable SMM profile. >=20 > -Copyright (c) 2012 - 2019, Intel Corporation. All rights reserved.
> +Copyright (c) 2012 - 2023, Intel Corporation. All rights reserved.
> Copyright (c) 2017 - 2020, AMD Incorporated. All rights reserved.
>=20 > SPDX-License-Identifier: BSD-2-Clause-Patent > @@ -587,15 +587,17 @@ InitPaging ( > } >=20 > SizeOfMemorySpace =3D HighBitSet64 (gPhyMask) + 1; > + ASSERT (SizeOfMemorySpace <=3D 52); > + > // > - // Calculate the table entries of PML4E and PDPTE. > + // Calculate the table entries of PML5E, PML4E and PDPTE. > // > NumberOfPml5Entries =3D 1; > - if (SizeOfMemorySpace > 48) { > + if (Enable5LevelPaging && (SizeOfMemorySpace > 48)) { > NumberOfPml5Entries =3D (UINTN)LShiftU64 (1, SizeOfMemorySpace - 4= 8); > - SizeOfMemorySpace =3D 48; > } >=20 > + SizeOfMemorySpace =3D SizeOfMemorySpace > 48 ? 48 : SizeOfMemorySp= ace; > NumberOfPml4Entries =3D 1; > if (SizeOfMemorySpace > 39) { > NumberOfPml4Entries =3D (UINTN)LShiftU64 (1, SizeOfMemorySpace - 3= 9); > -- > 2.31.1.windows.1