[U-Boot] [PATCH v3 0/8] efi_loader: Fix inconsistencies in efi_add_memory_map usage
V3:
- Takes addition of function description and makes it a separate patch - Subtracts dangling "uint64_t r" in V2 patch
Heinrich if you want to take this set as is add a SOB to "efi_loader: Add a method description to efi_add_memory_map"
and if not please take in my change for "efi_add_runtime_mmio()" to your single patch version.
V2:
Following on from a discussion with Heinrich Schuchardt, please find a reworked set of patches updating efi_add_memory_map() to
- Return efi_status_t - Return EFI_SUCCESS where appropriate - Return EFI_NO_MAPPING in two cases where zero was returned to indicate an error - Updating of users of efi_add_memory_map() to parse for EFI_SUCCESS/efi_status_t
I've opted to maintain other returned status codes propogated by functions that call efi_add_memory_map(). For example efi_add_runtime_mmio() continues return EFI_OUT_OF_RESOURCES instead of directly returning the result code of efi_add_memory_map(). The idea being that other users of the EFI layer such as Linux or grub would not be affected by this internal u-boot change.
V1:
https://patchwork.ozlabs.org/patch/1129402/ https://patchwork.ozlabs.org/patch/1129403/
These two patches fix some inconsistent usage around efi_add_memory_map().
The first patch fixes the case where there is a mapping for an address starting at 0 as is the case on RPI3. We should not print an error for this. efi_add_memory_map(start = 0, ...) succeeds but efi_carve_out_dt_rsv() does not properly parse the result code.
The second patch fixes the result code returned by efi_add_memory_map() in two instances. Returing zero is the same as returning EFI_SUCCESS, we should return one of the error codes from include/efi.h only, not zero to indicate failure.
Bryan O'Donoghue (7): efi_loader: Change return type of efi_add_memory_map() efi_loader: Change efi_add_memory_map() to return EFI_SUCCESS efi_loader: Return non-zero for error in efi_add_memory_map() efi_loader: Update efi_allocate_pages() to new efi_add_memory_map() efi_loader: Update efi_free_pages() to new efi_add_memory_map() efi_loader: Treat the result of efi_add_memory_map as efi_status_t efi_loader: Capture efi_add_memory_map() result efi_add_runtime_mmio()
Heinrich Schuchardt (1): efi_loader: Add a method description to efi_add_memory_map
cmd/bootefi.c | 4 ++-- include/efi_loader.h | 4 ++-- lib/efi_loader/efi_memory.c | 34 ++++++++++++++++++++-------------- lib/efi_loader/efi_runtime.c | 6 +++--- 4 files changed, 27 insertions(+), 21 deletions(-)
We currently have some inconsistent use of efi_add_memory_map() throughout the code. In particular the return value of efi_add_memory_map() is not interpreted the same way by various users in the codebase.
This patch changes efi_add_memory_map() to return efi_status_t. A subsequent set of patches will change the internal values themselves and finally the users of efi_add_memory_map().
Signed-off-by: Bryan O'Donoghue pure.logic@nexus-software.ie Suggested-by: Heinrich Schuchardt xypron.glpk@gmx.de --- include/efi_loader.h | 4 ++-- lib/efi_loader/efi_memory.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/include/efi_loader.h b/include/efi_loader.h index b07155cecb..69255f40ea 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -470,8 +470,8 @@ efi_status_t efi_get_memory_map(efi_uintn_t *memory_map_size, efi_uintn_t *descriptor_size, uint32_t *descriptor_version); /* Adds a range into the EFI memory map */ -uint64_t efi_add_memory_map(uint64_t start, uint64_t pages, int memory_type, - bool overlap_only_ram); +efi_status_t efi_add_memory_map(uint64_t start, uint64_t pages, int memory_type, + bool overlap_only_ram); /* Called by board init to initialize the EFI drivers */ efi_status_t efi_driver_init(void); /* Called by board init to initialize the EFI memory map */ diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index 27379381e8..c5a8f3ab29 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -223,8 +223,8 @@ static s64 efi_mem_carve_out(struct efi_mem_list *map, return EFI_CARVE_LOOP_AGAIN; }
-uint64_t efi_add_memory_map(uint64_t start, uint64_t pages, int memory_type, - bool overlap_only_ram) +efi_status_t efi_add_memory_map(uint64_t start, uint64_t pages, int memory_type, + bool overlap_only_ram) { struct list_head *lhandle; struct efi_mem_list *newlist;
From: Heinrich Schuchardt xypron.glpk@gmx.de
Adds a method description of efi_add_memory_map().
Signed-off-by: Bryan O'Donoghue pure.logic@nexus-software.ie --- lib/efi_loader/efi_memory.c | 9 +++++++++ 1 file changed, 9 insertions(+)
diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index c5a8f3ab29..8625968396 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -223,6 +223,15 @@ static s64 efi_mem_carve_out(struct efi_mem_list *map, return EFI_CARVE_LOOP_AGAIN; }
+/** + * efi_add_memory_map() - add memory area to the memory map + * + * @start: start address, must be a multiple of EFI_PAGE_SIZE + * @pages: number of pages to add + * @memory_type: type of memory added + * @overlap_only_ram: the memory area must overlap existing + * Return: status code + */ efi_status_t efi_add_memory_map(uint64_t start, uint64_t pages, int memory_type, bool overlap_only_ram) {
efi_add_memory_map() wants to return 0 to indicate success in two places. Instead of returning zero we should return the defined efi_status_t return value EFI_SUCCESS.
Signed-off-by: Bryan O'Donoghue pure.logic@nexus-software.ie --- lib/efi_loader/efi_memory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index 8625968396..e3a3b03a2d 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -248,7 +248,7 @@ efi_status_t efi_add_memory_map(uint64_t start, uint64_t pages, int memory_type, return EFI_INVALID_PARAMETER;
if (!pages) - return start; + return EFI_SUCCESS;
++efi_memory_map_key; newlist = calloc(1, sizeof(*newlist)); @@ -335,7 +335,7 @@ efi_status_t efi_add_memory_map(uint64_t start, uint64_t pages, int memory_type, } }
- return start; + return EFI_SUCCESS; }
/**
The previous implementation of efi_add_memory_map() returned the passed address on success, instead of an efi_status_t.
With the new function signature instead of returning zero, return EFI_NO_MAPPING on carve-out errors.
Fixes: 5d00995c361c ("efi_loader: Implement memory allocation and map") Fixes: 74c16acce30b ("efi_loader: Don't allocate from memory holes") Cc: Heinrich Schuchardt xypron.glpk@gmx.de Cc: Alexander Graf agraf@csgraf.de Signed-off-by: Bryan O'Donoghue pure.logic@nexus-software.ie --- lib/efi_loader/efi_memory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index e3a3b03a2d..620afbeda8 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -286,7 +286,7 @@ efi_status_t efi_add_memory_map(uint64_t start, uint64_t pages, int memory_type, * The user requested to only have RAM overlaps, * but we hit a non-RAM region. Error out. */ - return 0; + return EFI_NO_MAPPING; case EFI_CARVE_NO_OVERLAP: /* Just ignore this list entry */ break; @@ -316,7 +316,7 @@ efi_status_t efi_add_memory_map(uint64_t start, uint64_t pages, int memory_type, * The payload wanted to have RAM overlaps, but we overlapped * with an unallocated region. Error out. */ - return 0; + return EFI_NO_MAPPING; }
/* Add our new map */
efi_add_memory_map() now returns efi_status_t not the passed uint64_t address on success. We need to capture that change in efi_allocate_pages().
Signed-off-by: Bryan O'Donoghue pure.logic@nexus-software.ie --- lib/efi_loader/efi_memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index 620afbeda8..2b06acb2ae 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -464,7 +464,7 @@ efi_status_t efi_allocate_pages(int type, int memory_type, }
/* Reserve that map in our memory maps */ - if (efi_add_memory_map(addr, pages, memory_type, true) != addr) + if (efi_add_memory_map(addr, pages, memory_type, true) != EFI_SUCCESS) /* Map would overlap, bail out */ return EFI_OUT_OF_RESOURCES;
efi_add_memory_map() now returns efi_status_t not the passed uint64_t address on success. We need to capture that change in efi_free_pages().
Signed-off-by: Bryan O'Donoghue pure.logic@nexus-software.ie --- lib/efi_loader/efi_memory.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index 2b06acb2ae..9c59a9637c 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -496,7 +496,6 @@ void *efi_alloc(uint64_t len, int memory_type) */ efi_status_t efi_free_pages(uint64_t memory, efi_uintn_t pages) { - uint64_t r = 0; efi_status_t ret;
ret = efi_check_allocated(memory, true); @@ -510,13 +509,11 @@ efi_status_t efi_free_pages(uint64_t memory, efi_uintn_t pages) return EFI_INVALID_PARAMETER; }
- r = efi_add_memory_map(memory, pages, EFI_CONVENTIONAL_MEMORY, false); - /* Merging of adjacent free regions is missing */ - - if (r == memory) - return EFI_SUCCESS; + ret = efi_add_memory_map(memory, pages, EFI_CONVENTIONAL_MEMORY, false); + if (ret != EFI_SUCCESS) + return EFI_NOT_FOUND;
- return EFI_NOT_FOUND; + return ret; }
/**
On 7/15/19 1:01 AM, Bryan O'Donoghue wrote:
efi_add_memory_map() now returns efi_status_t not the passed uint64_t address on success. We need to capture that change in efi_free_pages().
Signed-off-by: Bryan O'Donoghue pure.logic@nexus-software.ie
lib/efi_loader/efi_memory.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index 2b06acb2ae..9c59a9637c 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -496,7 +496,6 @@ void *efi_alloc(uint64_t len, int memory_type) */ efi_status_t efi_free_pages(uint64_t memory, efi_uintn_t pages) {
uint64_t r = 0; efi_status_t ret;
ret = efi_check_allocated(memory, true);
@@ -510,13 +509,11 @@ efi_status_t efi_free_pages(uint64_t memory, efi_uintn_t pages) return EFI_INVALID_PARAMETER; }
- r = efi_add_memory_map(memory, pages, EFI_CONVENTIONAL_MEMORY, false);
- /* Merging of adjacent free regions is missing */
Please, leave this TODO comment in the code. It is really something that is worth fixing.
As said the patches of the series should be squashed. E.g. with 'rebase -i HEAD~8'.
When bisecting an unrelated problem you do not want to end up with something not working which is only the result of changes belonging together being in separate patches.
Patch 2 with the function description is the only one that in principle could be separated. But I see no need to do so.
Otherwise the series is ok.
Reviewed-by: Heinrich Schuchardt xypron.glpk@gmx.de
- if (r == memory)
return EFI_SUCCESS;
- ret = efi_add_memory_map(memory, pages, EFI_CONVENTIONAL_MEMORY, false);
- if (ret != EFI_SUCCESS)
return EFI_NOT_FOUND;
- return EFI_NOT_FOUND;
return ret; }
/**
On 15/07/2019 00:57, Heinrich Schuchardt wrote:
Reviewed-by: Heinrich Schuchardt xypron.glpk@gmx.de
NP I'll squash these down in the morning.
The return type of efi_add_memory_map() has been updated to return efi_status_t as a result we should check the return of efi_add_memory_map() against EFI_SUCCESS as opposed to the original input addr parameter.
This change will also remove this error message on raspberrypi 3 boot: "FDT memrsv map 0: Failed to add to map".
Fixes: 416e07e2cfcf ("efi: Drop error return in efi_carve_out_dt_rsv()") Cc: Heinrich Schuchardt xypron.glpk@gmx.de Cc: Alexander Graf agraf@csgraf.de Signed-off-by: Bryan O'Donoghue pure.logic@nexus-software.ie --- cmd/bootefi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/cmd/bootefi.c b/cmd/bootefi.c index c19256e00d..04d3e3e4a7 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -169,8 +169,8 @@ static void efi_carve_out_dt_rsv(void *fdt)
pages = efi_size_in_pages(size + (addr & EFI_PAGE_MASK)); addr &= ~EFI_PAGE_MASK; - if (!efi_add_memory_map(addr, pages, EFI_RESERVED_MEMORY_TYPE, - false)) + if (efi_add_memory_map(addr, pages, EFI_RESERVED_MEMORY_TYPE, + false) != EFI_SUCCESS) printf("FDT memrsv map %d: Failed to add to map\n", i); } }
efi_add_runtime_mmio() does an efi_add_memory_map() call. We have recently changed the return value of efi_add_memory_map() to return an efi_status_t code.
This patch captures the result code of efi_add_memory_map() and if that result code is not EFI_SUCCESS returns EFI_OUT_OF_RESOURCES;
Signed-off-by: Bryan O'Donoghue pure.logic@nexus-software.ie --- lib/efi_loader/efi_runtime.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/efi_loader/efi_runtime.c b/lib/efi_loader/efi_runtime.c index 40fdc0ea92..12ee6faadd 100644 --- a/lib/efi_loader/efi_runtime.c +++ b/lib/efi_loader/efi_runtime.c @@ -659,10 +659,10 @@ efi_status_t efi_add_runtime_mmio(void *mmio_ptr, u64 len) struct efi_runtime_mmio_list *newmmio; u64 pages = (len + EFI_PAGE_MASK) >> EFI_PAGE_SHIFT; uint64_t addr = *(uintptr_t *)mmio_ptr; - uint64_t retaddr; + efi_status_t ret;
- retaddr = efi_add_memory_map(addr, pages, EFI_MMAP_IO, false); - if (retaddr != addr) + ret = efi_add_memory_map(addr, pages, EFI_MMAP_IO, false); + if (ret != EFI_SUCCESS) return EFI_OUT_OF_RESOURCES;
newmmio = calloc(1, sizeof(*newmmio));
participants (3)
-
Bryan O'Donoghue -
Bryan O'Donoghue -
Heinrich Schuchardt