Commit 1b4aa2fa authored by Hollis Blanchard's avatar Hollis Blanchard Committed by Rusty Russell

virtio: avoid implicit use of Linux page size in balloon interface

Make the balloon interface always use 4K pages, and convert Linux pfns if
necessary. This patch assumes that Linux's PAGE_SHIFT will never be less than
12.
Signed-off-by: default avatarHollis Blanchard <hollisb@us.ibm.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> (modified)
parent 87c7d57c
...@@ -56,6 +56,15 @@ static struct virtio_device_id id_table[] = { ...@@ -56,6 +56,15 @@ static struct virtio_device_id id_table[] = {
{ 0 }, { 0 },
}; };
static u32 page_to_balloon_pfn(struct page *page)
{
unsigned long pfn = page_to_pfn(page);
BUILD_BUG_ON(PAGE_SHIFT < VIRTIO_BALLOON_PFN_SHIFT);
/* Convert pfn from Linux page size to balloon page size. */
return pfn >> (PAGE_SHIFT - VIRTIO_BALLOON_PFN_SHIFT);
}
static void balloon_ack(struct virtqueue *vq) static void balloon_ack(struct virtqueue *vq)
{ {
struct virtio_balloon *vb; struct virtio_balloon *vb;
...@@ -99,7 +108,7 @@ static void fill_balloon(struct virtio_balloon *vb, size_t num) ...@@ -99,7 +108,7 @@ static void fill_balloon(struct virtio_balloon *vb, size_t num)
msleep(200); msleep(200);
break; break;
} }
vb->pfns[vb->num_pfns] = page_to_pfn(page); vb->pfns[vb->num_pfns] = page_to_balloon_pfn(page);
totalram_pages--; totalram_pages--;
vb->num_pages++; vb->num_pages++;
list_add(&page->lru, &vb->pages); list_add(&page->lru, &vb->pages);
...@@ -132,7 +141,7 @@ static void leak_balloon(struct virtio_balloon *vb, size_t num) ...@@ -132,7 +141,7 @@ static void leak_balloon(struct virtio_balloon *vb, size_t num)
for (vb->num_pfns = 0; vb->num_pfns < num; vb->num_pfns++) { for (vb->num_pfns = 0; vb->num_pfns < num; vb->num_pfns++) {
page = list_first_entry(&vb->pages, struct page, lru); page = list_first_entry(&vb->pages, struct page, lru);
list_del(&page->lru); list_del(&page->lru);
vb->pfns[vb->num_pfns] = page_to_pfn(page); vb->pfns[vb->num_pfns] = page_to_balloon_pfn(page);
vb->num_pages--; vb->num_pages--;
} }
......
...@@ -10,6 +10,9 @@ ...@@ -10,6 +10,9 @@
/* The feature bitmap for virtio balloon */ /* The feature bitmap for virtio balloon */
#define VIRTIO_BALLOON_F_MUST_TELL_HOST 0 /* Tell before reclaiming pages */ #define VIRTIO_BALLOON_F_MUST_TELL_HOST 0 /* Tell before reclaiming pages */
/* Size of a PFN in the balloon interface. */
#define VIRTIO_BALLOON_PFN_SHIFT 12
struct virtio_balloon_config struct virtio_balloon_config
{ {
/* Number of pages host wants Guest to give up. */ /* Number of pages host wants Guest to give up. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment