Commit 2b514ec7 authored by Roger Pau Monne's avatar Roger Pau Monne Committed by Boris Ostrovsky
Browse files

xen/x86: make XEN_BALLOON_MEMORY_HOTPLUG_LIMIT depend on MEMORY_HOTPLUG 



The Xen memory hotplug limit should depend on the memory hotplug
generic option, rather than the Xen balloon configuration. It's
possible to have a kernel with generic memory hotplug enabled, but
without Xen balloon enabled, at which point memory hotplug won't work
correctly due to the size limitation of the p2m.

Rename the option to XEN_MEMORY_HOTPLUG_LIMIT since it's no longer
tied to ballooning.

Fixes: 9e2369c0 ("xen: add helpers to allocate unpopulated memory")
Signed-off-by: default avatarRoger Pau Monné <roger.pau@citrix.com>
Reviewed-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
Link: https://lore.kernel.org/r/20210324122424.58685-2-roger.pau@citrix.com


Signed-off-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
parent f1d20d86

arch/x86/xen/p2m.c

+2 −2
Original line number Diff line number Diff line
@@ -98,8 +98,8 @@ EXPORT_SYMBOL_GPL(xen_p2m_size); 
unsigned long xen_max_p2m_pfn __read_mostly;

EXPORT_SYMBOL_GPL(xen_max_p2m_pfn);



#ifdef CONFIG_XEN_BALLOON_MEMORY_HOTPLUG_LIMIT

#define P2M_LIMIT CONFIG_XEN_BALLOON_MEMORY_HOTPLUG_LIMIT

#ifdef CONFIG_XEN_MEMORY_HOTPLUG_LIMIT

#define P2M_LIMIT CONFIG_XEN_MEMORY_HOTPLUG_LIMIT

#else

#define P2M_LIMIT 0

#endif

drivers/xen/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -50,11 +50,11 @@ config XEN_BALLOON_MEMORY_HOTPLUG 


	  SUBSYSTEM=="memory", ACTION=="add", RUN+="/bin/sh -c '[ -f /sys$devpath/state ] && echo online > /sys$devpath/state'"



config XEN_BALLOON_MEMORY_HOTPLUG_LIMIT

config XEN_MEMORY_HOTPLUG_LIMIT

	int "Hotplugged memory limit (in GiB) for a PV guest"

	default 512

	depends on XEN_HAVE_PVMMU

	depends on XEN_BALLOON_MEMORY_HOTPLUG

	depends on MEMORY_HOTPLUG

	help

	  Maxmium amount of memory (in GiB) that a PV guest can be

	  expanded to when using memory hotplug.