[edk2-devel] [PATCH 06/10] CpuPageTableLib: Avoid treating non-leaf entry as leaf one
Ni, Ray
ray.ni at intel.com
Mon Jul 18 13:18:27 UTC 2022
Today's logic wrongly treats the non-leaf entry as leaf entry and
updates its paging attributes.
The patch fixes the bug to only update paging attributes for
non-present entries or leaf entries.
Signed-off-by: Ray Ni <ray.ni at intel.com>
Signed-off-by: Zhiguang Liu <zhiguang.liu at intel.com>
Cc: Eric Dong <eric.dong at intel.com>
---
UefiCpuPkg/Library/CpuPageTableLib/CpuPageTableMap.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/UefiCpuPkg/Library/CpuPageTableLib/CpuPageTableMap.c b/UefiCpuPkg/Library/CpuPageTableLib/CpuPageTableMap.c
index dc37ca3647..a6aa1a352b 100644
--- a/UefiCpuPkg/Library/CpuPageTableLib/CpuPageTableMap.c
+++ b/UefiCpuPkg/Library/CpuPageTableLib/CpuPageTableMap.c
@@ -248,6 +248,7 @@ PageTableLibMapInLevel (
UINTN BitStart;
UINTN Index;
IA32_PAGING_ENTRY *PagingEntry;
+ IA32_PAGING_ENTRY *CurrentPagingEntry;
UINT64 RegionLength;
UINT64 SubLength;
UINT64 SubOffset;
@@ -359,18 +360,20 @@ PageTableLibMapInLevel (
//
PagingEntry = (IA32_PAGING_ENTRY *)(UINTN)IA32_PNLE_PAGE_TABLE_BASE_ADDRESS (&ParentPagingEntry->Pnle);
while (Offset < Length && Index < 512) {
- SubLength = MIN (Length - Offset, RegionStart + RegionLength - (LinearAddress + Offset));
+ CurrentPagingEntry = (!Modify && CreateNew) ? &OneOfPagingEntry : &PagingEntry[Index];
+ SubLength = MIN (Length - Offset, RegionStart + RegionLength - (LinearAddress + Offset));
if ((Level <= MaxLeafLevel) &&
(((LinearAddress + Offset) & RegionMask) == 0) &&
(((IA32_MAP_ATTRIBUTE_PAGE_TABLE_BASE_ADDRESS (Attribute) + Offset) & RegionMask) == 0) &&
- (SubLength == RegionLength)
+ (SubLength == RegionLength) &&
+ ((CurrentPagingEntry->Pce.Present == 0) || IsPle (CurrentPagingEntry, Level))
)
{
//
// Create one entry mapping the entire region (1G, 2M or 4K).
//
if (Modify) {
- PageTableLibSetPle (Level, &PagingEntry[Index], Offset, Attribute, Mask);
+ PageTableLibSetPle (Level, CurrentPagingEntry, Offset, Attribute, Mask);
}
} else {
//
@@ -382,7 +385,7 @@ PageTableLibMapInLevel (
// but the length is SMALLER than the RegionLength.
//
Status = PageTableLibMapInLevel (
- (!Modify && CreateNew) ? &OneOfPagingEntry : &PagingEntry[Index],
+ CurrentPagingEntry,
Modify,
Buffer,
BufferSize,
--
2.35.1.windows.2
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#91455): https://edk2.groups.io/g/devel/message/91455
Mute This Topic: https://groups.io/mt/92458160/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-
More information about the edk2-devel-archive
mailing list