Skip to contentSkip to conversation

various memory related fixups

PATCH Superseded [email protected] 2 participants 9 messages May 13 – May 15

Subsystems (2)

v7 of 10 Superseded Latest is v10 →

lore
Share & tools
lore
#0 lore raw

v7 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

Randolph Sapp (3):
boot_fdt_add_mem_rsv_regions: 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             | 53 +++++++++++++++++++++
 test/cmd_ut.c                     |  2 +
 test/py/tests/test_suite.py       |  2 +-
 10 files changed, 137 insertions(+), 27 deletions(-)
 create mode 100644 test/boot/image_fdt.c
Signature · 1 line
2.54.0
#1 lore raw

PATCH v7 1/3 boot_fdt_add_mem_rsv_regions: 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.

This functionality was broken in:
5a6aa7d ("boot: fdt: Handle already reserved memory in boot_fdt_reserve_region()")

---

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

 boot/image-fdt.c | 77 +++++++++++++++++++++++++++++++++++-------------
 include/image.h  |  2 +-
 2 files changed, 58 insertions(+), 21 deletions(-)
boot/image-fdt.c +57 -20
index a3a4fb8b558..1150131a11e 100644
@@ -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
index 34efac6056d..151619f42bf 100644
@@ -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
Reviewed-by on v7 1/3
#2 lore raw

Re: [PATCHv7 1/3] boot_fdt_add_mem_rsv_regions: free old dtb reservations

Hi Randolph,

Quoted 14 lines · Randolph Sapp

boot_fdt_add_mem_rsv_regions: free old dtb reservations

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.

This functionality was broken in:
5a6aa7d ("boot: fdt: Handle already reserved memory in boot_fdt_reserve_region()")

Quoted 6 lines

boot/image-fdt.c | 77 +++++++++++++++++++++++++++++++++++++++++---------------

 include/image.h  |  2 +-
 2 files changed, 58 insertions(+), 21 deletions(-)

Subject prefix should be something like 'boot: fdt:' rather than the function name. Please also turn the broken-in reference into a proper
Fixes: tag with a 12-char hash:

