2017-08-16 15:14:30 +00:00
|
|
|
From 4bc909bf89f5b4ff86c9e4e609d4fe0c11a66b0c Mon Sep 17 00:00:00 2001
|
|
|
|
From: Vladimir Serbinenko <phcoder@gmail.com>
|
|
|
|
Date: Mon, 7 Aug 2017 18:33:29 +0200
|
2018-04-06 19:38:57 +00:00
|
|
|
Subject: [PATCH 057/227] Remove grub_efi_allocate_pages.
|
2017-08-16 15:14:30 +00:00
|
|
|
|
|
|
|
grub_efi_allocate_pages Essentially does 2 unrelated things:
|
|
|
|
* Allocate at fixed address.
|
|
|
|
* Allocate at any address.
|
|
|
|
|
|
|
|
To switch between 2 different functions it uses address == 0 as magic
|
|
|
|
value which is wrong as 0 is a perfectly valid fixed adress to allocate at.
|
|
|
|
---
|
|
|
|
grub-core/kern/arm/efi/misc.c | 4 ++--
|
|
|
|
grub-core/kern/efi/mm.c | 30 ++++++++++++++----------------
|
|
|
|
grub-core/loader/arm64/fdt.c | 2 +-
|
|
|
|
grub-core/loader/arm64/linux.c | 7 +++----
|
|
|
|
grub-core/loader/arm64/xen_boot.c | 7 +++----
|
|
|
|
grub-core/loader/ia64/efi/linux.c | 10 +++++-----
|
|
|
|
include/grub/autoefi.h | 2 +-
|
|
|
|
include/grub/efi/efi.h | 4 +++-
|
|
|
|
8 files changed, 32 insertions(+), 34 deletions(-)
|
|
|
|
|
|
|
|
diff --git a/grub-core/kern/arm/efi/misc.c b/grub-core/kern/arm/efi/misc.c
|
2018-02-27 18:56:41 +00:00
|
|
|
index 7cd41842ae7..c95e8299d42 100644
|
2017-08-16 15:14:30 +00:00
|
|
|
--- a/grub-core/kern/arm/efi/misc.c
|
|
|
|
+++ b/grub-core/kern/arm/efi/misc.c
|
|
|
|
@@ -146,7 +146,7 @@ grub_efi_allocate_loader_memory (grub_uint32_t min_offset, grub_uint32_t size)
|
|
|
|
continue;
|
|
|
|
grub_dprintf("mm", "%s: let's allocate some (0x%x) pages @ 0x%08x...\n",
|
|
|
|
__FUNCTION__, (size >> PAGE_SHIFT), (grub_addr_t) start);
|
|
|
|
- mem = grub_efi_allocate_pages (start, (size >> PAGE_SHIFT) + 1);
|
|
|
|
+ mem = grub_efi_allocate_fixed (start, (size >> PAGE_SHIFT) + 1);
|
|
|
|
grub_dprintf("mm", "%s: retval=0x%08x\n",
|
|
|
|
__FUNCTION__, (grub_addr_t) mem);
|
|
|
|
if (! mem)
|
|
|
|
@@ -189,7 +189,7 @@ grub_efi_prepare_platform (void)
|
|
|
|
mmap_size = find_mmap_size ();
|
|
|
|
if (! mmap_size)
|
|
|
|
return GRUB_ERR_OUT_OF_MEMORY;
|
|
|
|
- mmap_buf = grub_efi_allocate_pages (0, page_align (mmap_size) >> 12);
|
|
|
|
+ mmap_buf = grub_efi_allocate_any_pages (page_align (mmap_size) >> 12);
|
|
|
|
if (! mmap_buf)
|
|
|
|
return GRUB_ERR_OUT_OF_MEMORY;
|
|
|
|
|
|
|
|
diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c
|
2018-02-27 18:56:41 +00:00
|
|
|
index d88bc5e4326..b97b05fe825 100644
|
2017-08-16 15:14:30 +00:00
|
|
|
--- a/grub-core/kern/efi/mm.c
|
|
|
|
+++ b/grub-core/kern/efi/mm.c
|
|
|
|
@@ -83,20 +83,19 @@ grub_efi_allocate_pages_real (grub_efi_physical_address_t address,
|
|
|
|
}
|
|
|
|
|
|
|
|
void *
|
|
|
|
-grub_efi_allocate_pages (grub_efi_physical_address_t address,
|
|
|
|
+grub_efi_allocate_any_pages (grub_efi_uintn_t pages)
|
2018-02-27 18:56:41 +00:00
|
|
|
+{
|
|
|
|
+ return grub_efi_allocate_pages_real (GRUB_EFI_MAX_USABLE_ADDRESS,
|
|
|
|
+ pages, GRUB_EFI_ALLOCATE_MAX_ADDRESS,
|
|
|
|
+ GRUB_EFI_LOADER_DATA);
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+void *
|
|
|
|
+grub_efi_allocate_fixed (grub_efi_physical_address_t address,
|
|
|
|
grub_efi_uintn_t pages)
|
2017-08-16 15:14:30 +00:00
|
|
|
{
|
|
|
|
- grub_efi_allocate_type_t alloctype;
|
|
|
|
-
|
|
|
|
- if (address == 0)
|
|
|
|
- {
|
|
|
|
- alloctype = GRUB_EFI_ALLOCATE_MAX_ADDRESS;
|
|
|
|
- address = GRUB_EFI_MAX_USABLE_ADDRESS;
|
|
|
|
- }
|
|
|
|
- else
|
|
|
|
- alloctype = GRUB_EFI_ALLOCATE_ADDRESS;
|
2018-02-27 18:56:41 +00:00
|
|
|
-
|
2017-08-16 15:14:30 +00:00
|
|
|
- return grub_efi_allocate_pages_real (address, pages, alloctype,
|
|
|
|
+ return grub_efi_allocate_pages_real (address, pages,
|
|
|
|
+ GRUB_EFI_ALLOCATE_ADDRESS,
|
|
|
|
GRUB_EFI_LOADER_DATA);
|
|
|
|
}
|
|
|
|
|
|
|
|
@@ -404,7 +403,7 @@ add_memory_regions (grub_efi_memory_descriptor_t *memory_map,
|
|
|
|
pages = required_pages;
|
|
|
|
}
|
|
|
|
|
|
|
|
- addr = grub_efi_allocate_pages (start, pages);
|
|
|
|
+ addr = grub_efi_allocate_fixed (start, pages);
|
|
|
|
if (! addr)
|
|
|
|
grub_fatal ("cannot allocate conventional memory %p with %u pages",
|
|
|
|
(void *) ((grub_addr_t) start),
|
|
|
|
@@ -456,8 +455,7 @@ grub_efi_mm_init (void)
|
|
|
|
int mm_status;
|
|
|
|
|
|
|
|
/* Prepare a memory region to store two memory maps. */
|
|
|
|
- memory_map = grub_efi_allocate_pages (0,
|
|
|
|
- 2 * BYTES_TO_PAGES (MEMORY_MAP_SIZE));
|
|
|
|
+ memory_map = grub_efi_allocate_any_pages (2 * BYTES_TO_PAGES (MEMORY_MAP_SIZE));
|
|
|
|
if (! memory_map)
|
|
|
|
grub_fatal ("cannot allocate memory");
|
|
|
|
|
|
|
|
@@ -475,7 +473,7 @@ grub_efi_mm_init (void)
|
|
|
|
/* Freeing/allocating operations may increase memory map size. */
|
|
|
|
map_size += desc_size * 32;
|
|
|
|
|
|
|
|
- memory_map = grub_efi_allocate_pages (0, 2 * BYTES_TO_PAGES (map_size));
|
|
|
|
+ memory_map = grub_efi_allocate_any_pages (2 * BYTES_TO_PAGES (map_size));
|
|
|
|
if (! memory_map)
|
|
|
|
grub_fatal ("cannot allocate memory");
|
|
|
|
|
|
|
|
diff --git a/grub-core/loader/arm64/fdt.c b/grub-core/loader/arm64/fdt.c
|
2018-02-27 18:56:41 +00:00
|
|
|
index db49cf64991..368001696ee 100644
|
2017-08-16 15:14:30 +00:00
|
|
|
--- a/grub-core/loader/arm64/fdt.c
|
|
|
|
+++ b/grub-core/loader/arm64/fdt.c
|
|
|
|
@@ -50,7 +50,7 @@ grub_fdt_load (grub_size_t additional_size)
|
|
|
|
size += additional_size;
|
|
|
|
|
|
|
|
grub_dprintf ("linux", "allocating %ld bytes for fdt\n", size);
|
|
|
|
- fdt = grub_efi_allocate_pages (0, GRUB_EFI_BYTES_TO_PAGES (size));
|
|
|
|
+ fdt = grub_efi_allocate_any_pages (GRUB_EFI_BYTES_TO_PAGES (size));
|
|
|
|
if (!fdt)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
|
2018-02-27 18:56:41 +00:00
|
|
|
index 9519d2e4d3e..ee3fcaa86ae 100644
|
2017-08-16 15:14:30 +00:00
|
|
|
--- a/grub-core/loader/arm64/linux.c
|
|
|
|
+++ b/grub-core/loader/arm64/linux.c
|
|
|
|
@@ -148,8 +148,7 @@ grub_arm64_uefi_boot_image (grub_addr_t addr, grub_size_t size, char *args)
|
|
|
|
loaded_image->load_options_size = len =
|
|
|
|
(grub_strlen (args) + 1) * sizeof (grub_efi_char16_t);
|
|
|
|
loaded_image->load_options =
|
|
|
|
- grub_efi_allocate_pages (0,
|
|
|
|
- GRUB_EFI_BYTES_TO_PAGES (loaded_image->load_options_size));
|
|
|
|
+ grub_efi_allocate_any_pages (GRUB_EFI_BYTES_TO_PAGES (loaded_image->load_options_size));
|
|
|
|
if (!loaded_image->load_options)
|
|
|
|
return grub_errno;
|
|
|
|
|
|
|
|
@@ -223,7 +222,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
|
|
|
|
grub_dprintf ("linux", "Loading initrd\n");
|
|
|
|
|
|
|
|
initrd_pages = (GRUB_EFI_BYTES_TO_PAGES (initrd_size));
|
|
|
|
- initrd_mem = grub_efi_allocate_pages (0, initrd_pages);
|
|
|
|
+ initrd_mem = grub_efi_allocate_any_pages (initrd_pages);
|
|
|
|
if (!initrd_mem)
|
|
|
|
{
|
|
|
|
grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory"));
|
|
|
|
@@ -277,7 +276,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
|
|
|
grub_loader_unset();
|
|
|
|
|
|
|
|
grub_dprintf ("linux", "kernel file size: %lld\n", (long long) kernel_size);
|
|
|
|
- kernel_addr = grub_efi_allocate_pages (0, GRUB_EFI_BYTES_TO_PAGES (kernel_size));
|
|
|
|
+ kernel_addr = grub_efi_allocate_any_pages (GRUB_EFI_BYTES_TO_PAGES (kernel_size));
|
|
|
|
grub_dprintf ("linux", "kernel numpages: %lld\n",
|
|
|
|
(long long) GRUB_EFI_BYTES_TO_PAGES (kernel_size));
|
|
|
|
if (!kernel_addr)
|
|
|
|
diff --git a/grub-core/loader/arm64/xen_boot.c b/grub-core/loader/arm64/xen_boot.c
|
2018-02-27 18:56:41 +00:00
|
|
|
index 27ede46cac5..6c145a771ee 100644
|
2017-08-16 15:14:30 +00:00
|
|
|
--- a/grub-core/loader/arm64/xen_boot.c
|
|
|
|
+++ b/grub-core/loader/arm64/xen_boot.c
|
|
|
|
@@ -324,10 +324,9 @@ xen_boot_binary_load (struct xen_boot_binary *binary, grub_file_t file,
|
|
|
|
grub_dprintf ("xen_loader", "Xen_boot file size: 0x%lx\n", binary->size);
|
|
|
|
|
|
|
|
binary->start
|
|
|
|
- = (grub_addr_t) grub_efi_allocate_pages (0,
|
|
|
|
- GRUB_EFI_BYTES_TO_PAGES
|
|
|
|
- (binary->size +
|
|
|
|
- binary->align));
|
|
|
|
+ = (grub_addr_t) grub_efi_allocate_any_pages (GRUB_EFI_BYTES_TO_PAGES
|
|
|
|
+ (binary->size +
|
|
|
|
+ binary->align));
|
|
|
|
if (!binary->start)
|
|
|
|
{
|
|
|
|
grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory"));
|
|
|
|
diff --git a/grub-core/loader/ia64/efi/linux.c b/grub-core/loader/ia64/efi/linux.c
|
2018-02-27 18:56:41 +00:00
|
|
|
index efaa42ccdd2..750330d4572 100644
|
2017-08-16 15:14:30 +00:00
|
|
|
--- a/grub-core/loader/ia64/efi/linux.c
|
|
|
|
+++ b/grub-core/loader/ia64/efi/linux.c
|
|
|
|
@@ -252,7 +252,7 @@ allocate_pages (grub_uint64_t align, grub_uint64_t size_pages,
|
|
|
|
aligned_start += align;
|
|
|
|
if (aligned_start + size > end)
|
|
|
|
continue;
|
|
|
|
- mem = grub_efi_allocate_pages (aligned_start, size_pages);
|
|
|
|
+ mem = grub_efi_allocate_fixed (aligned_start, size_pages);
|
|
|
|
if (! mem)
|
|
|
|
{
|
|
|
|
grub_error (GRUB_ERR_OUT_OF_MEMORY, "cannot allocate memory");
|
|
|
|
@@ -326,7 +326,7 @@ grub_linux_boot (void)
|
|
|
|
mmap_size = find_mmap_size ();
|
|
|
|
if (! mmap_size)
|
|
|
|
return grub_errno;
|
|
|
|
- mmap_buf = grub_efi_allocate_pages (0, page_align (mmap_size) >> 12);
|
|
|
|
+ mmap_buf = grub_efi_allocate_any_pages (page_align (mmap_size) >> 12);
|
|
|
|
if (! mmap_buf)
|
|
|
|
return grub_error (GRUB_ERR_IO, "cannot allocate memory map");
|
|
|
|
err = grub_efi_finish_boot_services (&mmap_size, mmap_buf, &map_key,
|
|
|
|
@@ -422,7 +422,7 @@ grub_load_elf64 (grub_file_t file, void *buffer, const char *filename)
|
|
|
|
relocate = grub_env_get ("linux_relocate");
|
|
|
|
if (!relocate || grub_strcmp (relocate, "force") != 0)
|
|
|
|
{
|
|
|
|
- kernel_mem = grub_efi_allocate_pages (low_addr, kernel_pages);
|
|
|
|
+ kernel_mem = grub_efi_allocate_fixed (low_addr, kernel_pages);
|
|
|
|
reloc_offset = 0;
|
|
|
|
}
|
|
|
|
/* Try to relocate. */
|
|
|
|
@@ -524,7 +524,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
|
|
|
|
len += grub_strlen (argv[i]) + 1;
|
|
|
|
len += sizeof (struct ia64_boot_param) + 512; /* Room for extensions. */
|
|
|
|
boot_param_pages = page_align (len) >> 12;
|
|
|
|
- boot_param = grub_efi_allocate_pages (0, boot_param_pages);
|
|
|
|
+ boot_param = grub_efi_allocate_any_pages (boot_param_pages);
|
|
|
|
if (boot_param == 0)
|
|
|
|
{
|
|
|
|
grub_error (GRUB_ERR_OUT_OF_MEMORY,
|
|
|
|
@@ -589,7 +589,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
|
|
|
|
grub_dprintf ("linux", "Loading initrd\n");
|
|
|
|
|
|
|
|
initrd_pages = (page_align (initrd_size) >> 12);
|
|
|
|
- initrd_mem = grub_efi_allocate_pages (0, initrd_pages);
|
|
|
|
+ initrd_mem = grub_efi_allocate_any_pages (initrd_pages);
|
|
|
|
if (! initrd_mem)
|
|
|
|
{
|
|
|
|
grub_error (GRUB_ERR_OUT_OF_MEMORY, "cannot allocate pages");
|
|
|
|
diff --git a/include/grub/autoefi.h b/include/grub/autoefi.h
|
2018-02-27 18:56:41 +00:00
|
|
|
index b75591176eb..b7a252e079e 100644
|
2017-08-16 15:14:30 +00:00
|
|
|
--- a/include/grub/autoefi.h
|
|
|
|
+++ b/include/grub/autoefi.h
|
|
|
|
@@ -55,7 +55,7 @@ static inline grub_err_t grub_autoefi_prepare (void)
|
|
|
|
# define SYSTEM_TABLE_PTR GRUB_EFIEMU_SYSTEM_TABLE_PTR
|
|
|
|
# define SIZEOF_OF_UINTN GRUB_EFIEMU_SIZEOF_OF_UINTN
|
|
|
|
# define SYSTEM_TABLE GRUB_EFIEMU_SYSTEM_TABLE
|
|
|
|
-# define grub_efi_allocate_pages(x,y) (x)
|
|
|
|
+# define grub_efi_allocate_fixed(x,y) (x)
|
|
|
|
# define grub_efi_free_pages(x,y) GRUB_EFI_SUCCESS
|
|
|
|
# define grub_autoefi_finish_boot_services grub_efiemu_finish_boot_services
|
|
|
|
# define EFI_PRESENT 1
|
|
|
|
diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
|
2018-02-27 18:56:41 +00:00
|
|
|
index b4cbebf3828..3fa082816ca 100644
|
2017-08-16 15:14:30 +00:00
|
|
|
--- a/include/grub/efi/efi.h
|
|
|
|
+++ b/include/grub/efi/efi.h
|
|
|
|
@@ -43,8 +43,10 @@ EXPORT_FUNC(grub_efi_allocate_pages_real) (grub_efi_physical_address_t address,
|
|
|
|
grub_efi_allocate_type_t alloctype,
|
|
|
|
grub_efi_memory_type_t memtype);
|
|
|
|
void *
|
|
|
|
-EXPORT_FUNC(grub_efi_allocate_pages) (grub_efi_physical_address_t address,
|
|
|
|
+EXPORT_FUNC(grub_efi_allocate_fixed) (grub_efi_physical_address_t address,
|
|
|
|
grub_efi_uintn_t pages);
|
|
|
|
+void *
|
|
|
|
+EXPORT_FUNC(grub_efi_allocate_any_pages) (grub_efi_uintn_t pages);
|
|
|
|
void EXPORT_FUNC(grub_efi_free_pages) (grub_efi_physical_address_t address,
|
|
|
|
grub_efi_uintn_t pages);
|
|
|
|
int
|
|
|
|
--
|
2018-02-27 18:56:41 +00:00
|
|
|
2.15.0
|
2017-08-16 15:14:30 +00:00
|
|
|
|