On Thu, Oct 18, 2018 at 12:23:20PM +0800, Baoquan He wrote: >On 10/17/18 at 06:20pm, Chao Fan wrote: >> If CONFIG_MEMORY_HOTREMOVE enabled, walk through the acpi srat memory >> tables and store those immovable memory regions so that kaslr can get >> where to choose for randomization. > >This patch only adds invocation of get_immovable_mem() inside >mem_avoid_init(). It's not doing what you said in patch log. Can it be >merged with other patch, e.g patch 6 or 8?
Yes, in old version, this patch will do more job. Later I move more functions to acpitb.c, just this left. So I can move it to 8/8. Thanks, Chao Fan > >> >> Signed-off-by: Chao Fan <fanc.f...@cn.fujitsu.com> >> --- >> arch/x86/boot/compressed/kaslr.c | 5 +++++ >> 1 file changed, 5 insertions(+) >> >> diff --git a/arch/x86/boot/compressed/kaslr.c >> b/arch/x86/boot/compressed/kaslr.c >> index 9ed9709d9947..0c3567bc231c 100644 >> --- a/arch/x86/boot/compressed/kaslr.c >> +++ b/arch/x86/boot/compressed/kaslr.c >> @@ -417,6 +417,11 @@ static void mem_avoid_init(unsigned long input, >> unsigned long input_size, >> /* Mark the memmap regions we need to avoid */ >> handle_mem_options(); >> >> +#ifdef CONFIG_MEMORY_HOTREMOVE >> + /* Mark the immovable regions we need to choose */ >> + get_immovable_mem(); >> +#endif >> + >> #ifdef CONFIG_X86_VERBOSE_BOOTUP >> /* Make sure video RAM can be used. */ >> add_identity_map(0, PMD_SIZE); >> -- >> 2.17.2 >> >> >> > >