Fixes 5a6aa7d59133 ("boot: fdt: Handle already reserved memory in

boot_fdt_reserve_region()")

Regards,
Simon

#3 lore raw

PATCH v7 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.

---
 test/boot/Makefile          |  1 +
 test/boot/image_fdt.c       | 53 +++++++++++++++++++++++++++++++++++++
 test/cmd_ut.c               |  2 ++
 test/py/tests/test_suite.py |  2 +-
 4 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 test/boot/image_fdt.c
test/boot/Makefile +1 -0
index 89538d4f0a6..640af6593cd 100644
@@ -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 +53 -0

53 lines not on this page · raw message

test/cmd_ut.c +2 -0
index 44e5fdfdaa6..363ed4eab30 100644
@@ -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
index 7fe9a90dfd3..08285f12a5f 100644
@@ -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
#4 lore raw

Re: [PATCHv7 2/3] test: boot: add a fdt reserved region check

Hi Randolph,

Quoted 7 lines · Randolph Sapp

test: boot: add a fdt reserved region check

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.

Quoted 7 lines

test/boot/Makefile | 1 +

 test/boot/image_fdt.c       | 53 +++++++++++++++++++++++++++++++++++++++++++++
 test/cmd_ut.c               |  2 ++
 test/py/tests/test_suite.py |  2 +-
 4 files changed, 57 insertions(+), 1 deletion(-)

Change log?

test/boot/image_fdt.c line 8

Quoted 10 lines
test/boot/image_fdt.c +8 -0
@@ -0,0 +1,53 @@
+#include <fdt_support.h>
+#include <asm/global_data.h>
+#include <config.h>
+#include <image.h>
+#include <lmb.h>
+#include <malloc.h>
+#include <test/test.h>
+#include <test/ut.h>

Please sort these: config.h (if needed) first, then the plain top-level headers alphabetically (fdt_support.h, image.h, lmb.h, malloc.h), then asm/global_data.h, then test/*.

test/boot/image_fdt.c line 3

Quoted 5 lines
test/boot/image_fdt.c +3 -0
@@ -0,0 +1,53 @@
+#define FDTDEC_MAX_SIZE (2 * 1024 * 1024)
+
+#define IMAGE_FDT_TEST(_name, _flags) UNIT_TEST(_name, _flags, image_fdt)

FDTDEC_MAX_SIZE is never referenced - looks copied from test/dm/fdtdec.c - please drop it.

test/boot/image_fdt.c line 7

Quoted 9 lines
test/boot/image_fdt.c +7 -0
@@ -0,0 +1,53 @@
+     /* Loading a new device tree should be allowed */
+     blob = malloc(fdt_sz);
+     ut_assertok_ptr(blob);
+     memcpy(blob, gd->fdt_blob, fdt_sz);
+
+     nodeoffset = fdt_path_offset(blob, '/reserved-memory');
+     ut_assertok(fdt_del_node(blob, nodeoffset));

If /reserved-memory is missing, fdt_path_offset() returns a negative libfdt error and fdt_del_node() then fails with a confusing message. Please ut_assert(nodeoffset >= 0) first.

Also, blob is malloc()'d but never freed.

test/boot/image_fdt.c line 6

Quoted 8 lines
test/boot/image_fdt.c +6 -0
@@ -0,0 +1,53 @@
+     boot_fdt_add_mem_rsv_regions(blob);
+     ut_assert_console_end();
+     boot_relocate_fdt((char **)&blob, &fdt_sz);
+
+     /* Reservation should not exist now */
+     ut_asserteq(0, lmb_is_reserved_flags(start, LMB_NOMAP));

What is the boot_relocate_fdt() call testing - could you add a comment? The reservation at start is already gone after boot_fdt_add_mem_rsv_regions(blob), so the final ut_asserteq() does not depend on it. It also allocates from LMB for the relocated copy, which then leaks. I'd drop it, or split it into a separate test with its own assertions. The (char **)&blob cast is a hint that the call doesn't belong here.

test/boot/image_fdt.c line 1

Quoted 3 lines
test/boot/image_fdt.c +1 -0
@@ -0,0 +1,53 @@
+IMAGE_FDT_TEST(test_boot_fdt_add_mem_rsv_regions, UTF_LIVE_TREE | UTF_CONSOLE);

Just to check: the test only touches gd->fdt_blob (the flat tree), so why UTF_LIVE_TREE? If you want it to run regardless of OF_LIVE, drop the flag (or use UTF_FLAT_TREE). If the intent was to avoid running twice, please mention that in a comment.

Regards,
Simon

#5 lore raw

Re: [PATCHv7 2/3] test: boot: add a fdt reserved region check

Quoted 12 lines · Simon Glass

Hi Randolph,

Quoted 9 lines · Randolph Sapp

test: boot: add a fdt reserved region check

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.

Quoted 7 lines
Quoted 5 lines

test/boot/Makefile | 1 +

 test/boot/image_fdt.c       | 53 +++++++++++++++++++++++++++++++++++++++++++++
 test/cmd_ut.c               |  2 ++
 test/py/tests/test_suite.py |  2 +-
 4 files changed, 57 insertions(+), 1 deletion(-)

Change log?

No change log for a patch that didn't exist in the series previously.

Quoted 66 lines

test/boot/image_fdt.c line 8

Quoted 10 lines
test/boot/image_fdt.c +8 -0
@@ -0,0 +1,53 @@
+#include <fdt_support.h>
+#include <asm/global_data.h>
+#include <config.h>
+#include <image.h>
+#include <lmb.h>
+#include <malloc.h>
+#include <test/test.h>
+#include <test/ut.h>

Please sort these: config.h (if needed) first, then the plain top-level headers alphabetically (fdt_support.h, image.h, lmb.h, malloc.h), then asm/global_data.h, then test/*.

test/boot/image_fdt.c line 3

Quoted 5 lines
test/boot/image_fdt.c +3 -0
@@ -0,0 +1,53 @@
+#define FDTDEC_MAX_SIZE (2 * 1024 * 1024)
+
+#define IMAGE_FDT_TEST(_name, _flags) UNIT_TEST(_name, _flags, image_fdt)

FDTDEC_MAX_SIZE is never referenced - looks copied from test/dm/fdtdec.c - please drop it.

test/boot/image_fdt.c line 7

Quoted 9 lines
test/boot/image_fdt.c +7 -0
@@ -0,0 +1,53 @@
+     /* Loading a new device tree should be allowed */
+     blob = malloc(fdt_sz);
+     ut_assertok_ptr(blob);
+     memcpy(blob, gd->fdt_blob, fdt_sz);
+
+     nodeoffset = fdt_path_offset(blob, '/reserved-memory');
+     ut_assertok(fdt_del_node(blob, nodeoffset));

If /reserved-memory is missing, fdt_path_offset() returns a negative libfdt error and fdt_del_node() then fails with a confusing message. Please ut_assert(nodeoffset >= 0) first.

Also, blob is malloc()'d but never freed.

test/boot/image_fdt.c line 6

Quoted 8 lines
test/boot/image_fdt.c +6 -0
@@ -0,0 +1,53 @@
+     boot_fdt_add_mem_rsv_regions(blob);
+     ut_assert_console_end();
+     boot_relocate_fdt((char **)&blob, &fdt_sz);
+
+     /* Reservation should not exist now */
+     ut_asserteq(0, lmb_is_reserved_flags(start, LMB_NOMAP));

What is the boot_relocate_fdt() call testing - could you add a comment? The reservation at start is already gone after boot_fdt_add_mem_rsv_regions(blob), so the final ut_asserteq() does not depend on it. It also allocates from LMB for the relocated copy, which then leaks. I'd drop it, or split it into a separate test with its own assertions. The (char **)&blob cast is a hint that the call doesn't belong here.

test/boot/image_fdt.c line 1

Quoted 3 lines
test/boot/image_fdt.c +1 -0
@@ -0,0 +1,53 @@
+IMAGE_FDT_TEST(test_boot_fdt_add_mem_rsv_regions, UTF_LIVE_TREE | UTF_CONSOLE);

Just to check: the test only touches gd->fdt_blob (the flat tree), so why UTF_LIVE_TREE? If you want it to run regardless of OF_LIVE, drop the flag (or use UTF_FLAT_TREE). If the intent was to avoid running twice, please mention that in a comment.

Quoted 2 lines

Regards,
Simon

As far as I'm aware, UTF_LIVE_TREE is required for this test. I've tried using UTF_FLAT_TREE and no UTF.*TREE options and for some reason this restricts part of the parsing that's required for boot_fdt_add_mem_rsv_regions. Operations that should report errors simply do not without UTF_LIVE_TREE.

#6 lore raw

Re: [PATCHv7 2/3] test: boot: add a fdt reserved region check

Hi Randolph,

Quoted 90 lines · Randolph Sapp
Quoted 12 lines · Simon Glass

Hi Randolph,

Quoted 9 lines · Randolph Sapp

test: boot: add a fdt reserved region check

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.

Quoted 7 lines
Quoted 5 lines

test/boot/Makefile | 1 +

 test/boot/image_fdt.c       | 53 +++++++++++++++++++++++++++++++++++++++++++++
 test/cmd_ut.c               |  2 ++
 test/py/tests/test_suite.py |  2 +-
 4 files changed, 57 insertions(+), 1 deletion(-)

Change log?

No change log for a patch that didn't exist in the series previously.

Quoted 66 lines

test/boot/image_fdt.c line 8

Quoted 10 lines
test/boot/image_fdt.c +8 -0
@@ -0,0 +1,53 @@
+#include <fdt_support.h>
+#include <asm/global_data.h>
+#include <config.h>
+#include <image.h>
+#include <lmb.h>
+#include <malloc.h>
+#include <test/test.h>
+#include <test/ut.h>

Please sort these: config.h (if needed) first, then the plain top-level headers alphabetically (fdt_support.h, image.h, lmb.h, malloc.h), then asm/global_data.h, then test/*.

test/boot/image_fdt.c line 3

Quoted 5 lines
test/boot/image_fdt.c +3 -0
@@ -0,0 +1,53 @@
+#define FDTDEC_MAX_SIZE (2 * 1024 * 1024)
+
+#define IMAGE_FDT_TEST(_name, _flags) UNIT_TEST(_name, _flags, image_fdt)

FDTDEC_MAX_SIZE is never referenced - looks copied from test/dm/fdtdec.c - please drop it.

test/boot/image_fdt.c line 7

Quoted 9 lines
test/boot/image_fdt.c +7 -0
@@ -0,0 +1,53 @@
+     /* Loading a new device tree should be allowed */
+     blob = malloc(fdt_sz);
+     ut_assertok_ptr(blob);
+     memcpy(blob, gd->fdt_blob, fdt_sz);
+
+     nodeoffset = fdt_path_offset(blob, '/reserved-memory');
+     ut_assertok(fdt_del_node(blob, nodeoffset));

If /reserved-memory is missing, fdt_path_offset() returns a negative libfdt error and fdt_del_node() then fails with a confusing message. Please ut_assert(nodeoffset >= 0) first.

Also, blob is malloc()'d but never freed.

test/boot/image_fdt.c line 6

Quoted 8 lines
test/boot/image_fdt.c +6 -0
@@ -0,0 +1,53 @@
+     boot_fdt_add_mem_rsv_regions(blob);
+     ut_assert_console_end();
+     boot_relocate_fdt((char **)&blob, &fdt_sz);
+
+     /* Reservation should not exist now */
+     ut_asserteq(0, lmb_is_reserved_flags(start, LMB_NOMAP));

What is the boot_relocate_fdt() call testing - could you add a comment? The reservation at start is already gone after boot_fdt_add_mem_rsv_regions(blob), so the final ut_asserteq() does not depend on it. It also allocates from LMB for the relocated copy, which then leaks. I'd drop it, or split it into a separate test with its own assertions. The (char **)&blob cast is a hint that the call doesn't belong here.

test/boot/image_fdt.c line 1

Quoted 3 lines
test/boot/image_fdt.c +1 -0
@@ -0,0 +1,53 @@
+IMAGE_FDT_TEST(test_boot_fdt_add_mem_rsv_regions, UTF_LIVE_TREE | UTF_CONSOLE);

Just to check: the test only touches gd->fdt_blob (the flat tree), so why UTF_LIVE_TREE? If you want it to run regardless of OF_LIVE, drop the flag (or use UTF_FLAT_TREE). If the intent was to avoid running twice, please mention that in a comment.

Quoted 7 lines
Quoted 2 lines

Regards,
Simon

As far as I'm aware, UTF_LIVE_TREE is required for this test. I've tried using UTF_FLAT_TREE and no UTF.*TREE options and for some reason this restricts part of the parsing that's required for boot_fdt_add_mem_rsv_regions. Operations that should report errors simply do not without UTF_LIVE_TREE.

I dug into this. The flag isn't affecting parsing - boot_fdt_add_mem_rsv_regions() uses libfdt directly on gd->fdt_blob, so uts->of_live is invisible to it. What you're actually hitting is in the test runner, ut_run_test_live_flat() in test/test-main.c:

/* live branch */
if (CONFIG_IS_ENABLED(OF_LIVE)) {
if (!(test->flags & UTF_FLAT_TREE)) {
uts->of_live = true;
ret = ut_run_test(...);
...

/* flat branch */
if ((!CONFIG_IS_ENABLED(OF_LIVE) ||

     (test->flags & UTF_SCAN_FDT)) &&
    !(test->flags & UTF_LIVE_TREE) &&
    ...

Sandbox has OF_LIVE=y. With UTF_FLAT_TREE alone:
- live branch is skipped (UTF_FLAT_TREE set)
- flat branch is skipped (OF_LIVE on, UTF_SCAN_FDT not set)

So the test body never runs, and the assertions never fire. That looks like 'operations that should report errors simply do not' but really the test just isn't being called.

I reproduced this on your series: with UTF_FLAT_TREE | UTF_CONSOLE the runner prints 'Running 1 image_fdt tests' followed by 'Tests run: 1,
failures: 0' and never emits the per-test 'Test: ...' line.

The cleanest fix is to drop the tree flag entirely - just UTF_CONSOLE. On sandbox (OF_LIVE=y) the runner will execute it once with of_live=true and skip the second flat pass on its own, same observable behaviour as UTF_LIVE_TREE. As a bonus, on a hypothetical !OF_LIVE build it would still run via the flat branch, where UTF_LIVE_TREE would silently skip it.

I also tried UTF_FLAT_TREE | UTF_SCAN_FDT for completeness - that makes dm_extended_scan() fail with -EEXIST because devices are already bound, so it's not a viable alternative:

scmi_bind_protocols() sandbox-scmi_agent scmi: Cannot have more than one SCMI agent

This may be a bug in SCMI (e.g. it should use devicetree).

Regards,
Simon

#7 lore raw

PATCH v7 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.

 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
index ce87c619e68..aeb53b4c274 100644
@@ -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
index 745d2c3a966..245e8462be8 100644
@@ -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 original value of relocaddr before any other
+	 * allocations or reservations shift it. This address will, depending on
+	 * the platform, be equivilent 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
index 046a2bb4641..9d7eda9422f 100644
@@ -869,7 +869,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
index 8f12c6ad8e5..27c8565e590 100644
@@ -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
Reviewed-by on v7 3/3
#8 lore raw

Re: [PATCHv7 3/3] memory: reserve from start_addr_sp to initial_relocaddr

Hi Randolph,

Quoted 22 lines · Randolph Sapp

memory: reserve from start_addr_sp to initial_relocaddr

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.

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(-)

include/asm-generic/global_data.h struct global_data { · line 115

Quoted 9 lines
include/asm-generic/global_data.h +9 -0
@@ -107,6 +107,15 @@ struct global_data {
+     /**
+      * @initial_relocaddr: top address of U-Boot in RAM
+      *
+      * This should be the original value of relocaddr before any other
+      * allocations or reservations shift it. This address will, depending on
+      * the platform, be equivilent to ram_top and should also be considered
+      * an exclusive address.
+      */
+     unsigned long initial_relocaddr;

Typo: equivilent -> equivalent.

How about: "...the value of relocaddr after setup_dest_addr() completes, before reserve_pram() or any later init function adjusts it"

Regards,
Simon