forked from pool/grub2
3e026f665c
- Add safety measure to pcr snapshot by checking platform and tpm status * safe_tpm_pcr_snapshot.patch - Fix installation failure due to unavailable nvram device on ppc64le (bsc#1201361) * 0001-grub-install-set-point-of-no-return-for-powerpc-ieee1275.patch - Add patches to dynamically allocate additional memory regions for EFI systems (bsc#1202438) * 0001-mm-Allow-dynamically-requesting-additional-memory-re.patch * 0002-kern-efi-mm-Always-request-a-fixed-number-of-pages-o.patch * 0003-kern-efi-mm-Extract-function-to-add-memory-regions.patch * 0004-kern-efi-mm-Pass-up-errors-from-add_memory_regions.patch * 0005-kern-efi-mm-Implement-runtime-addition-of-pages.patch - Enlarge the default heap size and defer the disk cache invalidation (bsc#1202438) * 0001-kern-efi-mm-Enlarge-the-default-heap-size.patch * 0002-mm-Defer-the-disk-cache-invalidation.patch - Add patches for ALP FDE support * 0001-devmapper-getroot-Have-devmapper-recognize-LUKS2.patch * 0002-devmapper-getroot-Set-up-cheated-LUKS2-cryptodisk-mo.patch * 0003-disk-cryptodisk-When-cheatmounting-use-the-sector-in.patch * 0004-normal-menu-Don-t-show-Booting-s-msg-when-auto-booti.patch * 0005-EFI-suppress-the-Welcome-to-GRUB-message-in-EFI-buil.patch * 0006-EFI-console-Do-not-set-colorstate-until-the-first-te.patch * 0007-EFI-console-Do-not-set-cursor-until-the-first-text-o.patch * 0008-linuxefi-Use-common-grub_initrd_load.patch * 0009-Add-crypttab_entry-to-obviate-the-need-to-input-pass.patch * 0010-templates-import-etc-crypttab-to-grub.cfg.patch OBS-URL: https://build.opensuse.org/request/show/1004537 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=419
87 lines
2.9 KiB
Diff
87 lines
2.9 KiB
Diff
From b4500ff77efe3b36256fae1e456ded65fd77cf04 Mon Sep 17 00:00:00 2001
|
|
From: Patrick Steinhardt <ps@pks.im>
|
|
Date: Thu, 21 Apr 2022 15:24:20 +1000
|
|
Subject: [PATCH 3/5] 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>
|
|
---
|
|
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 2874522..087272f 100644
|
|
--- a/grub-core/kern/efi/mm.c
|
|
+++ b/grub-core/kern/efi/mm.c
|
|
@@ -592,8 +592,8 @@ print_memory_map (grub_efi_memory_descriptor_t *memory_map,
|
|
}
|
|
#endif
|
|
|
|
-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;
|
|
@@ -606,7 +606,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;
|
|
@@ -624,14 +624,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);
|
|
|
|
@@ -646,7 +646,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. */
|
|
@@ -664,6 +664,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)
|
|
--
|
|
2.35.3
|
|
|