xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

efi/libstub: Simplify efi_high_alloc() and rename to efi_allocate_pages()

Browse Source 
The implementation of efi_high_alloc() uses a complicated way of
traversing the memory map to find an available region that is located
as close as possible to the provided upper limit, and calls AllocatePages
subsequently to create the allocation at that exact address.

This is precisely what the EFI_ALLOCATE_MAX_ADDRESS allocation type
argument to AllocatePages() does, and considering that EFI_ALLOC_ALIGN
only exceeds EFI_PAGE_SIZE on arm64, let's use AllocatePages() directly
and implement the alignment using code that the compiler can remove if
it does not exceed EFI_PAGE_SIZE.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
This commit is contained in:
Ard Biesheuvel
2020-02-10 17:02:35 +01:00
parent f57db62c67
commit a7495c28c8
4 changed files with 23 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/firmware/efi/libstub/efi-stub-helper.c
View File

@@ -385,8 +385,7 @@ efi_status_t handle_cmdline_files(efi_loaded_image_t *image,
* so allocate enough memory for all the files. This is used
* for loading multiple files.
*/
status = efi_high_alloc(file_size_total, 0x1000, &file_addr,
max_addr);
status = efi_allocate_pages(file_size_total, &file_addr, max_addr);
if (status != EFI_SUCCESS) {
pr_efi_err("Failed to alloc highmem for files\n");
goto close_handles;
@@ -536,7 +535,7 @@ char *efi_convert_cmdline(efi_loaded_image_t *image,
options_bytes++; /* NUL termination */
status = efi_high_alloc(options_bytes, 0, &cmdline_addr,
status = efi_allocate_pages(options_bytes, &cmdline_addr,
MAX_CMDLINE_ADDRESS);
if (status != EFI_SUCCESS)
return NULL;