archive-gh-me/OpenCorePkg
1
0
Fork 0
mirror of https://github.com/acidanthera/OpenCorePkg.git synced 2025-12-08 19:25:01 +00:00
Code Issues Projects Releases Wiki Activity

OcMemoryLib: Fix corruption after ShrinkMemoryMap and add OcDeduplicateDescriptors

Browse Source
This commit is contained in:
vit9696 2020-04-04 16:21:11 +03:00
parent 58673b0c0c
commit 2d824fbcfa
2 changed files with 107 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Include/Library/OcMemoryLib.h
View File

@ -140,14 +140,34 @@ OcSortMemoryMap (
@param[in,out] MemoryMapSize Memory map size in bytes, updated on shrink.
@param[in,out] MemoryMap Memory map to shrink.
@param[in] DescriptorSize Memory map descriptor size in bytes.
@retval EFI_SUCCESS on success.
@retval EFI_NOT_FOUND when cannot join anything.
**/
VOID
EFI_STATUS
OcShrinkMemoryMap (
IN OUT UINTN *MemoryMapSize,
IN OUT EFI_MEMORY_DESCRIPTOR *MemoryMap,
IN UINTN DescriptorSize
);
/**
Deduplicate memory descriptors. Requires sorted entry list.
@param[in,out] EntryCount Memory map size in entries, updated on shrink.
@param[in,out] MemoryMap Memory map to shrink.
@param[in] DescriptorSize Memory map descriptor size in bytes.
@retval EFI_SUCCESS on success.
@retval EFI_NOT_FOUND when cannot join anything.
**/
EFI_STATUS
OcDeduplicateDescriptors (
IN OUT UINTN *EntryCount,
IN OUT EFI_MEMORY_DESCRIPTOR *MemoryMap,
IN UINTN DescriptorSize
);
/**
Check range allocation compatibility callback.

87
Library/OcMemoryLib/MemoryMap.c
View File

@ -257,13 +257,14 @@ OcSortMemoryMap (
}
}
VOID
EFI_STATUS
OcShrinkMemoryMap (
IN OUT UINTN *MemoryMapSize,
IN OUT EFI_MEMORY_DESCRIPTOR *MemoryMap,
IN UINTN DescriptorSize
)
{
EFI_STATUS Status;
UINTN SizeFromDescToEnd;
UINT64 Bytes;
EFI_MEMORY_DESCRIPTOR *PrevDesc;
@ -272,6 +273,12 @@ OcShrinkMemoryMap (
BOOLEAN CanBeJoinedRt;
BOOLEAN HasEntriesToRemove;
Status = EFI_NOT_FOUND;
if (*MemoryMapSize <= DescriptorSize) {
return Status;
}
PrevDesc = MemoryMap;
Desc = NEXT_MEMORY_DESCRIPTOR (PrevDesc, DescriptorSize);
SizeFromDescToEnd = *MemoryMapSize - DescriptorSize;
@ -318,9 +325,11 @@ OcShrinkMemoryMap (
PrevDesc->Type = EfiConventionalMemory;
PrevDesc->NumberOfPages += Desc->NumberOfPages;
HasEntriesToRemove = TRUE;
Status = EFI_SUCCESS;
} else if (CanBeJoinedRt) {
PrevDesc->NumberOfPages += Desc->NumberOfPages;
HasEntriesToRemove = TRUE;
Status = EFI_SUCCESS;
} else {
//
// Cannot be joined - we need to move to next
@ -341,6 +350,82 @@ OcShrinkMemoryMap (
Desc = NEXT_MEMORY_DESCRIPTOR (Desc, DescriptorSize);
SizeFromDescToEnd -= DescriptorSize;
}
//
// Handle last entries if they were merged.
//
if (HasEntriesToRemove) {
*MemoryMapSize += DescriptorSize;
}
return EFI_SUCCESS;
}
EFI_STATUS
OcDeduplicateDescriptors (
IN OUT UINTN *EntryCount,
IN OUT EFI_MEMORY_DESCRIPTOR *MemoryMap,
IN UINTN DescriptorSize
)
{
EFI_STATUS Status;
UINTN EntriesToGo;
EFI_MEMORY_DESCRIPTOR *PrevDesc;
EFI_MEMORY_DESCRIPTOR *Desc;
BOOLEAN IsDuplicate;
BOOLEAN HasEntriesToRemove;
Status = EFI_NOT_FOUND;
if (*EntryCount <= 1) {
return Status;
}
PrevDesc = MemoryMap;
Desc = NEXT_MEMORY_DESCRIPTOR (PrevDesc, DescriptorSize);
EntriesToGo = *EntryCount - 1;
*EntryCount = 1;
HasEntriesToRemove = FALSE;
while (EntriesToGo > 0) {
IsDuplicate = Desc->PhysicalStart == PrevDesc->PhysicalStart
&& Desc->NumberOfPages == PrevDesc->NumberOfPages;
if (IsDuplicate) {
//
// Two entries are duplicate, remove them.
//
Status = EFI_SUCCESS;
HasEntriesToRemove = TRUE;
} else {
//
// Not duplicates - we need to move to next
//
++(*EntryCount);
PrevDesc = NEXT_MEMORY_DESCRIPTOR (PrevDesc, DescriptorSize);
if (HasEntriesToRemove) {
//
// Have same entries between PrevDesc and Desc which are replaced by PrevDesc,
// we need to copy [Desc, end of list] to PrevDesc + 1.
//
CopyMem (PrevDesc, Desc, EntriesToGo * DescriptorSize);
Desc = PrevDesc;
HasEntriesToRemove = FALSE;
}
}
Desc = NEXT_MEMORY_DESCRIPTOR (Desc, DescriptorSize);
--EntriesToGo;
}
//
// Handle last entries if they were deduplicated.
//
if (HasEntriesToRemove) {
++(*EntryCount);
}
return Status;
}
EFI_STATUS