powerpc/fadump: consider reserved ranges while reserving memory

Commit 0962e8004e97 ("powerpc/prom: Scan reserved-ranges node for
memory reservations") enabled support to parse reserved-ranges DT
node and reserve kernel memory falling in these ranges for F/W
purposes. Memory reserved for FADump should not overlap with these
ranges as it could corrupt memory meant for F/W or crash'ed kernel
memory to be exported as vmcore.

But since commit 579ca1a27675 ("powerpc/fadump: make use of memblock's
bottom up allocation mode"), memblock_find_in_range() is being used to
find the appropriate area to reserve memory for FADump, which can't
account for reserved-ranges as these ranges are reserved only after
FADump memory reservation.

With reserved-ranges now being populated during early boot, look out
for these memory ranges while reserving memory for FADump. Without
this change, MPIPL on PowerNV systems aborts with hostboot failure,
when memory reserved for FADump is less than 4096MB.

Fixes: 579ca1a27675 ("powerpc/fadump: make use of memblock's bottom up allocation mode")
Cc: stable@vger.kernel.org
Signed-off-by: Hari Bathini <hbathini@linux.ibm.com>
Reviewed-by: Mahesh Salgaonkar <mahesh@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/158737297693.26700.16193820746269425424.stgit@hbathini.in.ibm.com

diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c
index 679277b28aef017b26fc890a5be560cf2b613f10..63aac8b5f23326245c96dac57f9bd2a953f06e92 100644 (file)
--- a/arch/powerpc/kernel/fadump.c
+++ b/arch/powerpc/kernel/fadump.c
@@ -445,10 +445,72 @@ static int __init fadump_get_boot_mem_regions(void)
        return ret;
 }
 
+/*
+ * Returns true, if the given range overlaps with reserved memory ranges
+ * starting at idx. Also, updates idx to index of overlapping memory range
+ * with the given memory range.
+ * False, otherwise.
+ */
+static bool overlaps_reserved_ranges(u64 base, u64 end, int *idx)
+{
+       bool ret = false;
+       int i;
+
+       for (i = *idx; i < reserved_mrange_info.mem_range_cnt; i++) {
+               u64 rbase = reserved_mrange_info.mem_ranges[i].base;
+               u64 rend = rbase + reserved_mrange_info.mem_ranges[i].size;
+
+               if (end <= rbase)
+                       break;
+
+               if ((end > rbase) &&  (base < rend)) {
+                       *idx = i;
+                       ret = true;
+                       break;
+               }
+       }
+
+       return ret;
+}
+
+/*
+ * Locate a suitable memory area to reserve memory for FADump. While at it,
+ * lookup reserved-ranges & avoid overlap with them, as they are used by F/W.
+ */
+static u64 __init fadump_locate_reserve_mem(u64 base, u64 size)
+{
+       struct fadump_memory_range *mrngs;
+       phys_addr_t mstart, mend;
+       int idx = 0;
+       u64 i, ret = 0;
+
+       mrngs = reserved_mrange_info.mem_ranges;
+       for_each_free_mem_range(i, NUMA_NO_NODE, MEMBLOCK_NONE,
+                               &mstart, &mend, NULL) {
+               pr_debug("%llu) mstart: %llx, mend: %llx, base: %llx\n",
+                        i, mstart, mend, base);
+
+               if (mstart > base)
+                       base = PAGE_ALIGN(mstart);
+
+               while ((mend > base) && ((mend - base) >= size)) {
+                       if (!overlaps_reserved_ranges(base, base+size, &idx)) {
+                               ret = base;
+                               goto out;
+                       }
+
+                       base = mrngs[idx].base + mrngs[idx].size;
+                       base = PAGE_ALIGN(base);
+               }
+       }
+
+out:
+       return ret;
+}
+
 int __init fadump_reserve_mem(void)
 {
-       u64 base, size, mem_boundary, bootmem_min, align = PAGE_SIZE;
-       bool is_memblock_bottom_up = memblock_bottom_up();
+       u64 base, size, mem_boundary, bootmem_min;
        int ret = 1;
 
        if (!fw_dump.fadump_enabled)
@@ -469,9 +531,9 @@ int __init fadump_reserve_mem(void)
                        PAGE_ALIGN(fadump_calculate_reserve_size());
 #ifdef CONFIG_CMA
                if (!fw_dump.nocma) {
-                       align = FADUMP_CMA_ALIGNMENT;
                        fw_dump.boot_memory_size =
-                               ALIGN(fw_dump.boot_memory_size, align);
+                               ALIGN(fw_dump.boot_memory_size,
+                                     FADUMP_CMA_ALIGNMENT);
                }
 #endif
 
@@ -539,11 +601,7 @@ int __init fadump_reserve_mem(void)
                 * Reserve memory at an offset closer to bottom of the RAM to
                 * minimize the impact of memory hot-remove operation.
                 */
-               memblock_set_bottom_up(true);
-               base = memblock_find_in_range(base, mem_boundary, size, align);
-
-               /* Restore the previous allocation mode */
-               memblock_set_bottom_up(is_memblock_bottom_up);
+               base = fadump_locate_reserve_mem(base, size);
 
                if (!base) {
                        pr_err("Failed to find memory chunk for reservation!\n");