]> www.infradead.org Git - users/hch/block.git/commit
x86/xen: fix memblock_reserve() usage on PVH
authorRoger Pau Monne <roger.pau@citrix.com>
Thu, 25 Jul 2024 07:31:15 +0000 (09:31 +0200)
committerJuergen Gross <jgross@suse.com>
Thu, 25 Jul 2024 11:11:08 +0000 (13:11 +0200)
commit4c006734898a113a64a528027274a571b04af95a
treebb2cbb8b5571b66d8a249657d83b32530d674262
parentfc05ea89c9ab45e70cb73e70bc0b9cdd403e0ee1
x86/xen: fix memblock_reserve() usage on PVH

The current usage of memblock_reserve() in init_pvh_bootparams() is done before
the .bss is zeroed, and that used to be fine when
memblock_reserved_init_regions implicitly ended up in the .meminit.data
section.  However after commit 73db3abdca58c memblock_reserved_init_regions
ends up in the .bss section, thus breaking it's usage before the .bss is
cleared.

Move and rename the call to xen_reserve_extra_memory() so it's done in the
x86_init.oem.arch_setup hook, which gets executed after the .bss has been
zeroed, but before calling e820__memory_setup().

Fixes: 73db3abdca58c ("init/modpost: conditionally check section mismatch to __meminit*")
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Message-ID: <20240725073116.14626-3-roger.pau@citrix.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
arch/x86/include/asm/xen/hypervisor.h
arch/x86/platform/pvh/enlighten.c
arch/x86/xen/enlighten_pvh.c