leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xen: add an "highmem" parameter to alloc_xenballooned_pages

Browse Source 
Add an highmem parameter to alloc_xenballooned_pages, to allow callers to
request lowmem or highmem pages.

Fix the code style of free_xenballooned_pages' prototype.

Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
This commit is contained in:
Stefano Stabellini 2011-09-29 11:57:55 +01:00 committed by Konrad Rzeszutek Wilk
parent 0f4b49eaf2
commit 693394b8c3
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/xen/balloon.c
View File

@ -501,20 +501,24 @@ EXPORT_SYMBOL_GPL(balloon_set_new_target);
* alloc_xenballooned_pages - get pages that have been ballooned out * alloc_xenballooned_pages - get pages that have been ballooned out
* @nr_pages: Number of pages to get * @nr_pages: Number of pages to get
* @pages: pages returned * @pages: pages returned
* @highmem: highmem or lowmem pages
* @return 0 on success, error otherwise * @return 0 on success, error otherwise
*/ */
int alloc_xenballooned_pages(int nr_pages, struct page** pages) int alloc_xenballooned_pages(int nr_pages, struct page **pages, bool highmem)
{ {
int pgno = 0; int pgno = 0;
struct page* page; struct page* page;
mutex_lock(&balloon_mutex); mutex_lock(&balloon_mutex);
while (pgno < nr_pages) { while (pgno < nr_pages) {
page = balloon_retrieve(true); page = balloon_retrieve(highmem);
if (page) { if (page && PageHighMem(page) == highmem) {
pages[pgno++] = page; pages[pgno++] = page;
} else { } else {
enum bp_state st; enum bp_state st;
st = decrease_reservation(nr_pages - pgno, GFP_HIGHUSER); if (page)
balloon_append(page);
st = decrease_reservation(nr_pages - pgno,
highmem ? GFP_HIGHUSER : GFP_USER);
if (st != BP_DONE) if (st != BP_DONE)
goto out_undo; goto out_undo;
} }

2
drivers/xen/gntdev.c
View File

@ -123,7 +123,7 @@ static struct grant_map *gntdev_alloc_map(struct gntdev_priv *priv, int count)
NULL == add->pages) NULL == add->pages)
goto err; goto err;
if (alloc_xenballooned_pages(count, add->pages)) if (alloc_xenballooned_pages(count, add->pages, false /* lowmem */))
goto err; goto err;
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {

5
include/xen/balloon.h
View File

@ -25,8 +25,9 @@ extern struct balloon_stats balloon_stats;
void balloon_set_new_target(unsigned long target); void balloon_set_new_target(unsigned long target);
int alloc_xenballooned_pages(int nr_pages, struct page** pages); int alloc_xenballooned_pages(int nr_pages, struct page **pages,
void free_xenballooned_pages(int nr_pages, struct page** pages); bool highmem);
void free_xenballooned_pages(int nr_pages, struct page **pages);
struct sys_device; struct sys_device;
#ifdef CONFIG_XEN_SELFBALLOONING #ifdef CONFIG_XEN_SELFBALLOONING