lkml.org 
[lkml]   [2021]   [Dec]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 15/18] memblock: align freed memory map on pageblock boundaries with SPARSEMEM
    Date
    From: Mike Rapoport <rppt@linux.ibm.com>

    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>
    ---
    arch/arm/mm/init.c | 8 +++++---
    1 file changed, 5 insertions(+), 3 deletions(-)

    --- a/arch/arm/mm/init.c
    +++ b/arch/arm/mm/init.c
    @@ -371,14 +371,14 @@ static void __init free_unused_memmap(vo
    */
    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(vo
    }

    #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
    }


    \
     
     \ /
      Last update: 2021-12-15 18:29    [W:4.577 / U:0.204 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site