Only reserve the aligned memory instead of reserving the unaligned memory in PeiMemor...

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Gao, Liming <liming.gao@intel.com>
Reviewed-by: Michael Kinney <michael.d.kinney@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15878 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdePkg/Library/PeiMemoryAllocationLib/MemoryAllocationLib.c b/MdePkg/Library/PeiMemoryAllocationLib/MemoryAllocationLib.c
index e325908aad1be87caa384fe5d88e8bc3a1a9a939..443c3c6b1231d9e4e4bdbc063ec6bdd03686644f 100644 (file)
--- a/MdePkg/Library/PeiMemoryAllocationLib/MemoryAllocationLib.c
+++ b/MdePkg/Library/PeiMemoryAllocationLib/MemoryAllocationLib.c
@@ -2,7 +2,7 @@
   Support routines for memory allocation routines \r
   based on PeiService for PEI phase drivers.\r
 \r
-  Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>\r
   This program and the accompanying materials                          \r
   are licensed and made available under the terms and conditions of the BSD License         \r
   which accompanies this distribution.  The full text of the license may be found at        \r
@@ -207,8 +207,15 @@ InternalAllocateAlignedPages (
   IN UINTN            Alignment\r
   )\r
 {\r
-  VOID    *Memory;\r
-  UINTN   AlignmentMask;\r
+  EFI_PHYSICAL_ADDRESS   Memory;\r
+  EFI_PHYSICAL_ADDRESS   AlignedMemory;\r
+  EFI_PEI_HOB_POINTERS   Hob;\r
+  BOOLEAN                SkipBeforeMemHob = FALSE;\r
+  BOOLEAN                SkipAfterMemHob = FALSE;\r
+  EFI_PHYSICAL_ADDRESS   HobBaseAddress;\r
+  UINT64                 HobLength;\r
+  EFI_MEMORY_TYPE        HobMemoryType;\r
+  UINTN                  TotalPages;\r
 \r
   //\r
   // Alignment must be a power of two or zero.\r
@@ -221,17 +228,134 @@ InternalAllocateAlignedPages (
   //\r
   // Make sure that Pages plus EFI_SIZE_TO_PAGES (Alignment) does not overflow.\r
   //\r
-  ASSERT (Pages <= (MAX_ADDRESS - EFI_SIZE_TO_PAGES (Alignment)));\r
+  ASSERT (Pages <= (MAX_ADDRESS - EFI_SIZE_TO_PAGES (Alignment))); \r
+\r
   //\r
   // We would rather waste some memory to save PEI code size.\r
+  // meaning in addition to the requested size for the aligned mem,\r
+  // we simply reserve an overhead memory equal to Alignmemt(page-aligned), no matter what.\r
+  // The overhead mem size could be reduced later with more involved malloc mechanisms\r
+  // (e.g., somthing that can detect the alignment boundary before allocating memory or \r
+  //  can request that memory be allocated at a certain address that is aleady aligned).\r
+  //\r
+  TotalPages = Pages + (Alignment <= EFI_PAGE_SIZE ? 0 : EFI_SIZE_TO_PAGES(Alignment));\r
+  Memory = (EFI_PHYSICAL_ADDRESS) (UINTN) InternalAllocatePages (MemoryType, TotalPages);\r
+  if (Memory == 0) {\r
+    DEBUG((DEBUG_INFO, "Out of memory resource! \n"));\r
+    return NULL;\r
+  }\r
+  DEBUG ((DEBUG_INFO, "Allocated Memory unaligned: Address = 0x%LX, Pages = 0x%X, Type = %d \n", Memory, TotalPages, (UINTN) MemoryType));\r
+\r
+  //\r
+  // Alignment calculation\r
+  //\r
+  AlignedMemory = Memory;\r
+  if (Alignment > EFI_PAGE_SIZE) {\r
+    AlignedMemory = ALIGN_VALUE (Memory, Alignment);\r
+  }\r
+  DEBUG ((DEBUG_INFO, "After aligning to 0x%X bytes: Address = 0x%LX, Pages = 0x%X \n", Alignment, AlignedMemory, Pages));\r
+\r
+  //\r
+  // In general three HOBs cover the total allocated space.\r
+  // The aligned portion is covered by the aligned mem HOB and\r
+  // the unaligned(to be freed) portions before and after the aligned portion are covered by newly created HOBs.\r
   //\r
-  Memory = InternalAllocatePages (MemoryType, Pages + EFI_SIZE_TO_PAGES (Alignment));\r
-  if (Alignment == 0) {\r
-    AlignmentMask = Alignment;\r
+  // Before mem HOB covers the region between "Memory" and "AlignedMemory"\r
+  // Aligned mem HOB covers the region between "AlignedMemory" and "AlignedMemory + EFI_PAGES_TO_SIZE(Pages)"\r
+  // After mem HOB covers the region between "AlignedMemory + EFI_PAGES_TO_SIZE(Pages)" and "Memory + EFI_PAGES_TO_SIZE(TotalPages)"\r
+  //\r
+  // The before or after mem HOBs need to be skipped under special cases where the aligned portion\r
+  // touches either the top or bottom of the original allocated space.\r
+  //\r
+  if (Memory == AlignedMemory) {\r
+    SkipBeforeMemHob = TRUE;\r
+  }\r
+  if ((Memory + EFI_PAGES_TO_SIZE(TotalPages)) == (AlignedMemory + EFI_PAGES_TO_SIZE(Pages))) {\r
+    //\r
+    // This condition is never met in the current implementation.\r
+    // There is always some after-mem since the overhead mem(used in TotalPages)\r
+    // is no less than Alignment.\r
+    //\r
+    SkipAfterMemHob = TRUE;\r
+  }\r
+\r
+  //  \r
+  // Search for the mem HOB referring to the original(unaligned) allocation \r
+  // and update the size and type if needed.\r
+  //\r
+  Hob.Raw = GetFirstHob (EFI_HOB_TYPE_MEMORY_ALLOCATION);\r
+  while (Hob.Raw != NULL) {\r
+    if (Hob.MemoryAllocation->AllocDescriptor.MemoryBaseAddress == Memory) {\r
+      break;\r
+    }\r
+    Hob.Raw = GET_NEXT_HOB (Hob);\r
+    Hob.Raw = GetNextHob (EFI_HOB_TYPE_MEMORY_ALLOCATION, Hob.Raw);\r
+  }\r
+  ASSERT (Hob.Raw != NULL);\r
+  if (SkipBeforeMemHob) {\r
+    //\r
+    // Use this HOB as aligned mem HOB as there is no portion before it.\r
+    //\r
+    HobLength = EFI_PAGES_TO_SIZE(Pages);\r
+    Hob.MemoryAllocation->AllocDescriptor.MemoryLength = HobLength;\r
+  } else {\r
+    //\r
+    // Use this HOB as before mem HOB and create a new HOB for the aligned portion \r
+    //\r
+    HobLength = (AlignedMemory - Memory); \r
+    Hob.MemoryAllocation->AllocDescriptor.MemoryLength = HobLength;\r
+    Hob.MemoryAllocation->AllocDescriptor.MemoryType = EfiConventionalMemory;\r
+  }\r
+\r
+  HobBaseAddress = Hob.MemoryAllocation->AllocDescriptor.MemoryBaseAddress;\r
+  HobMemoryType = Hob.MemoryAllocation->AllocDescriptor.MemoryType;\r
+\r
+  //\r
+  // Build the aligned mem HOB if needed\r
+  //\r
+  if (!SkipBeforeMemHob) {\r
+    DEBUG((DEBUG_INFO, "Updated before-mem HOB with BaseAddress = %LX, Length = %LX, MemoryType = %d \n",\r
+      HobBaseAddress, HobLength, (UINTN) HobMemoryType));\r
+\r
+    HobBaseAddress = AlignedMemory;\r
+    HobLength = EFI_PAGES_TO_SIZE(Pages);\r
+    HobMemoryType = MemoryType;\r
+\r
+    BuildMemoryAllocationHob (\r
+      HobBaseAddress,\r
+      HobLength,\r
+      HobMemoryType\r
+      );\r
+\r
+    DEBUG((DEBUG_INFO, "Created aligned-mem HOB with BaseAddress = %LX, Length = %LX, MemoryType = %d \n",\r
+      HobBaseAddress, HobLength, (UINTN) HobMemoryType));\r
   } else {\r
-    AlignmentMask = Alignment - 1;  \r
+    if (HobBaseAddress != 0) {\r
+      DEBUG((DEBUG_INFO, "Updated aligned-mem HOB with BaseAddress = %LX, Length = %LX, MemoryType = %d \n",\r
+        HobBaseAddress, HobLength, (UINTN) HobMemoryType));\r
+    }\r
   }\r
-  return (VOID *) (UINTN) (((UINTN) Memory + AlignmentMask) & ~AlignmentMask);\r
+\r
+\r
+  //\r
+  // Build the after mem HOB if needed\r
+  //\r
+  if (!SkipAfterMemHob) {\r
+    HobBaseAddress = AlignedMemory + EFI_PAGES_TO_SIZE(Pages);\r
+    HobLength = (Memory + EFI_PAGES_TO_SIZE(TotalPages)) - (AlignedMemory + EFI_PAGES_TO_SIZE(Pages));\r
+    HobMemoryType = EfiConventionalMemory;\r
+\r
+    BuildMemoryAllocationHob (\r
+      HobBaseAddress,\r
+      HobLength,\r
+      HobMemoryType\r
+      );\r
+\r
+    DEBUG((DEBUG_INFO, "Created after-mem HOB with BaseAddress = %LX, Length = %LX, MemoryType = %d \n",\r
+      HobBaseAddress, HobLength, (UINTN) HobMemoryType));\r
+  }\r
+\r
+  return (VOID *) (UINTN) AlignedMemory;\r
 }\r
 \r
 /**\r