xen/balloon: fix accounting in alloc_xenballooned_pages error path
commit 1951fa33ec
upstream.
target_unpopulated is incremented with nr_pages at the start of the
function, but the call to free_xenballooned_pages will only subtract
pgno number of pages, and thus the rest need to be subtracted before
returning or else accounting will be skewed.
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20200727091342.52325-2-roger.pau@citrix.com
Signed-off-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
5.4-rM2-2.2.x-imx-squashed
parent
db1f4c745a
commit
ee4c180d93
|
@ -632,6 +632,12 @@ int alloc_xenballooned_pages(int nr_pages, struct page **pages)
|
|||
out_undo:
|
||||
mutex_unlock(&balloon_mutex);
|
||||
free_xenballooned_pages(pgno, pages);
|
||||
/*
|
||||
* NB: free_xenballooned_pages will only subtract pgno pages, but since
|
||||
* target_unpopulated is incremented with nr_pages at the start we need
|
||||
* to remove the remaining ones also, or accounting will be screwed.
|
||||
*/
|
||||
balloon_stats.target_unpopulated -= nr_pages - pgno;
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL(alloc_xenballooned_pages);
|
||||
|
|
Loading…
Reference in New Issue