mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-24 14:32:58 +00:00
Rest of allocator fixes
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
This commit is contained in:
Robbie Harwood
parent
5b44e10cf3
commit
74d57bbd19
4 changed files with 124 additions and 1 deletions
|
|
@ -0,0 +1,57 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Mon, 1 Aug 2022 14:07:50 -0400
|
||||
Subject: [PATCH] efi: allocate the initrd within the bounds expressed by the
|
||||
kernel
|
||||
|
||||
Currently on x86, only linux kernels built with CONFIG_RELOCATABLE for
|
||||
x86_64 can be loaded above 4G, but the maximum address for the initramfs
|
||||
is specified via a HdrS field. This allows us to utilize that value,
|
||||
and unless loading the kernel above 4G, uses the value present there.
|
||||
If loading kernel above 4G is allowed, we assume loading the initramfs
|
||||
above 4G also works; in practice this has been true in the kernel code
|
||||
for quite some time.
|
||||
|
||||
Resolves: rhbz#2112134
|
||||
|
||||
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||
---
|
||||
grub-core/loader/i386/efi/linux.c | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
|
||||
index e6b8998e5e..d003b474ee 100644
|
||||
--- a/grub-core/loader/i386/efi/linux.c
|
||||
+++ b/grub-core/loader/i386/efi/linux.c
|
||||
@@ -190,6 +190,8 @@ grub_linuxefi_unload (void *data)
|
||||
cmd_initrdefi->data = 0;
|
||||
grub_free (context);
|
||||
|
||||
+ max_addresses[INITRD_MAX_ADDRESS].addr = GRUB_EFI_MAX_ALLOCATION_ADDRESS;
|
||||
+
|
||||
return GRUB_ERR_NONE;
|
||||
}
|
||||
|
||||
@@ -426,11 +428,13 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
||||
}
|
||||
#endif
|
||||
|
||||
+ max_addresses[INITRD_MAX_ADDRESS].addr = lh->initrd_addr_max;
|
||||
#if defined(__x86_64__)
|
||||
if (lh->xloadflags & LINUX_XLF_CAN_BE_LOADED_ABOVE_4G)
|
||||
{
|
||||
grub_dprintf ("linux", "Loading kernel above 4GB is supported; enabling.\n");
|
||||
max_addresses[KERNEL_NO_LIMIT].addr = GRUB_EFI_MAX_USABLE_ADDRESS;
|
||||
+ max_addresses[INITRD_MAX_ADDRESS].addr = GRUB_EFI_MAX_USABLE_ADDRESS;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -560,6 +564,8 @@ fail:
|
||||
|
||||
grub_dl_unref (my_mod);
|
||||
|
||||
+ max_addresses[INITRD_MAX_ADDRESS].addr = GRUB_EFI_MAX_ALLOCATION_ADDRESS;
|
||||
+
|
||||
if (lh)
|
||||
kernel_free (cmdline, lh->cmdline_size + 1);
|
||||
|
||||
|
|
@ -0,0 +1,61 @@
|
|||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Mon, 1 Aug 2022 13:04:43 -0400
|
||||
Subject: [PATCH] efi: use EFI_LOADER_(CODE|DATA) for kernel and initrd
|
||||
allocations
|
||||
|
||||
At some point due to an erroneous kernel warning, we switched kernel and
|
||||
initramfs to being loaded in EFI_RUNTIME_SERVICES_CODE and
|
||||
EFI_RUNTIME_SERVICES_DATA memory pools. This doesn't appear to be
|
||||
correct according to the spec, and that kernel warning has gone away.
|
||||
|
||||
This patch puts them back in EFI_LOADER_CODE and EFI_LOADER_DATA
|
||||
allocations, respectively.
|
||||
|
||||
Resolves: rhbz#2108456
|
||||
|
||||
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||
---
|
||||
grub-core/loader/i386/efi/linux.c | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
|
||||
index d003b474ee..ac5ef50bdb 100644
|
||||
--- a/grub-core/loader/i386/efi/linux.c
|
||||
+++ b/grub-core/loader/i386/efi/linux.c
|
||||
@@ -279,7 +279,7 @@ grub_cmd_initrd (grub_command_t cmd, int argc, char *argv[])
|
||||
}
|
||||
|
||||
grub_dprintf ("linux", "Trying to allocate initrd mem\n");
|
||||
- initrd_mem = kernel_alloc(INITRD_MEM, size, GRUB_EFI_RUNTIME_SERVICES_DATA,
|
||||
+ initrd_mem = kernel_alloc(INITRD_MEM, size, GRUB_EFI_LOADER_DATA,
|
||||
N_("can't allocate initrd"));
|
||||
if (initrd_mem == NULL)
|
||||
goto fail;
|
||||
@@ -443,7 +443,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
||||
#endif
|
||||
|
||||
params = kernel_alloc (KERNEL_MEM, sizeof(*params),
|
||||
- GRUB_EFI_RUNTIME_SERVICES_DATA,
|
||||
+ GRUB_EFI_LOADER_DATA,
|
||||
"cannot allocate kernel parameters");
|
||||
if (!params)
|
||||
goto fail;
|
||||
@@ -467,7 +467,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
||||
|
||||
grub_dprintf ("linux", "setting up cmdline\n");
|
||||
cmdline = kernel_alloc (KERNEL_MEM, lh->cmdline_size + 1,
|
||||
- GRUB_EFI_RUNTIME_SERVICES_DATA,
|
||||
+ GRUB_EFI_LOADER_DATA,
|
||||
N_("can't allocate cmdline"));
|
||||
if (!cmdline)
|
||||
goto fail;
|
||||
@@ -516,7 +516,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
||||
kernel_size = lh->init_size;
|
||||
grub_dprintf ("linux", "Trying to allocate kernel mem\n");
|
||||
kernel_mem = kernel_alloc (KERNEL_MEM, kernel_size,
|
||||
- GRUB_EFI_RUNTIME_SERVICES_CODE,
|
||||
+ GRUB_EFI_LOADER_CODE,
|
||||
N_("can't allocate kernel"));
|
||||
restore_addresses();
|
||||
if (!kernel_mem)
|
||||
|
|
@ -271,3 +271,5 @@ Patch0270: 0270-Make-debug-file-show-which-file-filters-get-run.patch
|
|||
Patch0271: 0271-efi-make-the-default-arena-most-of-ram.patch
|
||||
Patch0272: 0272-efi-use-enumerated-array-positions-for-our-allocatio.patch
|
||||
Patch0273: 0273-efi-split-allocation-policy-for-kernel-vs-initrd-mem.patch
|
||||
Patch0274: 0274-efi-allocate-the-initrd-within-the-bounds-expressed-.patch
|
||||
Patch0275: 0275-efi-use-EFI_LOADER_-CODE-DATA-for-kernel-and-initrd-.patch
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
Name: grub2
|
||||
Epoch: 1
|
||||
Version: 2.06
|
||||
Release: 44%{?dist}
|
||||
Release: 45%{?dist}
|
||||
Summary: Bootloader with support for Linux, Multiboot and more
|
||||
License: GPLv3+
|
||||
URL: http://www.gnu.org/software/grub/
|
||||
|
|
@ -530,6 +530,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Aug 02 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-45
|
||||
- Rest of allocator fixes
|
||||
|
||||
* Mon Aug 01 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-44
|
||||
- Some allocator fixes for kernel
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue