From ac63096be14ec0ba52fc173f9a88bd959ce73f9c Mon Sep 17 00:00:00 2001 From: Ross Lagerwall Date: Fri, 9 Dec 2016 17:10:22 +0000 Subject: [PATCH] xen/balloon: Only mark a page as managed when it is released Only mark a page as managed when it is released back to the allocator. This ensures that the managed page count does not get falsely increased when a VM is running. Correspondingly change it so that pages are marked as unmanaged after getting them from the allocator. Signed-off-by: Ross Lagerwall Reviewed-by: Boris Ostrovsky Signed-off-by: Juergen Gross OraBug: 25497392 (cherry picked from commit 709613ad2b3c9eaeb2a3e24284b7c8feffc17326) Signed-off-by: Boris Ostrovsky --- drivers/xen/balloon.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c index cfab1d24e4bc..7edb76c9c09f 100644 --- a/drivers/xen/balloon.c +++ b/drivers/xen/balloon.c @@ -181,7 +181,6 @@ static void __balloon_append(struct page *page) static void balloon_append(struct page *page) { __balloon_append(page); - adjust_managed_page_count(page, -1); } /* balloon_retrieve: rescue a page from the balloon, if it is not empty. */ @@ -202,8 +201,6 @@ static struct page *balloon_retrieve(bool require_lowmem) else balloon_stats.balloon_low--; - adjust_managed_page_count(page, 1); - return page; } @@ -470,7 +467,7 @@ static enum bp_state increase_reservation(unsigned long nr_pages) #endif /* Relinquish the page back to the allocator. */ - __free_reserved_page(page); + free_reserved_page(page); } balloon_stats.current_pages += rc; @@ -501,6 +498,7 @@ static enum bp_state decrease_reservation(unsigned long nr_pages, gfp_t gfp) state = BP_EAGAIN; break; } + adjust_managed_page_count(page, -1); scrub_page(page); list_add(&page->lru, &pages); } -- 2.50.1