From: "Dandan Bi" <dandan.bi@intel.com>
To: "Gao, Liming" <liming.gao@intel.com>,
"devel@edk2.groups.io" <devel@edk2.groups.io>
Cc: Mike Turner <miketur@microsoft.com>,
"Wang, Jian J" <jian.j.wang@intel.com>,
"Wu, Hao A" <hao.a.wu@intel.com>,
Laszlo Ersek <lersek@redhat.com>
Subject: Re: [patch v2][edk2-stable201908] MdeModulePkg DxeCore: Fix for missing Memory Attributes Table (MAT) update
Date: Mon, 19 Aug 2019 03:40:22 +0000 [thread overview]
Message-ID: <3C0D5C461C9E904E8F62152F6274C0BB40C405D7@SHSMSX104.ccr.corp.intel.com> (raw)
In-Reply-To: <20190816153935.11192-1-liming.gao@intel.com>
Jian and Hao, could you also help take a look at this patch?
This patch is ok to me.
Reviewed-by: Dandan Bi <dandan.bi@intel.com>
Thanks,
Dandan
> -----Original Message-----
> From: Gao, Liming
> Sent: Friday, August 16, 2019 11:40 PM
> To: devel@edk2.groups.io
> Cc: Mike Turner <miketur@microsoft.com>; Wang, Jian J
> <jian.j.wang@intel.com>; Wu, Hao A <hao.a.wu@intel.com>; Bi, Dandan
> <dandan.bi@intel.com>; Laszlo Ersek <lersek@redhat.com>
> Subject: [patch v2][edk2-stable201908] MdeModulePkg DxeCore: Fix for
> missing Memory Attributes Table (MAT) update
>
> From: Mike Turner <miketur@microsoft.com>
>
> The Fpdt driver (FirmwarePerformanceDxe) saves a memory address across
> reboots, and then does an AllocatePage for that memory address.
> If, on this boot, that memory comes from a Runtime memory bucket, the
> MAT table is not updated. This causes Windows to boot into Recovery.
>
> This patch blocks the memory manager from changing the page from a
> special bucket to a different memory type. Once the buckets are allocated,
> we freeze the memory ranges for the OS, and fragmenting the special
> buckets will cause errors resuming from hibernate (S4).
>
> The references to S4 here are the use case that fails. This failure is root
> caused to an inconsistent behavior of the core memory services themselves
> when type AllocateAddress is used.
>
> The main issue is apparently with the UEFI memory map -- the UEFI memory
> map reflects the pre-allocated bins, but the actual allocations at fixed
> addresses may go out of sync with that. Everything else, such as:
> - EFI_MEMORY_ATTRIBUTES_TABLE (page protections) being out of sync,
> - S4 failing
> are just symptoms / consequences.
>
> This patch is cherry pick from Project Mu:
> https://github.com/microsoft/mu_basecore/commit/a9be767d9be96af9401
> 6ebd391ea6f340920735a
> With the minor change,
> 1. Update commit message format to keep the message in 80 characters one
> line.
> 2. Remove // MU_CHANGE comments in source code.
> 3. Update comments style to follow edk2 style.
>
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Hao A Wu <hao.a.wu@intel.com>
> Cc: Dandan Bi <dandan.bi@intel.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Signed-off-by: Liming Gao <liming.gao@intel.com>
> ---
> In v2, add more description for this issue.
>
> MdeModulePkg/Core/Dxe/Mem/Page.c | 41
> ++++++++++++++++++++++++++++++++++------
> 1 file changed, 35 insertions(+), 6 deletions(-)
>
> diff --git a/MdeModulePkg/Core/Dxe/Mem/Page.c
> b/MdeModulePkg/Core/Dxe/Mem/Page.c
> index bd9e116aa5..1f0e3d94b9 100644
> --- a/MdeModulePkg/Core/Dxe/Mem/Page.c
> +++ b/MdeModulePkg/Core/Dxe/Mem/Page.c
> @@ -1265,12 +1265,13 @@ CoreInternalAllocatePages (
> IN BOOLEAN NeedGuard
> )
> {
> - EFI_STATUS Status;
> - UINT64 Start;
> - UINT64 NumberOfBytes;
> - UINT64 End;
> - UINT64 MaxAddress;
> - UINTN Alignment;
> + EFI_STATUS Status;
> + UINT64 Start;
> + UINT64 NumberOfBytes;
> + UINT64 End;
> + UINT64 MaxAddress;
> + UINTN Alignment;
> + EFI_MEMORY_TYPE CheckType;
>
> if ((UINT32)Type >= MaxAllocateType) {
> return EFI_INVALID_PARAMETER;
> @@ -1321,6 +1322,7 @@ CoreInternalAllocatePages (
> // if (Start + NumberOfBytes) rolls over 0 or
> // if Start is above MAX_ALLOC_ADDRESS or
> // if End is above MAX_ALLOC_ADDRESS,
> + // if Start..End overlaps any tracked MemoryTypeStatistics range
> // return EFI_NOT_FOUND.
> //
> if (Type == AllocateAddress) {
> @@ -1336,6 +1338,33 @@ CoreInternalAllocatePages (
> (End > MaxAddress)) {
> return EFI_NOT_FOUND;
> }
> +
> + //
> + // A driver is allowed to call AllocatePages using an AllocateAddress type.
> This type of
> + // AllocatePage request the exact physical address if it is not used. The
> existing code
> + // will allow this request even in 'special' pages. The problem with this is
> that the
> + // reason to have 'special' pages for OS hibernate/resume is defeated as
> memory is
> + // fragmented.
> + //
> +
> + for (CheckType = (EFI_MEMORY_TYPE) 0; CheckType <
> EfiMaxMemoryType; CheckType++) {
> + if (MemoryType != CheckType &&
> + mMemoryTypeStatistics[CheckType].Special &&
> + mMemoryTypeStatistics[CheckType].NumberOfPages > 0) {
> + if (Start >= mMemoryTypeStatistics[CheckType].BaseAddress &&
> + Start <= mMemoryTypeStatistics[CheckType].MaximumAddress) {
> + return EFI_NOT_FOUND;
> + }
> + if (End >= mMemoryTypeStatistics[CheckType].BaseAddress &&
> + End <= mMemoryTypeStatistics[CheckType].MaximumAddress) {
> + return EFI_NOT_FOUND;
> + }
> + if (Start < mMemoryTypeStatistics[CheckType].BaseAddress &&
> + End > mMemoryTypeStatistics[CheckType].MaximumAddress) {
> + return EFI_NOT_FOUND;
> + }
> + }
> + }
> }
>
> if (Type == AllocateMaxAddress) {
> --
> 2.13.0.windows.1
next prev parent reply other threads:[~2019-08-19 3:40 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-16 15:39 [patch v2][edk2-stable201908] MdeModulePkg DxeCore: Fix for missing Memory Attributes Table (MAT) update Liming Gao
2019-08-16 19:47 ` Laszlo Ersek
2019-08-19 3:40 ` Dandan Bi [this message]
2019-08-19 5:42 ` Wu, Hao A
2019-08-20 11:57 ` Liming Gao
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=3C0D5C461C9E904E8F62152F6274C0BB40C405D7@SHSMSX104.ccr.corp.intel.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