[PATCH 3/4 Trusty SRU] virtio_ballon: change stub of release_pages_by_pfn
Tim Gardner
tim.gardner at canonical.com
Thu Jun 23 13:38:39 UTC 2016
From: "Denis V. Lunev" <den at openvz.org>
BugLink: http://bugs.launchpad.net/bugs/1587089
and rename it to release_pages_balloon. The function originally takes
arrays of pfns and now it takes pointer to struct virtio_ballon.
This change is necessary to conditionally call adjust_managed_page_count
in the next patch.
Signed-off-by: Denis V. Lunev <den at openvz.org>
CC: Michael S. Tsirkin <mst at redhat.com>
Signed-off-by: Michael S. Tsirkin <mst at redhat.com>
(back ported from commit b4d34037329f46ed818d3b0a6e1e23b9c8721f79)
Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
Conflicts:
drivers/virtio/virtio_balloon.c
---
drivers/virtio/virtio_balloon.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c
index 3a5219a..a64890c 100644
--- a/drivers/virtio/virtio_balloon.c
+++ b/drivers/virtio/virtio_balloon.c
@@ -167,13 +167,13 @@ static void fill_balloon(struct virtio_balloon *vb, size_t num)
mutex_unlock(&vb->balloon_lock);
}
-static void release_pages_by_pfn(const u32 pfns[], unsigned int num)
+static void release_pages_balloon(struct virtio_balloon *vb)
{
unsigned int i;
/* Find pfns pointing at start of each page, get pages and free them. */
- for (i = 0; i < num; i += VIRTIO_BALLOON_PAGES_PER_PAGE) {
- struct page *page = balloon_pfn_to_page(pfns[i]);
+ for (i = 0; i < vb->num_pfns; i += VIRTIO_BALLOON_PAGES_PER_PAGE) {
+ struct page *page = balloon_pfn_to_page(vb->pfns[i]);
adjust_managed_page_count(page, 1);
put_page(page); /* balloon reference */
}
@@ -206,8 +206,8 @@ static unsigned leak_balloon(struct virtio_balloon *vb, size_t num)
*/
if (vb->num_pfns != 0)
tell_host(vb, vb->deflate_vq);
- release_pages_by_pfn(vb->pfns, vb->num_pfns);
mutex_unlock(&vb->balloon_lock);
+ release_pages_balloon(vb);
return num_freed_pages;
}
--
1.9.1
More information about the kernel-team
mailing list