Attachment 1452956 Details for Bug 1572126 – Proposed patch that may help the allocation problem

[patch] Proposed patch that may help the allocation problem

0001-Try-to-pick-better-locations-for-kernel-and-initrd.patch (text/plain), 2.60 KB, created by Peter Jones on 2018-06-19 14:29:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Jones

Created: 2018-06-19 14:29:16 UTC

Size: 2.60 KB

patch

obsolete

>From 361fb7f4262e5e2a52ab06837fc6c21e6972de91 Mon Sep 17 00:00:00 2001
>From: Peter Jones <pjones@redhat.com>
>Date: Tue, 19 Jun 2018 10:04:22 -0400
>Subject: [PATCH] Try to pick better locations for kernel and initrd
>
>---
> grub-core/kern/efi/mm.c           | 2 +-
> grub-core/loader/i386/efi/linux.c | 7 ++++---
> include/grub/x86_64/efi/memory.h  | 2 +-
> 3 files changed, 6 insertions(+), 5 deletions(-)
>
>diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c
>index f5440cb1df9..53675523523 100644
>--- a/grub-core/kern/efi/mm.c
>+++ b/grub-core/kern/efi/mm.c
>@@ -58,7 +58,7 @@ grub_efi_allocate_pages_max (grub_efi_physical_address_t max,
>   grub_efi_boot_services_t *b;
>   grub_efi_physical_address_t address = max;
> 
>-  if (max > 0xffffffff)
>+  if (max >= GRUB_EFI_MAX_USABLE_ADDRESS)
>     return 0;
> 
>   b = grub_efi_system_table->boot_services;
>diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
>index 2cdfa8f671c..ee135fe293a 100644
>--- a/grub-core/loader/i386/efi/linux.c
>+++ b/grub-core/loader/i386/efi/linux.c
>@@ -28,6 +28,7 @@
> #include <grub/efi/efi.h>
> #include <grub/efi/linux.h>
> #include <grub/tpm.h>
>+#include <grub/cpu/efi/memory.h>
> 
> GRUB_MOD_LICENSE ("GPLv3+");
> 
>@@ -108,7 +109,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
>       size += ALIGN_UP (grub_file_size (files[i]), 4);
>     }
> 
>-  initrd_mem = grub_efi_allocate_pages_max (0x3fffffff, BYTES_TO_PAGES(size));
>+  initrd_mem = grub_efi_allocate_pages_max (GRUB_EFI_MAX_USABLE_ADDRESS, BYTES_TO_PAGES(size));
> 
>   if (!initrd_mem)
>     {
>@@ -210,7 +211,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
>       goto fail;
>     }
> 
>-  params = grub_efi_allocate_pages_max (0x3fffffff,
>+  params = grub_efi_allocate_pages_max (GRUB_EFI_MAX_USABLE_ADDRESS,
> 					BYTES_TO_PAGES(sizeof(*params)));
>   if (! params)
>     {
>@@ -309,7 +310,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
> 					   BYTES_TO_PAGES(lh->init_size));
> 
>   if (!kernel_mem)
>-    kernel_mem = grub_efi_allocate_pages_max(0x3fffffff,
>+    kernel_mem = grub_efi_allocate_pages_max(GRUB_EFI_MAX_USABLE_ADDRESS,
> 					     BYTES_TO_PAGES(lh->init_size));
> 
>   if (!kernel_mem)
>diff --git a/include/grub/x86_64/efi/memory.h b/include/grub/x86_64/efi/memory.h
>index 46e9145a308..18bb6c67162 100644
>--- a/include/grub/x86_64/efi/memory.h
>+++ b/include/grub/x86_64/efi/memory.h
>@@ -2,7 +2,7 @@
> #include <grub/efi/memory.h>
> 
> #if defined (__code_model_large__)
>-#define GRUB_EFI_MAX_USABLE_ADDRESS 0xffffffff
>+#define GRUB_EFI_MAX_USABLE_ADDRESS __UINTPTR_MAX__
> #else
> #define GRUB_EFI_MAX_USABLE_ADDRESS 0x7fffffff
> #endif
>-- 
>2.17.1
>

Actions: View | Diff

Attachments on bug 1572126: 1452660 | 1452956