Ring3: Added helper function AllocateRing3Pages() and

draft of Ring3LocateProtocol().
acidanthera · Jan 26, 2024 · 7730f36 · 7730f36
1 parent c678a59
commit 7730f36
Show file tree

Hide file tree

Showing 5 changed files with 116 additions and 42 deletions.
diff --git a/MdeModulePkg/Core/Dxe/DxeMain.h b/MdeModulePkg/Core/Dxe/DxeMain.h
@@ -1167,6 +1167,13 @@ CoreAllocatePages (
   IN OUT EFI_PHYSICAL_ADDRESS  *Memory
   );
 
+EFI_STATUS
+EFIAPI
+AllocateRing3Pages (
+  IN UINTN     NumberOfPages,
+  IN OUT VOID  **Memory
+  );
+
 /**
   Frees previous allocated pages.
 
@@ -1353,7 +1360,7 @@ CoreLoadImage (
   @retval EFI_SUCCESS             The image has been unloaded.
   @retval EFI_UNSUPPORTED         The image has been started, and does not support
                                   unload.
-  @retval EFI_INVALID_PARAMPETER  ImageHandle is not a valid image handle.
+  @retval EFI_INVALID_PARAMETER   ImageHandle is not a valid image handle.
 
 **/
 EFI_STATUS

diff --git a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
@@ -89,7 +89,8 @@ EFI_BOOT_SERVICES  mBootServices = {
   (EFI_CALCULATE_CRC32)CoreEfiNotAvailableYetArg3,                                        // CalculateCrc32
   (EFI_COPY_MEM)CopyMem,                                                                  // CopyMem
   (EFI_SET_MEM)SetMem,                                                                    // SetMem
-  (EFI_CREATE_EVENT_EX)CoreCreateEventEx                                                  // CreateEventEx
+  (EFI_CREATE_EVENT_EX)CoreCreateEventEx,                                                 // CreateEventEx
+  (EFI_ALLOCATE_RING3_PAGES)AllocateRing3Pages
 };
 
 EFI_DXE_SERVICES  mDxeServices = {

diff --git a/MdeModulePkg/Core/Dxe/Image/Image.c b/MdeModulePkg/Core/Dxe/Image/Image.c
@@ -1565,6 +1565,27 @@ CoreLoadImage (
   return Status;
 }
 
+EFI_STATUS
+EFIAPI
+AllocateRing3Pages (
+  IN UINTN     NumberOfPages,
+  IN OUT VOID  **Memory
+  )
+{
+  if (Memory == NULL) {
+    return EFI_INVALID_PARAMETER;
+  }
+
+  *Memory = AllocatePages (NumberOfPages);
+  if (*Memory == NULL) {
+    return EFI_OUT_OF_RESOURCES;
+  }
+
+  SetUefiImageMemoryAttributes ((UINTN)*Memory, EFI_PAGES_TO_SIZE (NumberOfPages), EFI_MEMORY_USER);
+
+  return EFI_SUCCESS;
+}
+
 /**
   Transfer control to a loaded image's entry point.
 
@@ -1972,7 +1993,7 @@ CoreExit (
   @retval EFI_SUCCESS             The image has been unloaded.
   @retval EFI_UNSUPPORTED         The image has been started, and does not support
                                   unload.
-  @retval EFI_INVALID_PARAMPETER  ImageHandle is not a valid image handle.
+  @retval EFI_INVALID_PARAMETER   ImageHandle is not a valid image handle.
 
 **/
 EFI_STATUS

diff --git a/MdePkg/Include/Uefi/UefiSpec.h b/MdePkg/Include/Uefi/UefiSpec.h
@@ -198,6 +198,13 @@ EFI_STATUS
   IN OUT EFI_PHYSICAL_ADDRESS         *Memory
   );
 
+typedef
+EFI_STATUS
+(EFIAPI *EFI_ALLOCATE_RING3_PAGES)(
+  IN     UINTN                        Pages,
+  IN OUT VOID                         **Memory
+  );
+
 /**
   Frees memory pages.
 
@@ -1960,6 +1967,7 @@ typedef struct {
   EFI_COPY_MEM                                  CopyMem;
   EFI_SET_MEM                                   SetMem;
   EFI_CREATE_EVENT_EX                           CreateEventEx;
+  EFI_ALLOCATE_RING3_PAGES                      AllocateRing3Pages;
 } EFI_BOOT_SERVICES;
 
 ///