mirror of https://gitee.com/openkylin/linux.git
efi/libstub/x86: Work around page freeing issue in mixed mode
Mixed mode translates calls from the 64-bit kernel into the 32-bit firmware by wrapping them in a call to a thunking routine that pushes a 32-bit word onto the stack for each argument passed to the function, regardless of the argument type. This works surprisingly well for most services and protocols, with the exception of ones that take explicit 64-bit arguments. efi_free() invokes the FreePages() EFI boot service, which takes a efi_physical_addr_t as its address argument, and this is one of those 64-bit types. This means that the 32-bit firmware will interpret the (addr, size) pair as a single 64-bit quantity, and since it is guaranteed to have the high word set (as size > 0), it will always fail due to the fact that EFI memory allocations are always < 4 GB on 32-bit firmware. So let's fix this by giving the thunking code a little hand, and pass two values for the address, and a third one for the size. Signed-off-by: Ard Biesheuvel <ardb@kernel.org> Cc: Arvind Sankar <nivedita@alum.mit.edu> Cc: Borislav Petkov <bp@alien8.de> Cc: James Morse <james.morse@arm.com> Cc: Matt Fleming <matt@codeblueprint.co.uk> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-efi@vger.kernel.org Link: https://lkml.kernel.org/r/20191224151025.32482-21-ardb@kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
parent
cd33a5c1d5
commit
23e6039404
|
@ -901,3 +901,19 @@ struct boot_params *efi_main(efi_handle_t handle,
|
|||
for (;;)
|
||||
asm("hlt");
|
||||
}
|
||||
|
||||
#ifdef CONFIG_EFI_MIXED
|
||||
void efi_free_native(unsigned long size, unsigned long addr);
|
||||
|
||||
void efi_free(unsigned long size, unsigned long addr)
|
||||
{
|
||||
if (!size)
|
||||
return;
|
||||
|
||||
if (efi_is_native())
|
||||
efi_free_native(size, addr);
|
||||
else
|
||||
efi64_thunk(efi_system_table()->boottime->mixed_mode.free_pages,
|
||||
addr, 0, DIV_ROUND_UP(size, EFI_PAGE_SIZE));
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -346,6 +346,9 @@ efi_status_t efi_low_alloc_above(unsigned long size, unsigned long align,
|
|||
}
|
||||
|
||||
void efi_free(unsigned long size, unsigned long addr)
|
||||
__weak __alias(efi_free_native);
|
||||
|
||||
void efi_free_native(unsigned long size, unsigned long addr)
|
||||
{
|
||||
unsigned long nr_pages;
|
||||
|
||||
|
@ -353,7 +356,7 @@ void efi_free(unsigned long size, unsigned long addr)
|
|||
return;
|
||||
|
||||
nr_pages = round_up(size, EFI_ALLOC_ALIGN) / EFI_PAGE_SIZE;
|
||||
efi_call_early(free_pages, addr, nr_pages);
|
||||
efi_system_table()->boottime->free_pages(addr, nr_pages);
|
||||
}
|
||||
|
||||
static efi_status_t efi_file_size(void *__fh, efi_char16_t *filename_16,
|
||||
|
|
Loading…
Reference in New Issue