From patchwork Thu Dec 23 17:57:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: vishnu.banavath@arm.com X-Patchwork-Id: 1828 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E9D98C433EF for ; Thu, 23 Dec 2021 17:57:33 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.36095.1640282252514988613 for ; Thu, 23 Dec 2021 09:57:32 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: vishnu.banavath@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 181FE11D4; Thu, 23 Dec 2021 09:57:32 -0800 (PST) Received: from e125903.cambridge.arm.com (e125903.cambridge.arm.com [10.1.195.30]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 683903F774; Thu, 23 Dec 2021 09:57:31 -0800 (PST) From: vishnu.banavath@arm.com To: meta-arm@lists.yoctoproject.org, Ross.Burton@arm.com Cc: nd@arm.com, Vishnu Banavath Subject: [PATCH 1/1] arm-bsp/u-boot: fix EFI image load alignment Date: Thu, 23 Dec 2021 17:57:17 +0000 Message-Id: <20211223175717.3004-2-vishnu.banavath@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211223175717.3004-1-vishnu.banavath@arm.com> References: <20211223175717.3004-1-vishnu.banavath@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 23 Dec 2021 17:57:33 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/2771 From: Vishnu Banavath This patch is cherry-picked from upstream to fix misalignment of efi load image Change-Id: If64e635a80cd0b6ecb8f09c62aa2b248d0e36f4e Signed-off-by: Vishnu Banavath --- ...fi_loader-Fix-loaded-image-alignment.patch | 137 ++++++++++++++++++ .../recipes-bsp/u-boot/u-boot_%.bbappend | 1 + 2 files changed, 138 insertions(+) create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0049-efi_loader-Fix-loaded-image-alignment.patch diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0049-efi_loader-Fix-loaded-image-alignment.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0049-efi_loader-Fix-loaded-image-alignment.patch new file mode 100644 index 0000000..f329c45 --- /dev/null +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0049-efi_loader-Fix-loaded-image-alignment.patch @@ -0,0 +1,137 @@ +Upstream-Status: Backport [ebdea88d57d5e67b8f6e6cf615300eedbc7200a9] +Signed-off-by: Vishnu Banavath + +From 2b41b8308f5389a40df07ea263501fecfcde2962 Mon Sep 17 00:00:00 2001 +From: Vishnu Banavath +Date: Thu, 23 Dec 2021 11:47:13 +0000 +Subject: [PATCH] efi_loader: Fix loaded image alignment +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +We are ignoring the alignment communicated via the PE/COFF header. +Starting 5.10 the Linux kernel will loudly complain about it. For more +details look at [1] (in linux kernel). + +So add a function that can allocate aligned EFI memory and use it for +our +relocated loaded image. + +[1] c32ac11da3f83 ("efi/libstub: arm64: Double check image alignment at +entry") +Signed-off-by: Ilias Apalodimas's avatarIlias Apalodimas + +Tested-by: default avatarVincent Stehlé +Acked-by: default avatarArd Biesheuvel +Reviewed-by: Heinrich Schuchardt's avatarHeinrich Schuchardt + + +diff --git a/include/efi_loader.h b/include/efi_loader.h +index ebee330c68..f805ce25f0 100644 +--- a/include/efi_loader.h ++++ b/include/efi_loader.h +@@ -677,6 +677,8 @@ struct efi_device_path *efi_get_dp_from_boot(const efi_guid_t guid); + #define efi_size_in_pages(size) (((size) + EFI_PAGE_MASK) >> EFI_PAGE_SHIFT) + /* Generic EFI memory allocator, call this to get memory */ + void *efi_alloc(uint64_t len, int memory_type); ++/* Allocate pages on the specified alignment */ ++void *efi_alloc_aligned_pages(u64 len, int memory_type, size_t align); + /* More specific EFI memory allocator, called by EFI payloads */ + efi_status_t efi_allocate_pages(enum efi_allocate_type type, + enum efi_memory_type memory_type, +diff --git a/lib/efi_loader/efi_image_loader.c b/lib/efi_loader/efi_image_loader.c +index e9572d4d5d..1fa61217be 100644 +--- a/lib/efi_loader/efi_image_loader.c ++++ b/lib/efi_loader/efi_image_loader.c +@@ -898,9 +898,9 @@ efi_status_t efi_load_pe(struct efi_loaded_image_obj *handle, + image_base = opt->ImageBase; + efi_set_code_and_data_type(loaded_image_info, opt->Subsystem); + handle->image_type = opt->Subsystem; +- virt_size = ALIGN(virt_size, opt->SectionAlignment); +- efi_reloc = efi_alloc(virt_size, +- loaded_image_info->image_code_type); ++ efi_reloc = efi_alloc_aligned_pages(virt_size, ++ loaded_image_info->image_code_type, ++ opt->SectionAlignment); + if (!efi_reloc) { + log_err("Out of memory\n"); + ret = EFI_OUT_OF_RESOURCES; +@@ -914,9 +914,9 @@ efi_status_t efi_load_pe(struct efi_loaded_image_obj *handle, + image_base = opt->ImageBase; + efi_set_code_and_data_type(loaded_image_info, opt->Subsystem); + handle->image_type = opt->Subsystem; +- virt_size = ALIGN(virt_size, opt->SectionAlignment); +- efi_reloc = efi_alloc(virt_size, +- loaded_image_info->image_code_type); ++ efi_reloc = efi_alloc_aligned_pages(virt_size, ++ loaded_image_info->image_code_type, ++ opt->SectionAlignment); + if (!efi_reloc) { + log_err("Out of memory\n"); + ret = EFI_OUT_OF_RESOURCES; +diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c +index f4acbee4f9..7f0b507281 100644 +--- a/lib/efi_loader/efi_memory.c ++++ b/lib/efi_loader/efi_memory.c +@@ -549,6 +549,58 @@ efi_status_t efi_free_pages(uint64_t memory, efi_uintn_t pages) + return ret; + } + ++/** ++ * efi_alloc_aligned_pages - allocate ++ * ++ * @len: len in bytes ++ * @memory_type: usage type of the allocated memory ++ * @align: alignment in bytes ++ * Return: aligned memory or NULL ++ */ ++void *efi_alloc_aligned_pages(u64 len, int memory_type, size_t align) ++{ ++ u64 req_pages = efi_size_in_pages(len); ++ u64 true_pages = req_pages + efi_size_in_pages(align) - 1; ++ u64 free_pages; ++ u64 aligned_mem; ++ efi_status_t r; ++ u64 mem; ++ ++ /* align must be zero or a power of two */ ++ if (align & (align - 1)) ++ return NULL; ++ ++ /* Check for overflow */ ++ if (true_pages < req_pages) ++ return NULL; ++ ++ if (align < EFI_PAGE_SIZE) { ++ r = efi_allocate_pages(EFI_ALLOCATE_ANY_PAGES, memory_type, ++ req_pages, &mem); ++ return (r == EFI_SUCCESS) ? (void *)(uintptr_t)mem : NULL; ++ } ++ ++ r = efi_allocate_pages(EFI_ALLOCATE_ANY_PAGES, memory_type, ++ true_pages, &mem); ++ if (r != EFI_SUCCESS) ++ return NULL; ++ ++ aligned_mem = ALIGN(mem, align); ++ /* Free pages before alignment */ ++ free_pages = efi_size_in_pages(aligned_mem - mem); ++ if (free_pages) ++ efi_free_pages(mem, free_pages); ++ ++ /* Free trailing pages */ ++ free_pages = true_pages - (req_pages + free_pages); ++ if (free_pages) { ++ mem = aligned_mem + req_pages * EFI_PAGE_SIZE; ++ efi_free_pages(mem, free_pages); ++ } ++ ++ return (void *)(uintptr_t)aligned_mem; ++} ++ + /** + * efi_allocate_pool - allocate memory from pool + * +-- +2.17.1 + diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend index 4e30356..51973dd 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend @@ -58,6 +58,7 @@ SRC_URI:append:corstone1000 = " \ file://0046-efi_loader-populate-ESRT-table-if-EFI_ESRT-config-op.patch \ file://0047-efi_firmware-add-get_image_info-for-corstone1000.patch \ file://0048-corstone1000-enable-ethernet-device.patch \ + file://0049-efi_loader-Fix-loaded-image-alignment.patch \ " #