memblock: align freed memory map on pageblock boundaries with SPARSEMEM

commit f921f53e089a12a192808ac4319f28727b35dc0f upstream.

When CONFIG_SPARSEMEM=y the ranges of the memory map that are freed are not
aligned to the pageblock boundaries which breaks assumptions about
homogeneity of the memory map throughout core mm code.

Make sure that the freed memory map is always aligned on pageblock
boundaries regardless of the memory model selection.

Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
Tested-by: Tony Lindgren <tony@atomide.com>
Link: https://lore.kernel.org/lkml/20210630071211.21011-1-rppt@kernel.org/
[backport upstream modification in mm/memblock.c to arch/arm/mm/init.c]
Signed-off-by: Mark-PK Tsai <mark-pk.tsai@mediatek.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 72e4bb97f6c48b546e6c1abcb2c8165c023cb6cc..5635bcc419af84e39a2a06d3c2145811acab8188 100644 (file)
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -371,14 +371,14 @@ static void __init free_unused_memmap(void)
                 */
                start = min(start,
                                 ALIGN(prev_end, PAGES_PER_SECTION));
-#else
+#endif
                /*
                 * Align down here since many operations in VM subsystem
                 * presume that there are no holes in the memory map inside
                 * a pageblock
                 */
                start = round_down(start, pageblock_nr_pages);
-#endif
+
                /*
                 * If we had a previous bank, and there is a space
                 * between the current bank and the previous, free it.
@@ -396,9 +396,11 @@ static void __init free_unused_memmap(void)
        }
 
 #ifdef CONFIG_SPARSEMEM
-       if (!IS_ALIGNED(prev_end, PAGES_PER_SECTION))
+       if (!IS_ALIGNED(prev_end, PAGES_PER_SECTION)) {
+               prev_end = ALIGN(prev_end, pageblock_nr_pages);
                free_memmap(prev_end,
                            ALIGN(prev_end, PAGES_PER_SECTION));
+       }
 #endif
 }