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.31; helo=mga06.intel.com; envelope-from=jian.j.wang@intel.com; receiver=edk2-devel@lists.01.org Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (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 7ECE421A07A92; Mon, 8 Oct 2018 19:04:38 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Oct 2018 19:04:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,358,1534834800"; d="scan'208";a="239651369" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by orsmga004.jf.intel.com with ESMTP; 08 Oct 2018 19:04:24 -0700 Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 8 Oct 2018 19:04:23 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.111]) by SHSMSX104.ccr.corp.intel.com ([169.254.5.183]) with mapi id 14.03.0319.002; Tue, 9 Oct 2018 10:03:29 +0800 From: "Wang, Jian J" To: edk2-devel , "Dong, Eric" , "edk2-devel@lists.01.org" CC: "Ni, Ruiyu" , Laszlo Ersek Thread-Topic: [Patch] UefiCpuPkg/S3Resume2Pei: disable paging before creating new page table. Thread-Index: AQHUX3Lo/p0D6eeeuUuytcYZ155Fe6UWKEeAgAAAujA= Date: Tue, 9 Oct 2018 02:03:28 +0000 Message-ID: References: <20181009015118.13856-1-eric.dong@intel.com> In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZThiMjNkZDMtZjE3Yy00MTYyLWE4NGYtNzQ1Nzc2OWVmMWE1IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoibFNxdXlGSXVQeG1CWDR6Zk9NM1wvdWhRWWJ5UlAxbGRjWlFMd2hjVDBvK0FaZnNlVERjZlpNUTU3NDMyNTBvWDYifQ== x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 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:04:38 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Forgot one thing: this issue is caused by introducing of PEI stack guard so= please add the revision id of related check in for references in message. Regards, Jian > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] > Sent: Tuesday, October 09, 2018 9:59 AM > To: Dong, Eric ; edk2-devel@lists.01.org > Cc: Ni, Ruiyu ; Laszlo Ersek > Subject: Re: [edk2] [Patch] UefiCpuPkg/S3Resume2Pei: disable paging befor= e > creating new page table. >=20 > Thanks for fixing this issue. >=20 > Reviewed-by: Jian J Wang >=20 > > -----Original Message----- > > From: Dong, Eric > > Sent: Tuesday, October 09, 2018 9:51 AM > > To: edk2-devel@lists.01.org > > Cc: Ni, Ruiyu ; Laszlo Ersek ; W= ang, > > Jian J > > Subject: [Patch] UefiCpuPkg/S3Resume2Pei: disable paging before creatin= g > 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 configuratio= n, > > + // disable paging first anyway. > > + // > > + AsmWriteCr0 (AsmReadCr0 () & (~BIT31)); > > + } > > 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.PcdPteMemoryEncryptionAddressOrMask > > ## CONSUMES > > + gEfiMdeModulePkgTokenSpaceGuid.PcdCpuStackGuard = ## > > CONSUMES > > > > [Depex] > > TRUE > > -- > > 2.15.0.windows.1 >=20 > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel