From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.65; helo=mga03.intel.com; envelope-from=ruiyu.ni@intel.com; receiver=edk2-devel@lists.01.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id DDA8121163DEA for ; Mon, 8 Oct 2018 19:14:45 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Oct 2018 19:14:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,358,1534834800"; d="scan'208";a="79842752" Received: from ray-dev.ccr.corp.intel.com (HELO [10.239.9.11]) ([10.239.9.11]) by orsmga008.jf.intel.com with ESMTP; 08 Oct 2018 19:14:43 -0700 To: "Dong, Eric" , "edk2-devel@lists.01.org" Cc: Laszlo Ersek , "Wang, Jian J" References: <20181009015118.13856-1-eric.dong@intel.com> From: "Ni, Ruiyu" Message-ID: <06befab9-cbd6-59ab-c85e-deab4002824c@Intel.com> Date: Tue, 9 Oct 2018 10:15:51 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: Subject: Re: [Patch] UefiCpuPkg/S3Resume2Pei: disable paging before creating new page table. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Oct 2018 02:14:46 -0000 Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit On 10/9/2018 10:05 AM, Dong, Eric wrote: > Add BZ link for this issue: https://bugzilla.tianocore.org/show_bug.cgi?id=1232 > > Thanks, > Eric > >> -----Original Message----- >> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of >> Eric Dong >> Sent: Tuesday, October 9, 2018 9:51 AM >> To: edk2-devel@lists.01.org >> Cc: Ni, Ruiyu ; Laszlo Ersek >> Subject: [edk2] [Patch] UefiCpuPkg/S3Resume2Pei: disable paging before >> creating new page table. >> >> PEI Stack Guard needs to enable paging. This might cause #GP in the >> transition from 32-bit PEI to 64-bit SMM due to the code trying to write CR3 >> register with PML4 page table while the processor is enabled with PAE paging. >> >> Simply disabling paging before updating CR3 can solve this conflict. >> >> Change-Id: I99bfdba5daa48a95a4c4ef97eeca1af086558957 >> Cc: Ruiyu Ni >> Cc: Laszlo Ersek >> Cc: Jian J Wang >> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off- >> by:Eric Dong >> Signed-off-by: Eric Dong >> --- >> UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c | 7 +++++++ >> UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf | 1 + >> 2 files changed, 8 insertions(+) >> >> diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c >> b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c >> index f164c1713b..b3bf56e13d 100644 >> --- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c >> +++ b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume.c >> @@ -1105,6 +1105,13 @@ S3RestoreConfig2 ( >> // >> SetInterruptState (InterruptStatus); >> >> + if (PcdGetBool (PcdCpuStackGuard)) { >> + // >> + // Paging already been enabled, to avoid conflict configuration, >> + // disable paging first anyway. >> + // >> + AsmWriteCr0 (AsmReadCr0 () & (~BIT31)); >> + } Two comments: 1. We'd better not map the PcdCpuStackGuard to paging-enable. Maybe some other feature also enables the paging in PEI phase but the PcdCpuStackGuard is FALSE. 2. When PEI is in 64bit mode, disabling paging may not work because paging-enable is a must in 64bit mode. >> AsmWriteCr3 ((UINTN)SmmS3ResumeState->SmmS3Cr3); >> >> // >> diff --git a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf >> b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf >> index 6ce1bf944c..0f131d19df 100644 >> --- a/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf >> +++ b/UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf >> @@ -90,6 +90,7 @@ >> [Pcd] >> gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable ## >> SOMETIMES_CONSUMES >> >> gEfiMdeModulePkgTokenSpaceGuid.PcdPteMemoryEncryptionAddressOrM >> ask ## CONSUMES >> + gEfiMdeModulePkgTokenSpaceGuid.PcdCpuStackGuard ## >> CONSUMES >> >> [Depex] >> TRUE >> -- >> 2.15.0.windows.1 >> >> _______________________________________________ >> edk2-devel mailing list >> edk2-devel@lists.01.org >> https://lists.01.org/mailman/listinfo/edk2-devel -- Thanks, Ray