From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mx.groups.io with SMTP id smtpd.web10.191796.1673945104242176835 for ; Tue, 17 Jan 2023 00:45:04 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=YOW05U3w; spf=pass (domain: intel.com, ip: 134.134.136.20, mailfrom: jiaxin.wu@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673945104; x=1705481104; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=J2/M6N6QeunOHQPiaL3ZyBxrEiiG7y5r3ZyYENPmlC4=; b=YOW05U3wopJiYkpcqDi+6/hU3mJGT4Q61zC0zvIZwYcKyGpGNRQDROoY YxvOA61fY9Viq92jwN+wHiXFmLnaZ7FtiZPjqnqx4+U5+vNNalofinz0k XeCqQsrCKgFNszvAq1J5LuITAFN/naHUbKl5Ez95p/F2BOgfwtQCsk6wc rNR1y/XT1HpZDgfxzlPNNHl9vIwV1p4kdFRunym2cqtx8roL8yAdx076q ++I4UkYG/MWbbpCcbxhSIcYjdR18lnWTXk+tJ0Sxa9qqBSMRONGQUWE+w 8RXIA1GyXg/RAifd2WK27mrE9RGIh1aqRXiY8x4PAYW6vT764KJwdna7i Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10592"; a="312508413" X-IronPort-AV: E=Sophos;i="5.97,222,1669104000"; d="scan'208";a="312508413" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Jan 2023 00:45:03 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10592"; a="904571136" X-IronPort-AV: E=Sophos;i="5.97,222,1669104000"; d="scan'208";a="904571136" Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by fmsmga006.fm.intel.com with ESMTP; 17 Jan 2023 00:45:03 -0800 Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) by ORSMSX601.amr.corp.intel.com (10.22.229.14) 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 00:45:03 -0800 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX611.amr.corp.intel.com (10.22.229.24) 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 00:45:02 -0800 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx610.amr.corp.intel.com (10.22.229.23) 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 00:45:02 -0800 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (104.47.70.105) by edgegateway.intel.com (134.134.137.102) 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 00:45:02 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=keMXYgBTu3ZCMGadqJ8TxC6D9lNeB5uAn8B32M8gXsO1qWjpUEGe3qQeqAGQva5c+KvD0Dlve1mojX9FFJv2YbJ4V2YJeoLb9BmNCUpuGfWiok+xmjIsAY/ClPmx2u11tmAbqv1Wp8Mapp22tRDi6Q8JfDTcOMerrwLNnu5Ih6ssmn4wK54s94ulDN9aBUURQjnZ7DsHelYFKPSZ6MsxNiN4RKItT8j2T2BnjhRhYh3MkkYtes5m564tOLp0ryJDFj3vy9WJiynlC3SNe6EN5vcdOMuTKIssF0yYH6CYHX1fcJMqUWZwgaG6vNVcVVdvmaIxXrejtRYVm93IEy8jYw== 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=fMyZoz8m10J89EgAdXod/oF3qe1UFddpD7BXdQGBd4Q=; b=akpC1cDXbMfJkhtxjyU6akJhXc7/6TDXLRuSqmZLT4uUhr7bIIX3qVIFWaZNgWfyyiLXQ2FJEU1PNmsZ1wGvQltK9wxDac4c4wStGtpXl+D28H4z7lSxjZLSwsSjZUF4ahoqTIjZwrcEADis/vBgDbi9Vbery+986SQ7hJFDL0s2o11+DR+XsPqTOE2vV1BFlbFXvY1u+PX4UFjSLN4pCfsbLEW8YxYZ2zga7nuvP13Jr/4edctH0VzCVHIwq91+5j2+qxoKJNf0KDJ1fwmh0ND4ri1aDi+oD1omVo6ggqwKLAxNZpCaDczEyFnOAPkO/e3ByWeihYy0slUFSILGyA== 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 MN0PR11MB6158.namprd11.prod.outlook.com (2603:10b6:208:3ca::18) by DS0PR11MB6542.namprd11.prod.outlook.com (2603:10b6:8:d2::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5986.18; Tue, 17 Jan 2023 08:44:59 +0000 Received: from MN0PR11MB6158.namprd11.prod.outlook.com ([fe80::e5d9:d16e:172b:aa01]) by MN0PR11MB6158.namprd11.prod.outlook.com ([fe80::e5d9:d16e:172b:aa01%5]) with mapi id 15.20.5986.023; Tue, 17 Jan 2023 08:44:59 +0000 From: "Wu, Jiaxin" To: "devel@edk2.groups.io" , "Zeng, Star" , "Liu, Zhiguang" CC: "Ni, Ray" , "Kumar, Rahul R" , "Dong, Eric" , "Tan, Dun" Subject: Re: [edk2-devel] [PATCH] UefiCpuPkg: Fix SMM code hangs when InitPaging Thread-Topic: [edk2-devel] [PATCH] UefiCpuPkg: Fix SMM code hangs when InitPaging Thread-Index: AQHZH/9UthWaQEHHfEmjsdKUqiZxUq6avhmAgAehsZA= Date: Tue, 17 Jan 2023 08:44:59 +0000 Message-ID: References: <20230104054118.280-1-zhiguang.liu@intel.com> In-Reply-To: Accept-Language: zh-CN, 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: MN0PR11MB6158:EE_|DS0PR11MB6542:EE_ x-ms-office365-filtering-correlation-id: 2ec8fdf5-a78c-4085-eb14-08daf8671e23 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: pRIouMbFo1zvgeBztE3aQAq+LUgx8EUb7DijTh1ICFNXjziUKiHFi1mCvpMnjc/Iz5O5F/kYkdltkVHA72IaIrb41wrskB7bNHRg6+fUWYQRU9pI3G/iVqm1pEvnFW6xGBPZSsL4D9Rv8rFq5q73INlBKXaqtcSR83lhIttvlXoJS3WRJLYsZHZlEfLgP3PYWNgTXDdaNk9WAXPhC7WMBRPdzHq4KMd4hUsfFBRgMPFVxjJBiRLuXcoRlM1H8j4gYtOX+wVmt0R/G08F3Gw8cxbdOIfOgAk39wj9VtVc/XXUd5lIPwsaeSdOwQi66DjFk5ix8GR2r1LWQU4mIlZQwwjPF9sz2xH+T7KZPAmnjLtSHhje1utbPumxfZUC2AcVjzGT9fDuHiPVoAtB2whbs3xqMSLQmweWs/G2/pCdmItYblfW0cMmQ45O8OQHTpoHBOk2nIdzyttH10Po5GuunlSsFEZ/x/+bo6bikUJS4FX4Z3pjxMGjodfWaeSyiAyxKBvi65bvK2uqoo2a+HktinNFUlRjDMO+6KvL2o2RE4I0HuCtDwnNqP7zzZsV7i72T8V4BHSVuZZiSWSR8tP21KPrbefXIlF8yUqTHhWhBKrMiYFy2X3NI6DjQP/Z7opjXGokif8rSAtxq7lu0oS29wDfT6K9kwRWrKm2gN3G11iYBv9jiInBU/mXCVBE5DK/x7wNJEBf9tt3dSGnyLmwi9wCxt0SY34OiV5jbsnyZz8MVFvXeCXwJH8kAKWR2Bwwho0TGYiyg5I6ZUH3DU3bkg== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MN0PR11MB6158.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(136003)(366004)(376002)(39860400002)(396003)(346002)(451199015)(107886003)(86362001)(6506007)(41300700001)(53546011)(122000001)(66899015)(478600001)(8676002)(38070700005)(966005)(9686003)(82960400001)(26005)(5660300002)(7696005)(8936002)(38100700002)(186003)(33656002)(66446008)(83380400001)(4326008)(76116006)(71200400001)(52536014)(66946007)(2906002)(19627235002)(55016003)(66556008)(316002)(66476007)(54906003)(64756008)(110136005)(6636002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?DYM7ted5Mg5y5+CjTTEQCtpnZvH5ymam8h68VBDymZr6bqiB0JNu1xMoNA2n?= =?us-ascii?Q?ZRUc03YXEwV6x0IZd8ZZswXLzOKCQBOpmjkW7LyjnoA4FEa2gymhv/dUM6sU?= =?us-ascii?Q?xl3FpEq6GLWVqF862tflUAfWt+PwmFIS2QPT+Cnrrye3QHU2Q5PpH2ucv0Qr?= =?us-ascii?Q?uz6mTZ6kz+W/RMrwUbdprYpFTMGFj1G5Q8giV52jRIcGrnCpB6RTMXJ+knuo?= =?us-ascii?Q?8sYxx/NmJ1MEbu1e7Tat39REWCj4IxmHUZ8kITS4C6OhJodByZO0ZapJKJJI?= =?us-ascii?Q?nVha0DuRNL1NcHUQi6IyOrHrAB4Du36PpeCEdpSBKb/aM6JgLlH+7ATdvgzR?= =?us-ascii?Q?gUvTIhBZwkw6aANCISVAPpbks4BWftuKm3rg8hTTd4kn9GJlShg+OYApTMQ2?= =?us-ascii?Q?VtmWMOnpHw0yCccb5KYqZ99OpOv8DxYz/3vDDSwXHv3XPGOYN52zEAyPVl+2?= =?us-ascii?Q?x+8N3oYuaXV2/Z5tU5uIpkpEJuBGCmmhnWxM/7PRskcvYjApDuqPE0f65qtR?= =?us-ascii?Q?EbNSLs6xefVfqgP/1KuhCrJakkgBHUBlF0JZQxUySycCCqEmH8+A3UaJROi2?= =?us-ascii?Q?c96z0B89QVcRXMFq8SDIrBIOd91HBWApnITR6cj70S3NEU255ZfX8Z2w2lSh?= =?us-ascii?Q?IhmjM1/R2aLZ2g+Ujic4v4R4aEPUCDvzITZMOtvn+rDW9RmmTdNK+7IpWSCM?= =?us-ascii?Q?neSdn4wSOQYKGXEo9eZiC/AdGVvJXRbFGlI6bkJ9HfMdcVOJQaXb/axQ32at?= =?us-ascii?Q?FOiEUjfuLW53e2Vs08MxFQrMXzoY70iY0i6FQ9JqtDIyoFE2Y0Tz201aSxpH?= =?us-ascii?Q?4Llg6jSvXNNVr0pzBV/WFi6oR48+eaFJ4rjhr79nMPlxTagOJWbRfCVY7Co5?= =?us-ascii?Q?9SchKSf6rHxuo9RYhL7dKspCMkfYIp52jBvKM6sP7F0Db+CdwCuqQtGLgz4x?= =?us-ascii?Q?4aUoIxgyaRww+h9h2aazKo7bpuiqLlcdys0ADEbE9BUte4jNFgJLzoktSFlt?= =?us-ascii?Q?h063k5uOkWTxb1xaqMt7gLLyMBO6silqPzDFu168pryen3+wO803bU6hIIzQ?= =?us-ascii?Q?8BC1Rvihfuv3yQMRxcTR4g4A1iGCfWASfIY1P2/VREXZjyC8Z/oHyr16u3Rk?= =?us-ascii?Q?sBbZYQWUv6Jfh9tTsFMFHd6kbv+jnZ6S7PdcCDaIWDJl8/sTKakiOf6ucOkM?= =?us-ascii?Q?YJYNzXivpNnuaFNaPYBnCM0BFvqtidxtsSwerFk+bU9BjvtwQ+KS+AxLauMf?= =?us-ascii?Q?roexX+uGKUKkCdtN8M8fkMKPkPZMOdGaBI1mqT0Eat+yDvuT4HZDIJIHEunz?= =?us-ascii?Q?YNfra1nDTQLPtsMd2GPFaLcL6vPNtZ5QV61MxXRg6eVq5zSzqER51ADUKaDZ?= =?us-ascii?Q?z+sG1smSHIpny7AVSBEs2cKpypS97A/7EI8uBFqdGu8HSItmuj3zkWoN4JG8?= =?us-ascii?Q?Hpx3tI4GghefGjGEIYlQrUvbGWCpIi03/faqLjWWdpvFFybvPv+1WPkZEMfP?= =?us-ascii?Q?yP6IpRwNd6a7FYcuqH2hTSv4F7koarE+ln+nurb7srwiZvZBytcH6lWLgLOG?= =?us-ascii?Q?VKqiBaWtWgQyL0VNI+jBREIIfRQ+kw1Y+oml6UrK?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN0PR11MB6158.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2ec8fdf5-a78c-4085-eb14-08daf8671e23 X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Jan 2023 08:44:59.7180 (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: lh8Hi628HLHd3nEOytAwuyRLqd0BEfRS36MpIv1dHAdfTi/cxypUdLcTaIAfduklr0PjSQMghhTreGpq4dUjFw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR11MB6542 Return-Path: jiaxin.wu@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Wu, Jiaxin > -----Original Message----- > From: devel@edk2.groups.io On Behalf Of Zeng, > Star > Sent: Thursday, January 12, 2023 8:12 PM > To: devel@edk2.groups.io; Liu, Zhiguang > Cc: Ni, Ray ; Kumar, Rahul R ; > Dong, Eric ; Tan, Dun ; Zeng, > Star > Subject: Re: [edk2-devel] [PATCH] UefiCpuPkg: Fix SMM code hangs when > InitPaging >=20 > Reviewed-by: Star Zeng >=20 > -----Original Message----- > From: devel@edk2.groups.io On Behalf Of > Zhiguang Liu > Sent: Wednesday, January 4, 2023 1:41 PM > To: devel@edk2.groups.io > Cc: Liu, Zhiguang ; Ni, Ray ; > Kumar, Rahul R ; Dong, Eric > Subject: [edk2-devel] [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/PiSmmCpuDxeSmm/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 : > SizeOfMemorySpace; > NumberOfPml4Entries =3D 1; > if (SizeOfMemorySpace > 39) { > NumberOfPml4Entries =3D (UINTN)LShiftU64 (1, SizeOfMemorySpace - 3= 9); > -- > 2.31.1.windows.1 >=20 >=20 >=20 >=20 >=20 >=20 >=20 >=20 >=20 >=20