Changeset 58459 in vbox for trunk/src/VBox/Devices/EFI/Firmware/MdePkg/Library/PeiMemoryAllocationLib

Timestamp:

Oct 28, 2015 8:17:18 PM (9 years ago)

Author:

vboxsync

Message:

EFI/Firmware: 'svn merge ^{/vendor/edk2/UDK2010.SR1} /vendor/edk2/current .', reverting and removing files+dirs listed in ReadMe.vbox, resolving conflicts with help from ../UDK2014.SP1/. This is a raw untested merge.

Location:

trunk/src/VBox/Devices/EFI/Firmware

Files:

• . (modified) (1 prop)
• MdePkg/Library/PeiMemoryAllocationLib/MemoryAllocationLib.c (modified) (10 diffs)
• MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf (modified) (3 diffs)

trunk/src/VBox/Devices/EFI/Firmware/MdePkg/Library/PeiMemoryAllocationLib/MemoryAllocationLib.c

@@ -3 +3 @@
   based on PeiService for PEI phase drivers.
 
-  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
   This program and the accompanying materials                          
   are licensed and made available under the terms and conditions of the BSD License         
@@ -22 +22 @@
 #include <Library/BaseMemoryLib.h>
 #include <Library/DebugLib.h>
+#include <Library/HobLib.h>
 
 
@@ -45 +46 @@
   EFI_STATUS            Status;
   EFI_PHYSICAL_ADDRESS  Memory; 
+  EFI_MEMORY_TYPE       RequestType;
+  EFI_PEI_HOB_POINTERS  Hob;
 
   if (Pages == 0) {
@@ -50 +53 @@
   }
 
-  Status = PeiServicesAllocatePages (MemoryType, Pages, &Memory);
+  RequestType = MemoryType;
+  if (MemoryType == EfiReservedMemoryType) {
+    //
+    // PEI AllocatePages() doesn't support EfiReservedMemoryType. 
+    // Change RequestType to EfiBootServicesData for memory allocation.
+    //
+    RequestType = EfiBootServicesData;
+  }
+
+  Status = PeiServicesAllocatePages (RequestType, Pages, &Memory);
   if (EFI_ERROR (Status)) {
     return NULL;
   }
+  
+  if (MemoryType == EfiReservedMemoryType) {
+    //
+    // Memory type needs to be updated to EfiReservedMemoryType. Per PI spec Volume 1, 
+    // PEI AllocatePages() will automate the creation of the Memory Allocation HOB types. 
+    // Search Memory Allocation HOB and find the matched memory region,
+    // then change its memory type to EfiReservedMemoryType.
+    //
+    Hob.Raw = GetFirstHob (EFI_HOB_TYPE_MEMORY_ALLOCATION);
+    while (Hob.Raw != NULL && Hob.MemoryAllocation->AllocDescriptor.MemoryBaseAddress != Memory) {
+      Hob.Raw = GET_NEXT_HOB (Hob);
+      Hob.Raw = GetNextHob (EFI_HOB_TYPE_MEMORY_ALLOCATION, Hob.Raw);
+    }
+    ASSERT (Hob.Raw != NULL);
+    Hob.MemoryAllocation->AllocDescriptor.MemoryType = EfiReservedMemoryType;
+  }
+
   return (VOID *) (UINTN) Memory;
 }
@@ -161 +190 @@
   NULL is returned.
   If Alignment is not a power of two and Alignment is not zero, then ASSERT().
+  If Pages plus EFI_SIZE_TO_PAGES (Alignment) overflows, then ASSERT().
 
   @param  MemoryType            The type of memory to allocate.
