提交 1b059882 编写于 作者: S Sang Yan 提交者: Zheng Zengkai

park: Reserve park mem before kexec reserved

hulk inclusion
category: feature
bugzilla: 48159
CVE: N/A

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

reserve_crashkernel or reserve_quick_kexec may find one sutiable
memory region and reserves it, which address of the region is
not fixed.

As a result, cpu park reserves memory could be failed while
specified address used by crashkernel or quickkexec.

So, move reserve_park_mem before reserve_crashkernel and
reserve_quick_kexec.

Signed-off-by: Sang Yan <sangyan(a)huawei.com>
Reviewed-by: Jing Xiangfeng <jingxiangfeng(a)huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 22d02cc6
...@@ -590,16 +590,25 @@ void __init arm64_memblock_init(void) ...@@ -590,16 +590,25 @@ void __init arm64_memblock_init(void)
else else
arm64_dma32_phys_limit = PHYS_MASK + 1; arm64_dma32_phys_limit = PHYS_MASK + 1;
/*
* Reserve park memory before crashkernel and quick kexec.
* Because park memory must be specified by address, but
* crashkernel and quickkexec may be specified by memory length,
* then find one sutiable memory region to reserve.
*
* So reserve park memory firstly is better, but it may cause
* crashkernel or quickkexec reserving failed.
*/
#ifdef CONFIG_ARM64_CPU_PARK
reserve_park_mem();
#endif
reserve_crashkernel(); reserve_crashkernel();
#ifdef CONFIG_QUICK_KEXEC #ifdef CONFIG_QUICK_KEXEC
reserve_quick_kexec(); reserve_quick_kexec();
#endif #endif
#ifdef CONFIG_ARM64_CPU_PARK
reserve_park_mem();
#endif
reserve_pin_memory_res(); reserve_pin_memory_res();
reserve_elfcorehdr(); reserve_elfcorehdr();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册