of: reserved_mem: Try to keep range allocations contiguous

Right now dynamic reserved memory regions are allocated either
bottom-up or top-down, depending on the memblock setting of the
architecture. This is fine when the address is arbitrary. However,
when using "alloc-ranges" the regions are often placed somewhere
in the middle of (free) RAM, even if the range starts or ends next
to another (static) reservation.

Try to detect this situation, and choose explicitly between bottom-up
or top-down to allocate the memory close to the other reservations:

  1. If the "alloc-range" starts at the end or inside an existing
     reservation, use bottom-up.
  2. If the "alloc-range" ends at the start or inside an existing
     reservation, use top-down.
  3. If both or none is the case, keep the current
     (architecture-specific) behavior.

There are plenty of edge cases where only a more complex algorithm
would help, but even this simple approach helps in many cases to keep
the reserved memory (and therefore also the free memory) contiguous.

Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
Link: https://lore.kernel.org/r/20230510-dt-resv-bottom-up-v2-1-aeb2afc8ac25@gerhold.net
Signed-off-by: Rob Herring <robh@kernel.org>

diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c
index 948efa9f99e3bc907000731db166947f536568ae..7f892c3dcc636ea00e9916ee5840075bc9f70266 100644 (file)
--- a/drivers/of/of_reserved_mem.c
+++ b/drivers/of/of_reserved_mem.c
@@ -77,6 +77,57 @@ void __init fdt_reserved_mem_save_node(unsigned long node, const char *uname,
        return;
 }
 
+/*
+ * __reserved_mem_alloc_in_range() - allocate reserved memory described with
+ *     'alloc-ranges'. Choose bottom-up/top-down depending on nearby existing
+ *     reserved regions to keep the reserved memory contiguous if possible.
+ */
+static int __init __reserved_mem_alloc_in_range(phys_addr_t size,
+       phys_addr_t align, phys_addr_t start, phys_addr_t end, bool nomap,
+       phys_addr_t *res_base)
+{
+       bool prev_bottom_up = memblock_bottom_up();
+       bool bottom_up = false, top_down = false;
+       int ret, i;
+
+       for (i = 0; i < reserved_mem_count; i++) {
+               struct reserved_mem *rmem = &reserved_mem[i];
+
+               /* Skip regions that were not reserved yet */
+               if (rmem->size == 0)
+                       continue;
+
+               /*
+                * If range starts next to an existing reservation, use bottom-up:
+                *      |....RRRR................RRRRRRRR..............|
+                *             --RRRR------
+                */
+               if (start >= rmem->base && start <= (rmem->base + rmem->size))
+                       bottom_up = true;
+
+               /*
+                * If range ends next to an existing reservation, use top-down:
+                *      |....RRRR................RRRRRRRR..............|
+                *                    -------RRRR-----
+                */
+               if (end >= rmem->base && end <= (rmem->base + rmem->size))
+                       top_down = true;
+       }
+
+       /* Change setting only if either bottom-up or top-down was selected */
+       if (bottom_up != top_down)
+               memblock_set_bottom_up(bottom_up);
+
+       ret = early_init_dt_alloc_reserved_memory_arch(size, align,
+                       start, end, nomap, res_base);
+
+       /* Restore old setting if needed */
+       if (bottom_up != top_down)
+               memblock_set_bottom_up(prev_bottom_up);
+
+       return ret;
+}
+
 /*
  * __reserved_mem_alloc_size() - allocate reserved memory described by
  *     'size', 'alignment'  and 'alloc-ranges' properties.
@@ -137,8 +188,8 @@ static int __init __reserved_mem_alloc_size(unsigned long node,
                        end = start + dt_mem_next_cell(dt_root_size_cells,
                                                       &prop);
 
-                       ret = early_init_dt_alloc_reserved_memory_arch(size,
-                                       align, start, end, nomap, &base);
+                       ret = __reserved_mem_alloc_in_range(size, align,
+                                       start, end, nomap, &base);
                        if (ret == 0) {
                                pr_debug("allocated memory for '%s' node: base %pa, size %lu MiB\n",
                                        uname, &base,