Skip to content

Commit

Permalink
xen/blkback: Use 'vzalloc' for page arrays and pre-allocate pages.
Browse files Browse the repository at this point in the history
Previously we would allocate the array for page using 'kmalloc' which
we can as easily do with 'vzalloc'. The pre-allocation of pages
was done a bit differently in the past - it used to be that
the balloon driver would export "alloc_empty_pages_and_pagevec"
which would have in one function created an array, allocated
the pages, balloned the pages out (so the memory behind those
pages would be non-present), and provide us those pages.

This was OK as those pages were shared between other guest and
the only thing we needed was to "swizzel" the MFN of those pages
to point to the other guest MFN. We can still "swizzel" the MFNs
using the M2P (and P2M) override API calls, but for the sake of
simplicity we are dropping the balloon API calls. We can return
to those later on.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
  • Loading branch information
Konrad Rzeszutek Wilk committed Apr 14, 2011
1 parent c35950b commit 464fb41
Showing 1 changed file with 16 additions and 7 deletions.
23 changes: 16 additions & 7 deletions drivers/xen/blkback/blkback.c
Original file line number Diff line number Diff line change
Expand Up @@ -637,18 +637,23 @@ static int __init blkif_init(void)

blkbk->pending_reqs = kmalloc(sizeof(blkbk->pending_reqs[0]) *
blkif_reqs, GFP_KERNEL);
blkbk->pending_grant_handles = kmalloc(sizeof(blkbk->pending_grant_handles[0]) *
mmap_pages, GFP_KERNEL);
blkbk->pending_pages = alloc_empty_pages_and_pagevec(mmap_pages);
blkbk->pending_grant_handles = vzalloc(sizeof(blkbk->pending_grant_handles[0]) *
mmap_pages);
blkbk->pending_pages = vzalloc(sizeof(blkbk->pending_pages[0]) * mmap_pages);

if (!blkbk->pending_reqs || !blkbk->pending_grant_handles || !blkbk->pending_pages) {
rc = -ENOMEM;
goto out_of_memory;
}

for (i = 0; i < mmap_pages; i++)
for (i = 0; i < mmap_pages; i++) {
blkbk->pending_grant_handles[i] = BLKBACK_INVALID_HANDLE;

blkbk->pending_pages[i] = alloc_page(GFP_KERNEL | __GFP_HIGHMEM);
if (blkbk->pending_pages[i] == NULL) {
rc = -ENOMEM;
goto out_of_memory;
}
}
rc = blkif_interface_init();
if (rc)
goto failed_init;
Expand All @@ -672,8 +677,12 @@ static int __init blkif_init(void)
printk(KERN_ERR "%s: out of memory\n", __func__);
failed_init:
kfree(blkbk->pending_reqs);
kfree(blkbk->pending_grant_handles);
free_empty_pages_and_pagevec(blkbk->pending_pages, mmap_pages);
vfree(blkbk->pending_grant_handles);
for (i = 0; i < mmap_pages; i++) {
if (blkbk->pending_pages[i])
__free_page(blkbk->pending_pages[i]);
}
vfree(blkbk->pending_pages);
vfree(blkbk);
blkbk = NULL;
return rc;
Expand Down

0 comments on commit 464fb41

Please sign in to comment.