Revert "xen: fix p2m size in dom0 for disabled memory hotplug case"
authorRoger Pau Monne <roger.pau@citrix.com>
Wed, 24 Mar 2021 12:24:24 +0000 (13:24 +0100)
committerBoris Ostrovsky <boris.ostrovsky@oracle.com>
Wed, 24 Mar 2021 23:33:36 +0000 (18:33 -0500)
commitaf44a387e743ab7aa39d3fb5e29c0a973cf91bdc
tree0f7aeed7855552980f9f693ec1b7988b249f9e0f
parent2b514ec72706a31bea0c3b97e622b81535b5323a
Revert "xen: fix p2m size in dom0 for disabled memory hotplug case"

This partially reverts commit 882213990d32 ("xen: fix p2m size in dom0
for disabled memory hotplug case")

There's no need to special case XEN_UNPOPULATED_ALLOC anymore in order
to correctly size the p2m. The generic memory hotplug option has
already been tied together with the Xen hotplug limit, so enabling
memory hotplug should already trigger a properly sized p2m on Xen PV.

Note that XEN_UNPOPULATED_ALLOC depends on ZONE_DEVICE which pulls in
MEMORY_HOTPLUG.

Leave the check added to __set_phys_to_machine and the adjusted
comment about EXTRA_MEM_RATIO.

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Link: https://lore.kernel.org/r/20210324122424.58685-3-roger.pau@citrix.com
[boris: fixed formatting issues]
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
arch/x86/include/asm/xen/page.h
arch/x86/xen/p2m.c
arch/x86/xen/setup.c