From: Laszlo Ersek <lersek@redhat.com>
To: "Ni, Ruiyu" <ruiyu.ni@Intel.com>,
"Dong, Eric" <eric.dong@intel.com>,
"edk2-devel@lists.01.org" <edk2-devel@lists.01.org>
Subject: Re: [Patch] UefiCpuPkg/S3Resume2Pei: disable paging before creating new page table.
Date: Tue, 9 Oct 2018 10:09:10 +0200 [thread overview]
Message-ID: <f3ef94b8-47c7-3ec8-ba5d-3f0f46fee3b9@redhat.com> (raw)
In-Reply-To: <06befab9-cbd6-59ab-c85e-deab4002824c@Intel.com>
On 10/09/18 04:15, Ni, Ruiyu wrote:
> 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 <ruiyu.ni@intel.com>; Laszlo Ersek <lersek@redhat.com>
>>> 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 <ruiyu.ni@intel.com>
>>> Cc: Laszlo Ersek <lersek@redhat.com>
>>> Cc: Jian J Wang <jian.j.wang@intel.com>
>>> Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-
>>> by:Eric Dong <eric.dong@intel.com>
>>> Signed-off-by: Eric Dong <eric.dong@intel.com>
>>> ---
>>> 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.
I think I agree.
> 2. When PEI is in 64bit mode, disabling paging may not work because
> paging-enable is a must in 64bit mode.
I think this case is academic. S3Resume2Pei does not support 64-bit PEI
with SMM enabled. This is why we have commit 5133d1f1d297 ("OvmfPkg:
replace README fine print about X64 SMM S3 with PlatformPei check",
2015-11-30) in OVMF.
Anyway, I'm making this comment in the general sense only. I'm not
suggesting that we disable paging unconditionally. Actually, I believe,
I will suggest (under the v3 posting) restricting the write to CR0 even
more.
Thanks!
Laszlo
>
>>> 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
>
>
next prev parent reply other threads:[~2018-10-09 8:09 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-09 1:51 [Patch] UefiCpuPkg/S3Resume2Pei: disable paging before creating new page table Eric Dong
2018-10-09 1:59 ` Wang, Jian J
2018-10-09 2:03 ` Wang, Jian J
2018-10-09 2:27 ` Dong, Eric
2018-10-09 2:05 ` Dong, Eric
2018-10-09 2:15 ` Ni, Ruiyu
2018-10-09 8:09 ` Laszlo Ersek [this message]
2018-10-09 8:26 ` Ni, Ruiyu
2018-10-09 8:54 ` Laszlo Ersek
-- strict thread matches above, loose matches on Subject: below --
2018-10-10 7:43 Eric Dong
2018-10-10 7:58 ` Yao, Jiewen
2018-10-10 13:03 ` Laszlo Ersek
2018-10-10 13:14 ` Yao, Jiewen
2018-10-10 13:19 ` Laszlo Ersek
2018-10-10 13:30 ` Yao, Jiewen
2018-10-10 14:00 ` Laszlo Ersek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f3ef94b8-47c7-3ec8-ba5d-3f0f46fee3b9@redhat.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox