From 31661d1e13c67119da5f683f9327c27c8801411a Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Wed, 13 Feb 2013 08:47:57 -0500 Subject: [PATCH] Revert "xen/pvh linux: Use ballooning to allocate grant table pages" This reverts commit 40f633eb0deffa3069bee0c971319118790765b3. Wrong patch applied. Signed-off-by: Konrad Rzeszutek Wilk --- drivers/xen/grant-table.c | 37 +++++++++++-------------------------- 1 file changed, 11 insertions(+), 26 deletions(-) diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c index 0a714ad60174..70125667557d 100644 --- a/drivers/xen/grant-table.c +++ b/drivers/xen/grant-table.c @@ -47,7 +47,6 @@ #include #include #include -#include #include #include @@ -1140,41 +1139,27 @@ static void gnttab_request_version(void) grant_table_version); } -static int xlated_setup_gnttab_pages(int numpages, void **addr) -{ - int i, rc; - unsigned long pfns[numpages]; - struct page *pages[numpages]; - - rc = alloc_xenballooned_pages(numpages, pages, 0); - if (rc != 0) { - pr_warn("%s Could not balloon alloc %d pfns rc:%d\n", __func__, - numpages, rc); - return -ENOMEM; - } - for (i = 0; i < numpages; i++) - pfns[i] = page_to_pfn(pages[i]); - - rc = arch_gnttab_map_shared(pfns, numpages, numpages, addr); - return rc; -} - int gnttab_resume(void) { - unsigned int rc, max_nr_gframes; + unsigned int max_nr_gframes; + char *kmsg = "Failed to kmalloc pages for pv in hvm grant frames\n"; gnttab_request_version(); max_nr_gframes = gnttab_max_grant_frames(); if (max_nr_gframes < nr_grant_frames) return -ENOSYS; + /* PVH note: xen will free existing kmalloc'd mfn in + * XENMEM_add_to_physmap. TBD/FIXME: use xen ballooning instead of + * kmalloc(). */ if (xen_pv_domain() && xen_feature(XENFEAT_auto_translated_physmap) && !gnttab_shared.addr) { - - rc = xlated_setup_gnttab_pages(max_nr_gframes, - &gnttab_shared.addr); - if (rc != 0) - return rc; + gnttab_shared.addr = + kmalloc(max_nr_gframes * PAGE_SIZE, GFP_KERNEL); + if (!gnttab_shared.addr) { + pr_warn("%s", kmsg); + return -ENOMEM; + } } if (xen_pv_domain()) return gnttab_map(0, nr_grant_frames - 1); -- 2.39.5