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

    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>
    ---
    mm/memblock.c | 7 ++++---
    1 file changed, 4 insertions(+), 3 deletions(-)

    diff --git a/mm/memblock.c b/mm/memblock.c
    index 97fa87541b5f..2e25d69739e0 100644
    --- a/mm/memblock.c
    +++ b/mm/memblock.c
    @@ -1941,14 +1941,13 @@ static void __init free_unused_memmap(void)
    * due to SPARSEMEM sections which aren't present.
    */
    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
    @@ -1966,8 +1965,10 @@ 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(end, pageblock_nr_pages);
    free_memmap(prev_end, ALIGN(prev_end, PAGES_PER_SECTION));
    + }
    #endif
    }

    --
    2.28.0
    \
     
     \ /
      Last update: 2021-05-19 16:16    [W:7.144 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site