lkml.org 
[lkml]   [2021]   [Mar]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.11 144/306] sparc32: Limit memblock allocation to low memory
    Date
    From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    From: Andreas Larsson <andreas@gaisler.com>

    [ Upstream commit bda166930c37604ffa93f2425426af6921ec575a ]

    Commit cca079ef8ac29a7c02192d2bad2ffe4c0c5ffdd0 changed sparc32 to use
    memblocks instead of bootmem, but also made high memory available via
    memblock allocation which does not work together with e.g. phys_to_virt
    and can lead to kernel panic.

    This changes back to only low memory being allocatable in the early
    stages, now using memblock allocation.

    Signed-off-by: Andreas Larsson <andreas@gaisler.com>
    Acked-by: Mike Rapoport <rppt@linux.ibm.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/sparc/mm/init_32.c | 3 +++
    1 file changed, 3 insertions(+)

    diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c
    index eb2946b1df8a..6139c5700ccc 100644
    --- a/arch/sparc/mm/init_32.c
    +++ b/arch/sparc/mm/init_32.c
    @@ -197,6 +197,9 @@ unsigned long __init bootmem_init(unsigned long *pages_avail)
    size = memblock_phys_mem_size() - memblock_reserved_size();
    *pages_avail = (size >> PAGE_SHIFT) - high_pages;

    + /* Only allow low memory to be allocated via memblock allocation */
    + memblock_set_current_limit(max_low_pfn << PAGE_SHIFT);
    +
    return max_pfn;
    }

    --
    2.30.1


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