@@ -178 +208 @@
   )
 {
-  VOID    *Memory;
-  UINTN   AlignmentMask;
+  EFI_PHYSICAL_ADDRESS   Memory;
+  EFI_PHYSICAL_ADDRESS   AlignedMemory;
+  EFI_PEI_HOB_POINTERS   Hob;
+  BOOLEAN                SkipBeforeMemHob;
+  BOOLEAN                SkipAfterMemHob;
+  EFI_PHYSICAL_ADDRESS   HobBaseAddress;
+  UINT64                 HobLength;
+  EFI_MEMORY_TYPE        HobMemoryType;
+  UINTN                  TotalPages;
 
   //
@@ -192 +229 @@
   // Make sure that Pages plus EFI_SIZE_TO_PAGES (Alignment) does not overflow.
   //
-  ASSERT (Pages <= (MAX_ADDRESS - EFI_SIZE_TO_PAGES (Alignment)));
+  ASSERT (Pages <= (MAX_ADDRESS - EFI_SIZE_TO_PAGES (Alignment))); 
+
   //
   // We would rather waste some memory to save PEI code size.
-  //
-  Memory = InternalAllocatePages (MemoryType, Pages + EFI_SIZE_TO_PAGES (Alignment));
-  if (Alignment == 0) {
-    AlignmentMask = Alignment;
+  // meaning in addition to the requested size for the aligned mem,
+  // we simply reserve an overhead memory equal to Alignmemt(page-aligned), no matter what.
+  // The overhead mem size could be reduced later with more involved malloc mechanisms
+  // (e.g., somthing that can detect the alignment boundary before allocating memory or 
+  //  can request that memory be allocated at a certain address that is aleady aligned).
+  //
+  TotalPages = Pages + (Alignment <= EFI_PAGE_SIZE ? 0 : EFI_SIZE_TO_PAGES(Alignment));
+  Memory = (EFI_PHYSICAL_ADDRESS) (UINTN) InternalAllocatePages (MemoryType, TotalPages);
+  if (Memory == 0) {
+    DEBUG((DEBUG_INFO, "Out of memory resource! \n"));
+    return NULL;
+  }
+  DEBUG ((DEBUG_INFO, "Allocated Memory unaligned: Address = 0x%LX, Pages = 0x%X, Type = %d \n", Memory, TotalPages, (UINTN) MemoryType));
+
+  //
+  // Alignment calculation
+  //
+  AlignedMemory = Memory;
+  if (Alignment > EFI_PAGE_SIZE) {
+    AlignedMemory = ALIGN_VALUE (Memory, Alignment);
+  }
+  DEBUG ((DEBUG_INFO, "After aligning to 0x%X bytes: Address = 0x%LX, Pages = 0x%X \n", Alignment, AlignedMemory, Pages));
+
+  //
+  // In general three HOBs cover the total allocated space.
+  // The aligned portion is covered by the aligned mem HOB and
+  // the unaligned(to be freed) portions before and after the aligned portion are covered by newly created HOBs.
+  //
+  // Before mem HOB covers the region between "Memory" and "AlignedMemory"
+  // Aligned mem HOB covers the region between "AlignedMemory" and "AlignedMemory + EFI_PAGES_TO_SIZE(Pages)"
+  // After mem HOB covers the region between "AlignedMemory + EFI_PAGES_TO_SIZE(Pages)" and "Memory + EFI_PAGES_TO_SIZE(TotalPages)"
+  //
+  // The before or after mem HOBs need to be skipped under special cases where the aligned portion
+  // touches either the top or bottom of the original allocated space.
+  //
+  SkipBeforeMemHob = FALSE;
+  SkipAfterMemHob  = FALSE;
+  if (Memory == AlignedMemory) {
+    SkipBeforeMemHob = TRUE;
+  }
+  if ((Memory + EFI_PAGES_TO_SIZE(TotalPages)) == (AlignedMemory + EFI_PAGES_TO_SIZE(Pages))) {
+    //
+    // This condition is never met in the current implementation.
+    // There is always some after-mem since the overhead mem(used in TotalPages)
+    // is no less than Alignment.
+    //
+    SkipAfterMemHob = TRUE;
+  }
+
+  //  
+  // Search for the mem HOB referring to the original(unaligned) allocation 
+  // and update the size and type if needed.
+  //
+  Hob.Raw = GetFirstHob (EFI_HOB_TYPE_MEMORY_ALLOCATION);
+  while (Hob.Raw != NULL) {
+    if (Hob.MemoryAllocation->AllocDescriptor.MemoryBaseAddress == Memory) {
+      break;
+    }
+    Hob.Raw = GET_NEXT_HOB (Hob);
+    Hob.Raw = GetNextHob (EFI_HOB_TYPE_MEMORY_ALLOCATION, Hob.Raw);
+  }
+  ASSERT (Hob.Raw != NULL);
+  if (SkipBeforeMemHob) {
+    //
+    // Use this HOB as aligned mem HOB as there is no portion before it.
+    //
+    HobLength = EFI_PAGES_TO_SIZE(Pages);
+    Hob.MemoryAllocation->AllocDescriptor.MemoryLength = HobLength;
   } else {
-    AlignmentMask = Alignment - 1;  
-  }
-  return (VOID *) (UINTN) (((UINTN) Memory + AlignmentMask) & ~AlignmentMask);
+    //
+    // Use this HOB as before mem HOB and create a new HOB for the aligned portion 
+    //
+    HobLength = (AlignedMemory - Memory); 
+    Hob.MemoryAllocation->AllocDescriptor.MemoryLength = HobLength;
+    Hob.MemoryAllocation->AllocDescriptor.MemoryType = EfiConventionalMemory;
+  }
+
+  HobBaseAddress = Hob.MemoryAllocation->AllocDescriptor.MemoryBaseAddress;
+  HobMemoryType = Hob.MemoryAllocation->AllocDescriptor.MemoryType;
+
+  //
+  // Build the aligned mem HOB if needed
+  //
+  if (!SkipBeforeMemHob) {
+    DEBUG((DEBUG_INFO, "Updated before-mem HOB with BaseAddress = %LX, Length = %LX, MemoryType = %d \n",
+      HobBaseAddress, HobLength, (UINTN) HobMemoryType));
+
+    HobBaseAddress = AlignedMemory;
+    HobLength = EFI_PAGES_TO_SIZE(Pages);
+    HobMemoryType = MemoryType;
+
+    BuildMemoryAllocationHob (
+      HobBaseAddress,
+      HobLength,
+      HobMemoryType
+      );
+
+    DEBUG((DEBUG_INFO, "Created aligned-mem HOB with BaseAddress = %LX, Length = %LX, MemoryType = %d \n",
+      HobBaseAddress, HobLength, (UINTN) HobMemoryType));
+  } else {
+    if (HobBaseAddress != 0) {
+      DEBUG((DEBUG_INFO, "Updated aligned-mem HOB with BaseAddress = %LX, Length = %LX, MemoryType = %d \n",
+        HobBaseAddress, HobLength, (UINTN) HobMemoryType));
+    }
+  }
+
+
+  //
+  // Build the after mem HOB if needed
+  //
+  if (!SkipAfterMemHob) {
+    HobBaseAddress = AlignedMemory + EFI_PAGES_TO_SIZE(Pages);
+    HobLength = (Memory + EFI_PAGES_TO_SIZE(TotalPages)) - (AlignedMemory + EFI_PAGES_TO_SIZE(Pages));
+    HobMemoryType = EfiConventionalMemory;
+
+    BuildMemoryAllocationHob (
+      HobBaseAddress,
+      HobLength,
+      HobMemoryType
+      );
+
+    DEBUG((DEBUG_INFO, "Created after-mem HOB with BaseAddress = %LX, Length = %LX, MemoryType = %d \n",
+      HobBaseAddress, HobLength, (UINTN) HobMemoryType));
+  }
+
+  return (VOID *) (UINTN) AlignedMemory;
 }
 
