From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mx.groups.io with SMTP id smtpd.web10.53179.1673525513449635520 for ; Thu, 12 Jan 2023 04:11:54 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=TPoCOKDT; spf=pass (domain: intel.com, ip: 134.134.136.65, mailfrom: star.zeng@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673525513; x=1705061513; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=+2K+ZjNfKxm8+Hu8jiEYGFm9lZD15ZQ9eM28I9R05tc=; b=TPoCOKDTqaKFVZzRqlUGfGKP9mR4IcORNT9sZEJhkvR566QxVLLXH7p3 T0owQKN23IXyMFXDts6HRS0YQks3XintegfMna2dlxAI3J5zJ/4b0mOMa uMVWhuS5M0Ih3Ps68pf595nPkzozh6nP0Tg9b290W3InkTDevJcftckoq SaPLwl1dnmfzR/TVnUCF13ig+XwgLOY53dEgLgPd7Kocgy9yJAOAvq8nk EmFStYCecHi+lLPcPzhVoEYyw/TCgElaoWN9r9682USvpM//P4r8U36y9 Naexk3AaWTsV3UOjEjwKtVNVF5fKpdqf/6EVATgY+O5G4i44b/Aj7032p g==; X-IronPort-AV: E=McAfee;i="6500,9779,10586"; a="325712087" X-IronPort-AV: E=Sophos;i="5.97,319,1669104000"; d="scan'208";a="325712087" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jan 2023 04:11:52 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10586"; a="781763777" X-IronPort-AV: E=Sophos;i="5.97,319,1669104000"; d="scan'208";a="781763777" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by orsmga004.jf.intel.com with ESMTP; 12 Jan 2023 04:11:52 -0800 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16; Thu, 12 Jan 2023 04:11:52 -0800 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx611.amr.corp.intel.com (10.18.126.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16; Thu, 12 Jan 2023 04:11:51 -0800 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16 via Frontend Transport; Thu, 12 Jan 2023 04:11:51 -0800 Received: from NAM04-DM6-obe.outbound.protection.outlook.com (104.47.73.44) 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; Thu, 12 Jan 2023 04:11:51 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aU5TiGnCCJAaBDxnBAY6EXsnpqz/1C2m7m4cHnpNjPqeVHSsbLD/Hq8tOQ+4ZoR6i2xOzltXyoFj3zAVPRYVnp8Tu41PH1v6zTdhEWV/KatK6mUnd8vHWTF3C9uRaaaYjnbCKBuGWi3dVWFavU9HxdfTg44viSoIX3jwsuo6Y1sSYI+5C13TMdddSHBnk5WwegIT6XZh3h3dW1T6/wvxVQa7ZleLIbsy60szopE+a/MQTRoOtTtmnJTYsghEEFAxJAQWwVlS/UXOGXzvaArsouHgQMB8ijOiAGjY2qT7Z5D0PP+pbEnDhjO0ZwUJalQYTjVaG72LCMwC/t0+jwPQUg== 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=hssYjyxF4BCOwxSNwzuKgPLot0fLtQ5CfHw60LCcREc=; b=M1rKh4WfDgJXSAcA7DEKoAi0qKqYw6PamaXOz0Yq26apR5nvx/se8unvudZJAc3Xwf/F1pG+6IhGZbQMQlYj1BEEX6PKPEgDBFPIPvt6L3SsmZ9s92TBtAZJxmIgkqpRLjB1S4ytin73X4W1YW3gbJKBo+LF4EO6I16MOlWnIDJe9/CJEo0W0mW/622UENc685OhsoF63bBAzxuMapeUUu/JiHucvYJ3beoWti5J34JfFk/0xQliO2Z21/15NLV0FYK5ZkVYgQ0s/2ezOY8cn/H0GBSiVlUfX0JhoPWbrKoDS6WJm/uGxaIJkrjmB3JYQ9tg/soKHB4IsJJ6iee7DA== 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 DM8PR11MB5623.namprd11.prod.outlook.com (2603:10b6:8:25::20) by SN7PR11MB7590.namprd11.prod.outlook.com (2603:10b6:806:348::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5986.18; Thu, 12 Jan 2023 12:11:49 +0000 Received: from DM8PR11MB5623.namprd11.prod.outlook.com ([fe80::a8da:7654:5fe0:593c]) by DM8PR11MB5623.namprd11.prod.outlook.com ([fe80::a8da:7654:5fe0:593c%7]) with mapi id 15.20.6002.013; Thu, 12 Jan 2023 12:11:49 +0000 From: "Zeng, Star" 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 Thread-Topic: [edk2-devel] [PATCH] UefiCpuPkg: Fix SMM code hangs when InitPaging Thread-Index: AQHZH/9WL5ixxMpznE6CaP3grpkt0K6avelw Date: Thu, 12 Jan 2023 12:11:49 +0000 Message-ID: References: <20230104054118.280-1-zhiguang.liu@intel.com> In-Reply-To: <20230104054118.280-1-zhiguang.liu@intel.com> 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: DM8PR11MB5623:EE_|SN7PR11MB7590:EE_ x-ms-office365-filtering-correlation-id: cb584d3e-b0f3-45dd-c702-08daf4962ef3 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: dP688c1XR4yBIOu6hW0ZIEPQfvJy4WhEyfsOcSi8fygUDy/M5UBKU+vek5rOLR6l8lHAzJVpMGcik+TY0ON2UatirF9D2Qo7BV8vLeF5DwVTTsGoJNEbMsBi4c+c1JZMDBeRV+OUeWClCzBcuQfBq4kDhWNiaQjzmd9GO6GDcCf+TlFy1nL15J0Wox4w0QMHvdYtZdfUoP6ck6jQD1pzxvUkoTutgS19YMGxNXUUAj0g123+QdgEoiPCoQ/Xd2qaZjEVl0MYZjJwV+KFmU7Xlxcf9fR18qZkYD5nOmiceg6eINULCdY8tdKtyvXn2QNZYEBGU0lsnItkNbCWgCyec1yJ75c/9zWLanmZ8VAz7nqGMSaVBoWU9KgdyG8SdYtHC6xrbSsO5MK3MkOqw/TFE+RbJpqyLpwip0vf8Kk6YB1rvjtydUsk9NxebeAypRQB/0VMts8Mxg0d+ADZZA32FarkRJyf94ILa5l6jV/weIjBR6tVesyJa794mY2kGzRSHdt9XHBw0wWZCQXQnkpdVlMwf8aEnX0DY6w5IRjkI0IlqmGCGe571VM8aiV5elTJS28JJuwjyG04bV0Pmpr011bE5MpfGake5Khy/lksYi9ldLaj88b0HUl/ba4zrqtCeBnv9Gu7loMJHs5ImkC5BnMFOLnQJeVCM/eINdw4C5IIaUcdfEWE1GWfSrErVWLoj8HccAtHTufe4yU+KdgYwgGDYY0cg9sJyqm4wJS5mepKyFnRfL1WSu9leoiQaL+F8ZmSAKOcMT72IUny6yZRNg== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM8PR11MB5623.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(39860400002)(376002)(346002)(136003)(366004)(396003)(451199015)(33656002)(6506007)(966005)(53546011)(55016003)(9686003)(186003)(26005)(4326008)(66556008)(316002)(7696005)(66446008)(64756008)(66476007)(54906003)(478600001)(76116006)(6636002)(19627235002)(107886003)(110136005)(71200400001)(38070700005)(38100700002)(86362001)(82960400001)(122000001)(83380400001)(41300700001)(66899015)(8676002)(66946007)(52536014)(5660300002)(2906002)(8936002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?CV5F8BMO3cDdiZi9mzMTheK8JIFaeAiKcexxh5e5FMedu1aAyYh10U8Bg9R4?= =?us-ascii?Q?gKVwQ8lVeoxmpSu+sM8rgUIDlP6SW0cp0mstcNT5fmxsXGSc/yC/nt5umvxM?= =?us-ascii?Q?VGJ83ImYT4xj7JC6oJSPJpZmLl2hjlG1L4v82wO+HA/kJxXC94miMCnSF5Cc?= =?us-ascii?Q?+n/QlX9XlX88M7Ts/8dsQrxuNsAMYNfewz+TeICbWrR7PToT3xXWIjWztr8W?= =?us-ascii?Q?ooZzy/co3devVwOHYT4SAGFiLkIDX/RVLS6KRdUR4tICDmXkEY4IcHmElO3K?= =?us-ascii?Q?YSDCMT8HFOTc5Eu7oNGT3tn9+48Q5Rl5iym2Ixz0nR/TR7d0xkdIhM3aLe8y?= =?us-ascii?Q?E5qLpMNEpiCrEl3VvXgSBaapq/7rdfeCmKka9d+ytaUhT3Y5+hNqPrgbU9XN?= =?us-ascii?Q?yBglboKCFHoRlQGaV2o1PWL7oi1pWYEAJHrLfPiwsVw1fByso46qRjFHQyDU?= =?us-ascii?Q?WukGCvPNcZu9ZTPXaMgwFb1/EseHgB32rb8spm2tqt4V5v/DSIA2HMCz7Uli?= =?us-ascii?Q?r4bwnu3tpzKljH7xYQYL928T7afBN8zPADMfoRum+BOXmLwPNMb29Wwe96z/?= =?us-ascii?Q?4pvcx/doqA2y9NIrqiEKe0+9zRb5IibmMhcxN9SzNVwAZqA+mXVeWgd2ruJf?= =?us-ascii?Q?Kwbbn8K7AUI1yY0DGfvrTjt/+nrXhcN3GscGHUFbgqXLfaUBqkZTWAQdRZn3?= =?us-ascii?Q?L6zYHlfIikb+ofwBfWdCpWG16kqCkQlyw5TifTrnQaGlXqh/GI2rAWqn5oUl?= =?us-ascii?Q?6Q5He/Lwyv0HYvwU62y9gMJr44MdtetqR6LNsLvcvF16/6UAL0ZierYY9kjM?= =?us-ascii?Q?TE/lQVN7Pi8nVH2pPTBj8B+nJSpAyBNpYmqXFxlsNzYCgjmTeuApOBO0bKFx?= =?us-ascii?Q?ZBwfvDIxf0Yrxec1rx1gA5pu+bmDxhXgn47eWVmrW0OlwhpfvXkCwAqbZBWm?= =?us-ascii?Q?C/td7kwaiy0q3Z296KR4JDAWwIkIh7lvSDSdg7VvG8BBg+dSL0SKbh4WRqYj?= =?us-ascii?Q?JQdntF/s4E8+F4Y4nwt2SCcGQa5i+/iW598+6A7Lt+KDIe7+dh31bnBEPQr8?= =?us-ascii?Q?d35w6hbJixA5nG9QHdxTUx/QA6jlvvGx3ADO78letnUk0gH+yrLjrjTKSq5l?= =?us-ascii?Q?k3NaBoebfWJIO4WQ0zP3FzJ64dBd3RZ1LgYFLWihPYlrMz59JQx4rm9DPwzK?= =?us-ascii?Q?I1lA/9/6qZ4s/bgUz5eW8AAnjLts7XqAavC6KTf0E6JeXU+o942oKaYGpzrJ?= =?us-ascii?Q?Yqp4XtMx1flLbB+eLlETghZD5Nvs2J7iab9RAiwVL2F0cTpBNCZcl3zq9lsn?= =?us-ascii?Q?CFIo1RaVdLB1GUOppsPC0hcbt5vdFT8n6nPkvnjMwpWMRY5Ynm98LEl8oHIo?= =?us-ascii?Q?gfLiIxLr9RuyDtzKixeMsNx7cZPCR6Z4tkWz4lZeI2F+eGDHT3FeHHC9K+4V?= =?us-ascii?Q?VDUsxz4ZYxdCrFksmLueTVm/kTAY4ynP24oHFU3ERYoePfj9ZbXNSL4lH9pc?= =?us-ascii?Q?uBZRCnRjs3vyZDOfm3xYHpEhiK5SBuSdTqc9Xl7+Gplmn+bUDZqIWht5UDZ+?= =?us-ascii?Q?aEzlQ+dH/kx2DuvrvwbU5OyVuvY44zru7YLZLVQu?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM8PR11MB5623.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: cb584d3e-b0f3-45dd-c702-08daf4962ef3 X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Jan 2023 12:11:49.6033 (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: S3lCarhYU2+k3kekqzwdKumK602slwnePSNsDwmBt7t6Hm2tKjYg7OR4uEzdeb8hc094kS1v4XDiQRU4rFEIDA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR11MB7590 Return-Path: star.zeng@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Star Zeng -----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 ; Kum= ar, Rahul R ; Dong, Eric Subject: [edk2-devel] [PATCH] UefiCpuPkg: Fix SMM code hangs when InitPagin= g REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4246 In function InitPaging, NumberOfPml5Entries is calculated by below code Num= berOfPml5Entries =3D (UINTN)LShiftU64 (1, SizeOfMemorySpace - 48); If the S= izeOfMemorySpace is larger than 48, NumberOfPml5Entries will be larger than= 1. However, this doesn't make sense if the hardware doesn't support 5 leve= l page table. 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(-) diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c b/UefiCpuPkg/PiSmmCpuDx= eSmm/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 @@ InitPag= ing ( } =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 - 48)= ; - SizeOfMemorySpace =3D 48; } =20 + SizeOfMemorySpace =3D SizeOfMemorySpace > 48 ? 48 : SizeOfMemorySpac= e; NumberOfPml4Entries =3D 1; if (SizeOfMemorySpace > 39) { NumberOfPml4Entries =3D (UINTN)LShiftU64 (1, SizeOfMemorySpace - 39)= ; -- 2.31.1.windows.1