| From 29b3b7d927b646bd6606ab70ba04a5d378489339 Mon Sep 17 00:00:00 2001 |
| From: Juergen Gross <jgross@suse.com> |
| Date: Thu, 12 Dec 2019 15:17:50 +0100 |
| Subject: [PATCH] xen/balloon: fix ballooned page accounting without hotplug |
| enabled |
| |
| commit c673ec61ade89bf2f417960f986bc25671762efb upstream. |
| |
| 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: Nicholas Tsirakis <niko.tsirakis@gmail.com> |
| Signed-off-by: Juergen Gross <jgross@suse.com> |
| Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> |
| Signed-off-by: Juergen Gross <jgross@suse.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c |
| index 8300982b1da1..b5c8b70380bd 100644 |
| --- a/drivers/xen/balloon.c |
| +++ b/drivers/xen/balloon.c |
| @@ -401,7 +401,8 @@ static struct notifier_block xen_memory_nb = { |
| #else |
| 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; |
| } |
| #endif /* CONFIG_XEN_BALLOON_MEMORY_HOTPLUG */ |
| -- |
| 2.7.4 |
| |
