Commit 81b286e0 authored by David Vrabel's avatar David Vrabel
Browse files

xen/balloon: make alloc_xenballoon_pages() always allocate low pages 



All users of alloc_xenballoon_pages() wanted low memory pages, so
remove the option for high memory.

Signed-off-by: default avatarDavid Vrabel <david.vrabel@citrix.com>
Reviewed-by: default avatarDaniel Kiper <daniel.kiper@oracle.com>
parent b2ac6aa8

arch/x86/xen/grant-table.c

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ static int __init xlated_setup_gnttab_pages(void) 
		kfree(pages);

		return -ENOMEM;

	}

	rc = alloc_xenballooned_pages(nr_grant_frames, pages, 0 /* lowmem */);

	rc = alloc_xenballooned_pages(nr_grant_frames, pages);

	if (rc) {

		pr_warn("%s Couldn't balloon alloc %ld pfns rc:%d\n", __func__,

			nr_grant_frames, rc);

drivers/xen/balloon.c

+8 −13
Original line number Diff line number Diff line
@@ -136,17 +136,16 @@ static void balloon_append(struct page *page) 
}



/* balloon_retrieve: rescue a page from the balloon, if it is not empty. */

static struct page *balloon_retrieve(bool prefer_highmem)

static struct page *balloon_retrieve(bool require_lowmem)

{

	struct page *page;



	if (list_empty(&ballooned_pages))

		return NULL;



	if (prefer_highmem)

		page = list_entry(ballooned_pages.prev, struct page, lru);

	else

	page = list_entry(ballooned_pages.next, struct page, lru);

	if (require_lowmem && PageHighMem(page))

		return NULL;

	list_del(&page->lru);



	if (PageHighMem(page))
@@ -521,24 +520,20 @@ EXPORT_SYMBOL_GPL(balloon_set_new_target); 
 * alloc_xenballooned_pages - get pages that have been ballooned out

 * @nr_pages: Number of pages to get

 * @pages: pages returned

 * @highmem: allow highmem pages

 * @return 0 on success, error otherwise

 */

int alloc_xenballooned_pages(int nr_pages, struct page **pages, bool highmem)

int alloc_xenballooned_pages(int nr_pages, struct page **pages)

{

	int pgno = 0;

	struct page *page;

	mutex_lock(&balloon_mutex);

	while (pgno < nr_pages) {

		page = balloon_retrieve(highmem);

		if (page && (highmem || !PageHighMem(page))) {

		page = balloon_retrieve(true);

		if (page) {

			pages[pgno++] = page;

		} else {

			enum bp_state st;

			if (page)

				balloon_append(page);

			st = decrease_reservation(nr_pages - pgno,

					highmem ? GFP_HIGHUSER : GFP_USER);

			st = decrease_reservation(nr_pages - pgno, GFP_USER);

			if (st != BP_DONE)

				goto out_undo;

		}

drivers/xen/grant-table.c

+1 −1
Original line number Diff line number Diff line
@@ -687,7 +687,7 @@ int gnttab_alloc_pages(int nr_pages, struct page **pages) 
	int i;

	int ret;



	ret = alloc_xenballooned_pages(nr_pages, pages, false);

	ret = alloc_xenballooned_pages(nr_pages, pages);

	if (ret < 0)

		return ret;

drivers/xen/privcmd.c

+1 −1
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ static int alloc_empty_pages(struct vm_area_struct *vma, int numpgs) 
	if (pages == NULL)

		return -ENOMEM;



	rc = alloc_xenballooned_pages(numpgs, pages, 0);

	rc = alloc_xenballooned_pages(numpgs, pages);

	if (rc != 0) {

		pr_warn("%s Could not alloc %d pfns rc:%d\n", __func__,

			numpgs, rc);

drivers/xen/xenbus/xenbus_client.c

+1 −2
Original line number Diff line number Diff line
@@ -614,8 +614,7 @@ static int xenbus_map_ring_valloc_hvm(struct xenbus_device *dev, 
	if (!node)

		return -ENOMEM;



	err = alloc_xenballooned_pages(nr_grefs, node->hvm.pages,

				       false /* lowmem */);

	err = alloc_xenballooned_pages(nr_grefs, node->hvm.pages);

	if (err)

		goto out_err;