Commit 6087cfe0 authored by Ma Wupeng's avatar Ma Wupeng Committed by Wupeng Ma
Browse files

mm: disable kernelcore=mirror when no mirror memory 

maillist inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7QV2C
CVE: NA

Reference: https://lkml.kernel.org/r/20230802072328.2107981-1-mawupeng1@huawei.com

--------------------------------

For system with kernelcore=mirror enabled while no mirrored memory is
reported by efi.  This could lead to kernel OOM during startup since all
memory beside zone DMA are in the movable zone and this prevents the
kernel to use it.

Zone DMA/DMA32 initialization is independent of mirrored memory and their
max pfn is set in zone_sizes_init().  Since kernel can fallback to zone
DMA/DMA32 if there is no memory in zone Normal, these zones are seen as
mirrored memory no mather their memory attributes are.

To solve this problem, disable kernelcore=mirror when there is no real
mirrored memory exists.

Link: https://lkml.kernel.org/r/20230802072328.2107981-1-mawupeng1@huawei.com


Signed-off-by: default avatarMa Wupeng <mawupeng1@huawei.com>
Suggested-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Suggested-by: default avatarMike Rapoport <rppt@kernel.org>
Reviewed-by: default avatarMike Rapoport (IBM) <rppt@kernel.org>
Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Cc: Levi Yun <ppbuk5246@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarMa Wupeng <mawupeng1@huawei.com>
parent a1c988d0

include/linux/mm.h

+1 −0
Original line number Diff line number Diff line
@@ -2493,6 +2493,7 @@ extern void get_pfn_range_for_nid(unsigned int nid, 
extern unsigned long find_min_pfn_with_active_regions(void);



extern bool mirrored_kernelcore;

extern bool memblock_has_mirror(void);



#ifndef CONFIG_NEED_MULTIPLE_NODES

static inline int early_pfn_to_nid(unsigned long pfn)

mm/memblock.c

+5 −0
Original line number Diff line number Diff line
@@ -161,6 +161,11 @@ static int memblock_can_resize __initdata_memblock; 
static int memblock_memory_in_slab __initdata_memblock = 0;

static int memblock_reserved_in_slab __initdata_memblock = 0;



bool __init_memblock memblock_has_mirror(void)

{

	return system_has_some_mirror;

}



static enum memblock_flags __init_memblock choose_memblock_flags(void)

{

	return system_has_some_mirror ? MEMBLOCK_MIRROR : MEMBLOCK_NONE;

mm/page_alloc.c

+5 −0
Original line number Diff line number Diff line
@@ -7741,6 +7741,11 @@ static void __init find_zone_movable_pfns_for_nodes(void) 
		bool has_unmirrored_mem = false;

		unsigned long mirrored_sz = 0;



		if (!memblock_has_mirror()) {

			pr_warn("The system has no mirror memory, ignore kernelcore=mirror.\n");

			goto out;

		}



		for_each_mem_region(r) {

			if (memblock_is_mirror(r)) {

				mirrored_sz += r->size;