x86/setup: Call early_reserve_memory() earlier
authorJuergen Gross <jgross@suse.com>
Mon, 20 Sep 2021 12:04:21 +0000 (14:04 +0200)
committerBorislav Petkov <bp@suse.de>
Tue, 21 Sep 2021 07:52:08 +0000 (09:52 +0200)
commit8aa83e6395ce047a506f0b16edca45f36c1ae7f8
treed43aa5be2c48ec5e13804003964cdf886338fd64
parentd4ffd5df9d18031b6a53f934388726775b4452d3
x86/setup: Call early_reserve_memory() earlier

Commit in Fixes introduced early_reserve_memory() to do all needed
initial memblock_reserve() calls in one function. Unfortunately, the call
of early_reserve_memory() is done too late for Xen dom0, as in some
cases a Xen hook called by e820__memory_setup() will need those memory
reservations to have happened already.

Move the call of early_reserve_memory() before the call of
e820__memory_setup() in order to avoid such problems.

Fixes: a799c2bd29d1 ("x86/setup: Consolidate early memory reservations")
Reported-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Tested-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
Tested-by: Nathan Chancellor <nathan@kernel.org>
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/20210920120421.29276-1-jgross@suse.com
arch/x86/kernel/setup.c