various memory related fixups
Subsystems (2)
v9 cover various memory related fixups
From: Randolph Sapp <[email protected]>
Nitpicks and fixes from the discovery thread on adding PocketBeagle2 support [1]. This does a lot of general setup required for the device, but these modifications themselves aren't device specific. For those specifically interested in PocketBeagle2 support and don't care about these details, my development branch is public [2].
That first patch may provoke some opinions, but honestly if that warning was still present I wouldn't have spent a week poking holes in both the EFI and LMB allocations systems. Please let me know if there is a specific usecase that it breaks though.
[1] https://lore.kernel.org/all/[email protected]/
[2] https://github.com/StaticRocket/u-boot/tree/feature/pocketbeagle2
v2:
- Remove additional increment and decrement in lmb_free_fdt_regions
- Drop the patch to backfill EFI_CONVENTIONAL_MEMORY
- Adjust the removal loop nitpick patch description
- Change the reserve memory patch to use new end_addr_sp
v3:
- Update lmb flags to use the macro documentation for constants
- Change efi_mem_sort to use list_for_each_entry_safe
v4:
- Fix typos in LMB allocation flags macro documentation
- Rename end_addr_sp to initial_relocaddr
- Keep the map_sysmem dance in the efi u-boot reservation
- Use the active device tree pointed to by gd->fdt_blob to clean up old reservations
v5:
- Keep return value as long in boot_fdt_reserve_region
- Fix formatting in initial_relocaddr patch
v6:
- Drop patches that have been picked up already
- Add board_get_usable_ram_top for the sandbox
- s/boot_fdt_reserve_region/boot_fdt_handle_region/
v7:
- Remove board_get_usable_ram_top for the sandbox
- Reinstate bank hopping logic for U-Boot reserved region
- Update description for gd->initial_relocaddr, make it clear this is also an exclusive value
- Add disclaimer to boot_fdt_add_mem_rsv_regions
- Add static boot_fdt_handle_mem_rsv_regions as a generic walker for the two calls into boot_fdt_add_mem_rsv_regions
- Make boot_fdt_add_mem_rsv_regions fdt pointer const
- Leave the PRAM region out of the reservation. Previous commit messages indicate that this is intended.
- Add a test for boot_fdt_add_mem_rsv_regions
v8:
- Adjust initial_relocaddr doc string
- Convert ref to fixes tag as requested
- Rework test_boot_fdt_add_mem_rsv_regions to mitigate lingering state
v9:
- See patch specific changelogs
Randolph Sapp (3):
boot: image-fdt: free old dtb reservations
test: boot: add a fdt reserved region check
memory: reserve from start_addr_sp to initial_relocaddr
boot/image-fdt.c | 77 +++++++++++++++++++++++-------- common/board_f.c | 9 +++- include/asm-generic/global_data.h | 9 ++++ include/image.h | 2 +- lib/efi_loader/efi_memory.c | 2 +- lib/lmb.c | 7 +-- test/boot/Makefile | 1 + test/boot/image_fdt.c | 73 +++++++++++++++++++++++++++++ test/cmd_ut.c | 2 + test/py/tests/test_suite.py | 2 +- 10 files changed, 157 insertions(+), 27 deletions(-) create mode 100644 test/boot/image_fdt.c
Signature · 1 line
2.54.0
PATCH v9 1/3 boot: image-fdt: free old dtb reservations
From: Randolph Sapp <[email protected]>
Add a free flag and an initial call to free allocations covered by the global FDT. This assumes that all calls to boot_fdt_add_mem_rsv_regions occur before the transition to the new device tree, thus we can access the currently active device tree through the global data pointer.
This allows us to clearly indicate to the user when a device tree reservation fails. How we handle this can still use some improvement. Right now we'll keep the default behavior and try to boot anyway.
---
v7:
- Add disclaimer to boot_fdt_add_mem_rsv_regions
- Add static boot_fdt_handle_mem_rsv_regions as a generic walker for the two calls into boot_fdt_add_mem_rsv_regions
- Make boot_fdt_add_mem_rsv_regions fdt pointer const
v8:
- Convert ref to fixes tag as requested
--- boot/image-fdt.c | 77 +++++++++++++++++++++++++++++++++++------------- include/image.h | 2 +- 2 files changed, 58 insertions(+), 21 deletions(-)
boot/image-fdt.c +57 -20
@@ -69,35 +69,50 @@ static const struct legacy_img_hdr *image_get_fdt(ulong fdt_addr) }#endif -static void boot_fdt_reserve_region (u64 addr,u64 size,u32 flags) +/** +* boot_fdt_handle_region - Reserve or free a given FDT region in LMB +* @addr: Reservation base address +* @size: Reservation size +* @flags: Reservation flags +* @free: Indicate if region is being freed or allocated +* +* Add or free a given reservation from LMB. This reports to the user if any +* errors occurred during either operation. +*/ +static void boot_fdt_handle_region (u64 addr,u64 size,u32 flags,bool free) {long ret;phys_addr_t rsv_addr; rsv_addr = (phys_addr_t )addr; - ret =lmb_alloc_mem (LMB_MEM_ALLOC_ADDR ,0 , &rsv_addr, size, flags); +if (free) + ret =lmb_free (rsv_addr, size, flags); +else + ret =lmb_alloc_mem (LMB_MEM_ALLOC_ADDR ,0 , &rsv_addr, size, + flags); +if (!ret) { -debug (" reserving fdt memory region: addr=%llx size=%llx flags=%x\n" , - (unsigned long long )addr, +debug (" %s fdt memory region: addr=%llx size=%llx flags=%x\n" , + free ?"freed" :"reserved" , (unsigned long long )addr, (unsigned long long )size, flags); - }else if (ret != -EEXIST && ret != -EINVAL ) { -puts ("ERROR: reserving fdt memory region failed " ); -printf ("(addr=%llx size=%llx flags=%x)\n" , - (unsigned long long )addr, - (unsigned long long )size, flags); + }else { +printf ("ERROR: %s fdt memory region failed (addr=%llx size=%llx flags=%x): %ld\n" , + free ?"freeing" :"reserving" , (unsigned long long )addr, + (unsigned long long )size, flags, ret); } }/** -* boot_fdt_add_mem_rsv_regions - Mark the memreserve and reserved-memory -* sections as unusable +* boot_fdt_handle_mem_rsv_regions - Handle FDT memreserve and reserved-memory +* sections * @fdt_blob: pointer to fdt blob base address +* @free: indicate if regions are being freed * -* Adds the and reserved-memorymemreserve regions in the dtb to the lmb block. -* Adding the memreserve regions prevents u-boot from using them to store the -* initrd or the fdt blob. +* Adds or removes reserved-memory and memreserve regions in the dtb to the lmb +* block. Adding the memreserve regions prevents u-boot from using them to store +* the initrd or the fdt blob. */ -void boot_fdt_add_mem_rsv_regions (void *fdt_blob) +static void boot_fdt_handle_mem_rsv_regions (const void *fdt_blob,bool free) {uint64_t addr, size;int i, total, ret;
@@ -105,15 +120,12 @@ void boot_fdt_add_mem_rsv_regions(void *fdt_blob)struct fdt_resource res;u32 flags; -if (fdt_check_header (fdt_blob) !=0 ) -return ; -/* process memreserve sections */ total =fdt_num_mem_rsv (fdt_blob);for (i =0 ; i < total; i++) {if (fdt_get_mem_rsv (fdt_blob, i, &addr, &size) !=0 )continue ; -boot_fdt_reserve_region (addr, size,LMB_NOOVERWRITE ); +boot_fdt_handle_region (addr, size,LMB_NOOVERWRITE , free); }/* process reserved-memory */
@@ -131,7 +143,7 @@ void boot_fdt_add_mem_rsv_regions(void *fdt_blob) flags =LMB_NOMAP ; addr = res.start; size = res.end - res.start +1 ; -boot_fdt_reserve_region (addr, size, flags); +boot_fdt_handle_region (addr, size, flags, free); } subnode =fdt_next_subnode (fdt_blob, subnode);
@@ -139,6 +151,31 @@ void boot_fdt_add_mem_rsv_regions(void *fdt_blob) } } +/** +* boot_fdt_add_mem_rsv_regions - Add FDT memreserve and reserved-memory +* sections +* @fdt_blob: pointer to fdt blob base address +* +* Adds reserved-memory and memreserve regions in the dtb to the lmb block. +* Adding the memreserve regions prevents u-boot from using them to store the +* initrd or the fdt blob. +* +* This function will attempt to clean the currently active reservations if a +* new device tree blob is given. This must be called before gd->fdt_blob is +* switched. +*/ +void boot_fdt_add_mem_rsv_regions (const void *fdt_blob) +{ +if (fdt_check_header (fdt_blob) !=0 ) +return ; + +/* Remove old regions */ +if (gd->fdt_blob != fdt_blob) +boot_fdt_handle_mem_rsv_regions (gd->fdt_blob, true); + +boot_fdt_handle_mem_rsv_regions (fdt_blob, false); +} +/** * boot_relocate_fdt - relocate flat device tree * @of_flat_tree: pointer to a char* variable, will hold fdt start address
include/image.h +1 -1
@@ -827,7 +827,7 @@ int boot_get_fdt(void *buf, const char *select, uint arch, struct bootm_headers *images, char **of_flat_tree, ulong *of_size); -void boot_fdt_add_mem_rsv_regions (void *fdt_blob); +void boot_fdt_add_mem_rsv_regions (const void *fdt_blob);int boot_relocate_fdt (char **of_flat_tree,ulong *of_size); int boot_ramdisk_high(ulong rd_data, ulong rd_len, ulong *initrd_start,
Signature · 1 line
2.54.0
PATCH v9 2/3 test: boot: add a fdt reserved region check
In reply to [email protected]From: Randolph Sapp <[email protected]>
Add a image_fdt suite and a check for boot_fdt_add_mem_rsv_regions. This will ensure the user is properly informed of any reservation failures. It will also validate that reservations are cleaned up correctly when switching FDTs.
---
v8:
- Rework test_boot_fdt_add_mem_rsv_regions to mitigate lingering state
v9:
- Remove UTF_LIVE_TREE as requested
- Use ut_check_console_end and ut_assertnonnull
--- test/boot/Makefile | 1 + test/boot/image_fdt.c | 73 +++++++++++++++++++++++++++++++++++++ test/cmd_ut.c | 2 + test/py/tests/test_suite.py | 2 +- 4 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 test/boot/image_fdt.c
test/boot/Makefile +1 -0
@@ -14,6 +14,7 @@ endif ifdef CONFIG_SANDBOX obj-$(CONFIG_$(PHASE_)CMDLINE) += bootm.o +obj-$(CONFIG_$(PHASE_)OF_LIBFDT) += image_fdt.o endif obj-$(CONFIG_MEASURED_BOOT) += measurement.o
test/boot/image_fdt.c new file +73 -0
73 lines not on this page · raw message
test/cmd_ut.c +2 -0
@@ -61,6 +61,7 @@ SUITE_DECL(fdt);SUITE_DECL (fdt_overlay);SUITE_DECL (font);SUITE_DECL (hush); +SUITE_DECL (image_fdt);SUITE_DECL (lib);SUITE_DECL (loadm);SUITE_DECL (log);
@@ -88,6 +89,7 @@ static struct suite suites[] = {SUITE (fdt_overlay,"device tree overlays" ),SUITE (font,"font command" ),SUITE (hush,"hush behaviour" ), +SUITE (image_fdt,"image fdt parsing" ),SUITE (lib,"library functions" ),SUITE (loadm,"loadm command parameters and loading memory blob" ), SUITE(log, "logging functions"),
test/py/tests/test_suite.py +1 -1
@@ -8,7 +8,7 @@ import re EXPECTED_SUITES = [ 'addrmap', 'bdinfo', 'bloblist', 'bootm', 'bootstd', 'cmd', 'common', 'dm', 'env', 'exit', 'fdt_overlay', - 'fdt', 'font', 'hush', 'lib', + 'fdt', 'font', 'hush', 'image_fdt', 'lib', 'loadm', 'log', 'mbr', 'measurement', 'mem', 'pci_mps', 'setexpr', 'upl', ]
Signature · 1 line
2.54.0
PATCH v9 3/3 memory: reserve from start_addr_sp to initial_relocaddr
In reply to [email protected]From: Randolph Sapp <[email protected]>
Add a new global data struct member called initial_relocaddr. This stores the original value of relocaddr, directly from setup_dest_addr. This is specifically to avoid any adjustments made by other init functions.
Reserve the memory from gd->start_addr_sp - CONFIG_STACK_SIZE to gd->initial_relocaddr instead of gd->ram_top. This allows platform specific relocation addresses to work without unnecessarily painting over a large range.
---
v7:
- Reinstate bank hopping logic for U-Boot reserved region
- Update description for gd->initial_relocaddr, make it clear this is also an exclusive value
- Leave the PRAM region out of the reservation. Previous commit messages indicate that this is intended.
v8:
- Adjust initial_relocaddr doc string
--- common/board_f.c | 9 ++++++++- include/asm-generic/global_data.h | 9 +++++++++ lib/efi_loader/efi_memory.c | 2 +- lib/lmb.c | 7 ++++--- 4 files changed, 22 insertions(+), 5 deletions(-)
common/board_f.c +8 -1
@@ -330,6 +330,8 @@ __weak int arch_setup_dest_addr(void)static int setup_dest_addr (void ) { +int ret; +debug ("Monitor len: %08x\n" , gd->mon_len);/* * Ram is setup, size stored in gd !!
@@ -356,7 +358,12 @@ static int setup_dest_addr(void) gd->relocaddr = gd->ram_top;debug ("Ram top: %08llX\n" , (unsigned long long )gd->ram_top); -return arch_setup_dest_addr (); + ret =arch_setup_dest_addr (); +if (ret) +return ret; + + gd->initial_relocaddr = gd->relocaddr; +return 0 ; }#ifdef CFG_PRAM
include/asm-generic/global_data.h +9 -0
@@ -107,6 +107,15 @@ struct global_data {* GDB using the 'add-symbol-file u-boot <relocaddr>' command. */ unsigned long relocaddr; +/** +* @initial_relocaddr: top address of U-Boot in RAM +* +* This should be the value of relocaddr after setup_dest_addr() and +* before reserve_pram() or any other allocations or reservations shift +* it. This address will, depending on the platform, be equivalent to +* ram_top and should also be considered an exclusive address. +*/ +unsigned long initial_relocaddr;/** * @irq_sp: IRQ stack pointer */
lib/efi_loader/efi_memory.c +1 -1
@@ -871,7 +871,7 @@ static void add_u_boot_and_runtime(void)/* Add U-Boot */ uboot_start = ((uintptr_t )map_sysmem (gd->start_addr_sp,0 ) - uboot_stack_size) & ~EFI_PAGE_MASK ; - uboot_pages = ((uintptr_t )map_sysmem (gd->ram_top -1 ,0 ) - + uboot_pages = ((uintptr_t )map_sysmem (gd->initial_relocaddr -1 ,0 ) - uboot_start +EFI_PAGE_MASK ) >>EFI_PAGE_SHIFT ;efi_update_memory_map (uboot_start, uboot_pages,EFI_BOOT_SERVICES_CODE , false, false);
lib/lmb.c +4 -3
@@ -540,13 +540,14 @@ static void lmb_reserve_uboot_region(void)ulong pram =0 ; rsv_start = gd->start_addr_sp -CONFIG_STACK_SIZE ; - end = gd->ram_top; + end = gd->initial_relocaddr;/* * Reserve memory from aligned address below the bottom of U-Boot stack -* until end of RAM area to prevent LMB from overwriting that memory. +* until the original relocation address to prevent LMB from +* overwriting that memory. */ -debug ("## Current stack ends at 0x%08lx " , (ulong )rsv_start); +debug ("## Current stack ends at 0x%08lx\n" , (ulong )rsv_start);#ifdef CFG_PRAM pram =env_get_ulong ("pram" ,10 ,CFG_PRAM );
Signature · 1 line
2.54.0