@@ -214 +370 @@
   
   If Alignment is not a power of two and Alignment is not zero, then ASSERT().
+  If Pages plus EFI_SIZE_TO_PAGES (Alignment) overflows, then ASSERT().
 
   @param  Pages                 The number of 4 KB pages to allocate.
@@ -242 +399 @@
   
   If Alignment is not a power of two and Alignment is not zero, then ASSERT().
+  If Pages plus EFI_SIZE_TO_PAGES (Alignment) overflows, then ASSERT().
 
   @param  Pages                 The number of 4 KB pages to allocate.
@@ -270 +428 @@
   
   If Alignment is not a power of two and Alignment is not zero, then ASSERT().
+  If Pages plus EFI_SIZE_TO_PAGES (Alignment) overflows, then ASSERT().
 
   @param  Pages                 The number of 4 KB pages to allocate.

trunk/src/VBox/Devices/EFI/Firmware/MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf

@@ -5 +5 @@
 #  Free operations are ignored.
 #
-# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
@@ -20 +20 @@
   INF_VERSION                    = 0x00010005
   BASE_NAME                      = PeiMemoryAllocationLib
+  MODULE_UNI_FILE                = PeiMemoryAllocationLib.uni
   FILE_GUID                      = b694e0dc-cd4e-4b30-885b-9c164ed3e74a
   MODULE_TYPE                    = PEIM
@@ -41 +42 @@
   BaseMemoryLib
   PeiServicesLib
+  HobLib