Commit 856090e5 authored by Ma Wupeng's avatar Ma Wupeng Committed by Zheng Zengkai
Browse files

efi: Disable mirror feature if kernelcore is not specified 

hulk inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I4PM01


CVE: NA

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

With this patch, kernel will check mirrored_kernelcore before calling
efi_find_mirror() which will enable basic mirrored feature.

If system have some mirrored memory and mirrored feature is not specified
in boot parameter, the basic mirrored feature will be enabled and this will
lead to the following situations:

- memblock memory allocation perfers mirrored region. This may have some
  unexpected influence on numa affinity.

- contiguous memory will be splited into server parts if parts of them
is mirrored memroy via memblock_mark_mirror().

Signed-off-by: default avatarMa Wupeng <mawupeng1@huawei.com>
Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent e876fd13

drivers/firmware/efi/efi.c

+3 −0
Original line number Diff line number Diff line
@@ -443,6 +443,9 @@ void __init efi_find_mirror(void) 
	if (!efi_enabled(EFI_MEMMAP))

		return;



	if (!mirrored_kernelcore)

		return;



	for_each_efi_memory_desc(md) {

		unsigned long long start = md->phys_addr;

		unsigned long long size = md->num_pages << EFI_PAGE_SHIFT;

include/linux/mm.h

+2 −0
Original line number Diff line number Diff line
@@ -2473,6 +2473,8 @@ extern void get_pfn_range_for_nid(unsigned int nid, 
			unsigned long *start_pfn, unsigned long *end_pfn);

extern unsigned long find_min_pfn_with_active_regions(void);



extern bool mirrored_kernelcore;



#ifndef CONFIG_NEED_MULTIPLE_NODES

static inline int early_pfn_to_nid(unsigned long pfn)

{

mm/page_alloc.c

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ static unsigned long required_kernelcore_percent __initdata; 
static unsigned long required_movablecore __initdata;

static unsigned long required_movablecore_percent __initdata;

static unsigned long zone_movable_pfn[MAX_NUMNODES] __initdata;

static bool mirrored_kernelcore __meminitdata;

bool mirrored_kernelcore __meminitdata;



/* movable_zone is the "real" zone pages in ZONE_MOVABLE are taken from */

int movable_zone;