Skip to content

Commit 103a854

Browse files
kvaneeshmpe
authored andcommitted
powerpc/book3s64/radix: Fix boot failure with large amount of guest memory
If the hypervisor doesn't support hugepages, the kernel ends up allocating a large number of page table pages. The early page table allocation was wrongly setting the max memblock limit to ppc64_rma_size with radix translation which resulted in boot failure as shown below. Kernel panic - not syncing: early_alloc_pgtable: Failed to allocate 16777216 bytes align=0x1000000 nid=-1 from=0x0000000000000000 max_addr=0xffffffffffffffff CPU: 0 PID: 0 Comm: swapper Not tainted 5.8.0-24.9-default+ #2 Call Trace: [c0000000016f3d00] [c0000000007c6470] dump_stack+0xc4/0x114 (unreliable) [c0000000016f3d40] [c00000000014c78c] panic+0x164/0x418 [c0000000016f3dd0] [c000000000098890] early_alloc_pgtable+0xe0/0xec [c0000000016f3e60] [c0000000010a5440] radix__early_init_mmu+0x360/0x4b4 [c0000000016f3ef0] [c000000001099bac] early_init_mmu+0x1c/0x3c [c0000000016f3f10] [c00000000109a320] early_setup+0x134/0x170 This was because the kernel was checking for the radix feature before we enable the feature via mmu_features. This resulted in the kernel using hash restrictions on radix. Rework the early init code such that the kernel boot with memblock restrictions as imposed by hash. At that point, the kernel still hasn't finalized the translation the kernel will end up using. We have three different ways of detecting radix. 1. dt_cpu_ftrs_scan -> used only in case of PowerNV 2. ibm,pa-features -> Used when we don't use cpu_dt_ftr_scan 3. CAS -> Where we negotiate with hypervisor about the supported translation. We look at 1 or 2 early in the boot and after that, we look at the CAS vector to finalize the translation the kernel will use. We also support a kernel command line option (disable_radix) to switch to hash. Update the memblock limit after mmu_early_init_devtree() if the kernel is going to use radix translation. This forces some of the memblock allocations we do before mmu_early_init_devtree() to be within the RMA limit. Fixes: 2bfd65e ("powerpc/mm/radix: Add radix callbacks for early init routines") Reported-by: Shirisha Ganta <shiganta@in.ibm.com> Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com> Reviewed-by: Hari Bathini <hbathini@linux.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/20200828100852.426575-1-aneesh.kumar@linux.ibm.com
1 parent 4a133eb commit 103a854

File tree

3 files changed

+14
-22
lines changed

3 files changed

+14
-22
lines changed

arch/powerpc/include/asm/book3s/64/mmu.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -239,14 +239,14 @@ static inline void early_init_mmu_secondary(void)
239239

240240
extern void hash__setup_initial_memory_limit(phys_addr_t first_memblock_base,
241241
phys_addr_t first_memblock_size);
242-
extern void radix__setup_initial_memory_limit(phys_addr_t first_memblock_base,
243-
phys_addr_t first_memblock_size);
244242
static inline void setup_initial_memory_limit(phys_addr_t first_memblock_base,
245243
phys_addr_t first_memblock_size)
246244
{
247-
if (early_radix_enabled())
248-
return radix__setup_initial_memory_limit(first_memblock_base,
249-
first_memblock_size);
245+
/*
246+
* Hash has more strict restrictions. At this point we don't
247+
* know which translations we will pick. Hence go with hash
248+
* restrictions.
249+
*/
250250
return hash__setup_initial_memory_limit(first_memblock_base,
251251
first_memblock_size);
252252
}

arch/powerpc/mm/book3s64/radix_pgtable.c

-15
Original file line numberDiff line numberDiff line change
@@ -734,21 +734,6 @@ void radix__mmu_cleanup_all(void)
734734
}
735735
}
736736

737-
void radix__setup_initial_memory_limit(phys_addr_t first_memblock_base,
738-
phys_addr_t first_memblock_size)
739-
{
740-
/*
741-
* We don't currently support the first MEMBLOCK not mapping 0
742-
* physical on those processors
743-
*/
744-
BUG_ON(first_memblock_base != 0);
745-
746-
/*
747-
* Radix mode is not limited by RMA / VRMA addressing.
748-
*/
749-
ppc64_rma_size = ULONG_MAX;
750-
}
751-
752737
#ifdef CONFIG_MEMORY_HOTPLUG
753738
static void free_pte_table(pte_t *pte_start, pmd_t *pmd)
754739
{

arch/powerpc/mm/init_64.c

+9-2
Original file line numberDiff line numberDiff line change
@@ -433,9 +433,16 @@ void __init mmu_early_init_devtree(void)
433433
if (!(mfmsr() & MSR_HV))
434434
early_check_vec5();
435435

436-
if (early_radix_enabled())
436+
if (early_radix_enabled()) {
437437
radix__early_init_devtree();
438-
else
438+
/*
439+
* We have finalized the translation we are going to use by now.
440+
* Radix mode is not limited by RMA / VRMA addressing.
441+
* Hence don't limit memblock allocations.
442+
*/
443+
ppc64_rma_size = ULONG_MAX;
444+
memblock_set_current_limit(MEMBLOCK_ALLOC_ANYWHERE);
445+
} else
439446
hash__early_init_devtree();
440447
}
441448
#endif /* CONFIG_PPC_BOOK3S_64 */

0 commit comments

Comments
 (0)