Commit 809cd908 authored by Juergen Gross's avatar Juergen Gross Committed by Khalid Elmously

xen/balloon: fix ballooned page accounting without hotplug enabled

BugLink: https://bugs.launchpad.net/bugs/1859640

[ Upstream commit c673ec61 ]

When CONFIG_XEN_BALLOON_MEMORY_HOTPLUG is not defined
reserve_additional_memory() will set balloon_stats.target_pages to a
wrong value in case there are still some ballooned pages allocated via
alloc_xenballooned_pages().

This will result in balloon_process() no longer be triggered when
ballooned pages are freed in batches.
Reported-by: default avatarNicholas Tsirakis <niko.tsirakis@gmail.com>
Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Reviewed-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarConnor Kuehl <connor.kuehl@canonical.com>
Signed-off-by: default avatarKhalid Elmously <khalid.elmously@canonical.com>
parent 04e32e70
...@@ -392,7 +392,8 @@ static struct notifier_block xen_memory_nb = { ...@@ -392,7 +392,8 @@ static struct notifier_block xen_memory_nb = {
#else #else
static enum bp_state reserve_additional_memory(void) static enum bp_state reserve_additional_memory(void)
{ {
balloon_stats.target_pages = balloon_stats.current_pages; balloon_stats.target_pages = balloon_stats.current_pages +
balloon_stats.target_unpopulated;
return BP_ECANCELED; return BP_ECANCELED;
} }
#endif /* CONFIG_XEN_BALLOON_MEMORY_HOTPLUG */ #endif /* CONFIG_XEN_BALLOON_MEMORY_HOTPLUG */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment