Commit 0a8321dd authored by Ritesh Harjani (IBM)'s avatar Ritesh Harjani (IBM) Committed by Madhavan Srinivasan
Browse files

powerpc/mem: Move CMA reservations to arch_mm_preinit 



commit 4267739c ("arch, mm: consolidate initialization of SPARSE memory model"),
changed the initialization order of "pageblock_order" from...
start_kernel()
    - setup_arch()
       - initmem_init()
         - sparse_init()
           - set_pageblock_order();  // this sets the pageblock_order
       - xxx_cma_reserve();

to...
start_kernel()
    - setup_arch()
       - xxx_cma_reserve();
    - mm_core_init_early()
       - free_area_init()
          - sparse_init()
             - set_pageblock_order() // this sets the pageblock_order.

So this means, pageblock_order is not initialized before these cma
reservation function calls, hence we are seeing CMA failures like...

[    0.000000] kvm_cma_reserve: reserving 3276 MiB for global area
[    0.000000] cma: pageblock_order not yet initialized. Called during early boot?
[    0.000000] cma: Failed to reserve 3276 MiB
....
[    0.000000][    T0] cma: pageblock_order not yet initialized. Called during early boot?
[    0.000000][    T0] cma: Failed to reserve 1024 MiB

This patch moves these CMA reservations to arch_mm_preinit() which
happens in mm_core_init() (which happens after pageblock_order is
initialized), but before the memblock moves the free memory to buddy.

Fixes: 4267739c ("arch, mm: consolidate initialization of SPARSE memory model")
Suggested-by: default avatarMike Rapoport <rppt@kernel.org>
Reported-and-tested-by: default avatarSourabh Jain <sourabhjain@linux.ibm.com>
Closes: https://lore.kernel.org/linuxppc-dev/4c338a29-d190-44f3-8874-6cfa0a031f0b@linux.ibm.com/


Signed-off-by: default avatarRitesh Harjani (IBM) <ritesh.list@gmail.com>
Tested-by: default avatarDan Horák <dan@danny.cz>
Signed-off-by: default avatarMadhavan Srinivasan <maddy@linux.ibm.com>
Link: https://patch.msgid.link/6e532cf0db5be99afbe20eed699163d5e86cd71f.1772303986.git.ritesh.list@gmail.com
parent 35e4f2a1

arch/powerpc/kernel/setup-common.c

+0 −10
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
#include <linux/of_irq.h>

#include <linux/hugetlb.h>

#include <linux/pgtable.h>

#include <asm/kexec.h>

#include <asm/io.h>

#include <asm/paca.h>

#include <asm/processor.h>
@@ -995,15 +994,6 @@ void __init setup_arch(char **cmdline_p) 


	initmem_init();



	/*

	 * Reserve large chunks of memory for use by CMA for kdump, fadump, KVM and

	 * hugetlb. These must be called after initmem_init(), so that

	 * pageblock_order is initialised.

	 */

	fadump_cma_init();

	kdump_cma_reserve();

	kvm_cma_reserve();



	early_memtest(min_low_pfn << PAGE_SHIFT, max_low_pfn << PAGE_SHIFT);



	if (ppc_md.setup_arch)

arch/powerpc/mm/mem.c

+14 −0
Original line number Diff line number Diff line
@@ -30,6 +30,10 @@ 
#include <asm/setup.h>

#include <asm/fixmap.h>



#include <asm/fadump.h>

#include <asm/kexec.h>

#include <asm/kvm_ppc.h>



#include <mm/mmu_decl.h>



unsigned long long memory_limit __initdata;
@@ -268,6 +272,16 @@ void __init paging_init(void) 


void __init arch_mm_preinit(void)

{



	/*

	 * Reserve large chunks of memory for use by CMA for kdump, fadump, KVM

	 * and hugetlb. These must be called after pageblock_order is

	 * initialised.

	 */

	fadump_cma_init();

	kdump_cma_reserve();

	kvm_cma_reserve();



	/*

	 * book3s is limited to 16 page sizes due to encoding this in

	 * a 4-bit field for slices.