86 lines
2.9 KiB
Diff
86 lines
2.9 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Patrick Steinhardt <ps@pks.im>
|
||
|
|
Date: Thu, 21 Apr 2022 15:24:20 +1000
|
||
|
|
Subject: [PATCH] kern/efi/mm: Extract function to add memory regions
|
||
|
|
|
||
|
|
In preparation of support for runtime-allocating additional memory
|
||
|
|
region, this patch extracts the function to retrieve the EFI memory
|
||
|
|
map and add a subset of it to GRUB's own memory regions.
|
||
|
|
|
||
|
|
Signed-off-by: Patrick Steinhardt <ps@pks.im>
|
||
|
|
Signed-off-by: Daniel Axtens <dja@axtens.net>
|
||
|
|
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
|
||
|
|
Tested-by: Patrick Steinhardt <ps@pks.im>
|
||
|
|
(cherry picked from commit 96a7ea29e3cb61b6c2302e260e8e6a6117e17fa3)
|
||
|
|
[rharwood: backport around our nx]
|
||
|
|
---
|
||
|
|
grub-core/kern/efi/mm.c | 21 +++++++++++++++------
|
||
|
|
1 file changed, 15 insertions(+), 6 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c
|
||
|
|
index 782a1365a1..a1d3b51fe6 100644
|
||
|
|
--- a/grub-core/kern/efi/mm.c
|
||
|
|
+++ b/grub-core/kern/efi/mm.c
|
||
|
|
@@ -667,8 +667,8 @@ grub_nx_init (void)
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
-void
|
||
|
|
-grub_efi_mm_init (void)
|
||
|
|
+static grub_err_t
|
||
|
|
+grub_efi_mm_add_regions (grub_size_t required_bytes)
|
||
|
|
{
|
||
|
|
grub_efi_memory_descriptor_t *memory_map;
|
||
|
|
grub_efi_memory_descriptor_t *memory_map_end;
|
||
|
|
@@ -683,7 +683,7 @@ grub_efi_mm_init (void)
|
||
|
|
/* Prepare a memory region to store two memory maps. */
|
||
|
|
memory_map = grub_efi_allocate_any_pages (2 * BYTES_TO_PAGES (MEMORY_MAP_SIZE));
|
||
|
|
if (! memory_map)
|
||
|
|
- grub_fatal ("cannot allocate memory");
|
||
|
|
+ return grub_error (GRUB_ERR_OUT_OF_MEMORY, "cannot allocate memory for memory map");
|
||
|
|
|
||
|
|
/* Obtain descriptors for available memory. */
|
||
|
|
map_size = MEMORY_MAP_SIZE;
|
||
|
|
@@ -701,14 +701,14 @@ grub_efi_mm_init (void)
|
||
|
|
|
||
|
|
memory_map = grub_efi_allocate_any_pages (2 * BYTES_TO_PAGES (map_size));
|
||
|
|
if (! memory_map)
|
||
|
|
- grub_fatal ("cannot allocate memory");
|
||
|
|
+ return grub_error (GRUB_ERR_OUT_OF_MEMORY, "cannot allocate memory for new memory map");
|
||
|
|
|
||
|
|
mm_status = grub_efi_get_memory_map (&map_size, memory_map, 0,
|
||
|
|
&desc_size, 0);
|
||
|
|
}
|
||
|
|
|
||
|
|
if (mm_status < 0)
|
||
|
|
- grub_fatal ("cannot get memory map");
|
||
|
|
+ return grub_error (GRUB_ERR_OUT_OF_MEMORY, "error fetching memory map from EFI");
|
||
|
|
|
||
|
|
memory_map_end = NEXT_MEMORY_DESCRIPTOR (memory_map, map_size);
|
||
|
|
|
||
|
|
@@ -723,7 +723,7 @@ grub_efi_mm_init (void)
|
||
|
|
|
||
|
|
/* Allocate memory regions for GRUB's memory management. */
|
||
|
|
add_memory_regions (filtered_memory_map, desc_size,
|
||
|
|
- filtered_memory_map_end, BYTES_TO_PAGES (DEFAULT_HEAP_SIZE));
|
||
|
|
+ filtered_memory_map_end, BYTES_TO_PAGES (required_bytes));
|
||
|
|
|
||
|
|
#if 0
|
||
|
|
/* For debug. */
|
||
|
|
@@ -741,6 +741,15 @@ grub_efi_mm_init (void)
|
||
|
|
/* Release the memory maps. */
|
||
|
|
grub_efi_free_pages ((grub_addr_t) memory_map,
|
||
|
|
2 * BYTES_TO_PAGES (MEMORY_MAP_SIZE));
|
||
|
|
+
|
||
|
|
+ return GRUB_ERR_NONE;
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
+void
|
||
|
|
+grub_efi_mm_init (void)
|
||
|
|
+{
|
||
|
|
+ if (grub_efi_mm_add_regions (DEFAULT_HEAP_SIZE) != GRUB_ERR_NONE)
|
||
|
|
+ grub_fatal ("%s", grub_errmsg);
|
||
|
|
}
|
||
|
|
|
||
|
|
#if defined (__aarch64__) || defined (__arm__) || defined (__riscv)
|