From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: dandan.bi@intel.com) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by groups.io with SMTP; Sun, 18 Aug 2019 20:40:24 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Aug 2019 20:40:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,403,1559545200"; d="scan'208";a="202116257" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by fmsmga004.fm.intel.com with ESMTP; 18 Aug 2019 20:40:24 -0700 Received: from fmsmsx607.amr.corp.intel.com (10.18.126.87) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.439.0; Sun, 18 Aug 2019 20:40:24 -0700 Received: from fmsmsx607.amr.corp.intel.com (10.18.126.87) by fmsmsx607.amr.corp.intel.com (10.18.126.87) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Sun, 18 Aug 2019 20:40:23 -0700 Received: from shsmsx153.ccr.corp.intel.com (10.239.6.53) by fmsmsx607.amr.corp.intel.com (10.18.126.87) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Sun, 18 Aug 2019 20:40:23 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.112]) by SHSMSX153.ccr.corp.intel.com ([169.254.12.215]) with mapi id 14.03.0439.000; Mon, 19 Aug 2019 11:40:22 +0800 From: "Dandan Bi" To: "Gao, Liming" , "devel@edk2.groups.io" CC: Mike Turner , "Wang, Jian J" , "Wu, Hao A" , Laszlo Ersek Subject: Re: [patch v2][edk2-stable201908] MdeModulePkg DxeCore: Fix for missing Memory Attributes Table (MAT) update Thread-Topic: [patch v2][edk2-stable201908] MdeModulePkg DxeCore: Fix for missing Memory Attributes Table (MAT) update Thread-Index: AQHVVEjdDXxN9kmw40CVKEc0viZpEKcB1YzA Date: Mon, 19 Aug 2019 03:40:22 +0000 Message-ID: <3C0D5C461C9E904E8F62152F6274C0BB40C405D7@SHSMSX104.ccr.corp.intel.com> References: <20190816153935.11192-1-liming.gao@intel.com> In-Reply-To: <20190816153935.11192-1-liming.gao@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: dandan.bi@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Jian and Hao, could you also help take a look at this patch? =09 This patch is ok to me. Reviewed-by: Dandan Bi Thanks, Dandan > -----Original Message----- > From: Gao, Liming > Sent: Friday, August 16, 2019 11:40 PM > To: devel@edk2.groups.io > Cc: Mike Turner ; Wang, Jian J > ; Wu, Hao A ; Bi, Dandan > ; Laszlo Ersek > Subject: [patch v2][edk2-stable201908] MdeModulePkg DxeCore: Fix for > missing Memory Attributes Table (MAT) update >=20 > From: Mike Turner >=20 > 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. >=20 > This patch blocks the memory manager from changing the page from a > special bucket to a different memory type. Once the buckets are allocate= d, > we freeze the memory ranges for the OS, and fragmenting the special > buckets will cause errors resuming from hibernate (S4). >=20 > The references to S4 here are the use case that fails. This failure is r= oot > caused to an inconsistent behavior of the core memory services themselves > when type AllocateAddress is used. >=20 > 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. >=20 > 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. >=20 > Cc: Jian J Wang > Cc: Hao A Wu > Cc: Dandan Bi > Cc: Laszlo Ersek > Signed-off-by: Liming Gao > --- > In v2, add more description for this issue. >=20 > MdeModulePkg/Core/Dxe/Mem/Page.c | 41 > ++++++++++++++++++++++++++++++++++------ > 1 file changed, 35 insertions(+), 6 deletions(-) >=20 > 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; >=20 > if ((UINT32)Type >=3D 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 =3D=3D AllocateAddress) { > @@ -1336,6 +1338,33 @@ CoreInternalAllocatePages ( > (End > MaxAddress)) { > return EFI_NOT_FOUND; > } > + > + // > + // A driver is allowed to call AllocatePages using an AllocateAddres= s 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 wit= h this is > that the > + // reason to have 'special' pages for OS hibernate/resume is defeate= d as > memory is > + // fragmented. > + // > + > + for (CheckType =3D (EFI_MEMORY_TYPE) 0; CheckType < > EfiMaxMemoryType; CheckType++) { > + if (MemoryType !=3D CheckType && > + mMemoryTypeStatistics[CheckType].Special && > + mMemoryTypeStatistics[CheckType].NumberOfPages > 0) { > + if (Start >=3D mMemoryTypeStatistics[CheckType].BaseAddress && > + Start <=3D mMemoryTypeStatistics[CheckType].MaximumAddress) = { > + return EFI_NOT_FOUND; > + } > + if (End >=3D mMemoryTypeStatistics[CheckType].BaseAddress && > + End <=3D mMemoryTypeStatistics[CheckType].MaximumAddress) { > + return EFI_NOT_FOUND; > + } > + if (Start < mMemoryTypeStatistics[CheckType].BaseAddress && > + End > mMemoryTypeStatistics[CheckType].MaximumAddress) { > + return EFI_NOT_FOUND; > + } > + } > + } > } >=20 > if (Type =3D=3D AllocateMaxAddress) { > -- > 2.13.0.windows.1