From: Wei Wang <wei.w.wang@intel.com>
To: linux-kernel@vger.kernel.org, qemu-devel@nongnu.org,
virtualization@lists.linux-foundation.org, kvm@vger.kernel.org,
linux-mm@kvack.org, mst@redhat.com, david@redhat.com,
cornelia.huck@de.ibm.com, akpm@linux-foundation.org,
mgorman@techsingularity.net, aarcange@redhat.com,
amit.shah@redhat.com, pbonzini@redhat.com, wei.w.wang@intel.com,
liliang.opensource@gmail.com
Cc: virtio-dev@lists.oasis-open.org, yang.zhang.wz@gmail.com,
quan.xu@aliyun.com
Subject: [PATCH v12 1/8] virtio-balloon: deflate via a page list
Date: Wed, 12 Jul 2017 20:40:14 +0800 [thread overview]
Message-ID: <1499863221-16206-2-git-send-email-wei.w.wang@intel.com> (raw)
In-Reply-To: <1499863221-16206-1-git-send-email-wei.w.wang@intel.com>
From: Liang Li <liang.z.li@intel.com>
This patch saves the deflated pages to a list, instead of the PFN array.
Accordingly, the balloon_pfn_to_page() function is removed.
Signed-off-by: Liang Li <liang.z.li@intel.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Wei Wang <wei.w.wang@intel.com>
---
drivers/virtio/virtio_balloon.c | 22 ++++++++--------------
1 file changed, 8 insertions(+), 14 deletions(-)
diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c
index 22caf80..7f38ae6 100644
--- a/drivers/virtio/virtio_balloon.c
+++ b/drivers/virtio/virtio_balloon.c
@@ -104,12 +104,6 @@ static u32 page_to_balloon_pfn(struct page *page)
return pfn * VIRTIO_BALLOON_PAGES_PER_PAGE;
}
-static struct page *balloon_pfn_to_page(u32 pfn)
-{
- BUG_ON(pfn % VIRTIO_BALLOON_PAGES_PER_PAGE);
- return pfn_to_page(pfn / VIRTIO_BALLOON_PAGES_PER_PAGE);
-}
-
static void balloon_ack(struct virtqueue *vq)
{
struct virtio_balloon *vb = vq->vdev->priv;
@@ -182,18 +176,16 @@ static unsigned fill_balloon(struct virtio_balloon *vb, size_t num)
return num_allocated_pages;
}
-static void release_pages_balloon(struct virtio_balloon *vb)
+static void release_pages_balloon(struct virtio_balloon *vb,
+ struct list_head *pages)
{
- unsigned int i;
- struct page *page;
+ struct page *page, *next;
- /* Find pfns pointing at start of each page, get pages and free them. */
- for (i = 0; i < vb->num_pfns; i += VIRTIO_BALLOON_PAGES_PER_PAGE) {
- page = balloon_pfn_to_page(virtio32_to_cpu(vb->vdev,
- vb->pfns[i]));
+ list_for_each_entry_safe(page, next, pages, lru) {
if (!virtio_has_feature(vb->vdev,
VIRTIO_BALLOON_F_DEFLATE_ON_OOM))
adjust_managed_page_count(page, 1);
+ list_del(&page->lru);
put_page(page); /* balloon reference */
}
}
@@ -203,6 +195,7 @@ static unsigned leak_balloon(struct virtio_balloon *vb, size_t num)
unsigned num_freed_pages;
struct page *page;
struct balloon_dev_info *vb_dev_info = &vb->vb_dev_info;
+ LIST_HEAD(pages);
/* We can only do one array worth at a time. */
num = min(num, ARRAY_SIZE(vb->pfns));
@@ -216,6 +209,7 @@ static unsigned leak_balloon(struct virtio_balloon *vb, size_t num)
if (!page)
break;
set_page_pfns(vb, vb->pfns + vb->num_pfns, page);
+ list_add(&page->lru, &pages);
vb->num_pages -= VIRTIO_BALLOON_PAGES_PER_PAGE;
}
@@ -227,7 +221,7 @@ static unsigned leak_balloon(struct virtio_balloon *vb, size_t num)
*/
if (vb->num_pfns != 0)
tell_host(vb, vb->deflate_vq);
- release_pages_balloon(vb);
+ release_pages_balloon(vb, &pages);
mutex_unlock(&vb->balloon_lock);
return num_freed_pages;
}
--
2.7.4
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2017-07-12 12:47 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-12 12:40 [PATCH v12 0/8] Virtio-balloon Enhancement Wei Wang
2017-07-12 12:40 ` Wei Wang [this message]
2017-07-12 12:40 ` [PATCH v12 2/8] virtio-balloon: coding format cleanup Wei Wang
2017-07-12 12:40 ` [PATCH v12 3/8] Introduce xbitmap Wei Wang
2017-07-12 12:40 ` [PATCH v12 4/8] xbitmap: add xb_find_next_bit() and xb_zero() Wei Wang
2017-07-12 12:40 ` [PATCH v12 5/8] virtio-balloon: VIRTIO_BALLOON_F_SG Wei Wang
2017-07-12 13:06 ` Michael S. Tsirkin
2017-07-12 13:29 ` Wei Wang
2017-07-12 13:56 ` Michael S. Tsirkin
2017-07-13 7:42 ` Wei Wang
2017-07-13 20:19 ` Michael S. Tsirkin
2017-07-14 7:12 ` Wei Wang
2017-07-23 1:45 ` Michael S. Tsirkin
2017-07-26 3:48 ` Wei Wang
2017-07-26 17:02 ` Michael S. Tsirkin
2017-07-27 2:50 ` Wei Wang
2017-07-28 23:08 ` Michael S. Tsirkin
2017-07-29 12:47 ` Wei Wang
2017-07-30 4:22 ` Michael S. Tsirkin
2017-07-30 5:59 ` Wang, Wei W
2017-07-30 16:18 ` Michael S. Tsirkin
2017-07-30 16:20 ` Michael S. Tsirkin
2017-07-31 12:36 ` Wei Wang
2017-07-13 0:44 ` Michael S. Tsirkin
2017-07-13 1:16 ` kbuild test robot
2017-07-13 4:21 ` kbuild test robot
2017-07-28 8:25 ` Wei Wang
2017-07-28 23:01 ` Michael S. Tsirkin
2017-07-12 12:40 ` [PATCH v12 6/8] mm: support reporting free page blocks Wei Wang
2017-07-13 0:33 ` Michael S. Tsirkin
2017-07-13 8:25 ` Wei Wang
2017-07-14 12:30 ` Michal Hocko
2017-07-14 12:54 ` Michal Hocko
2017-07-14 15:46 ` Michael S. Tsirkin
2017-07-14 19:17 ` Michael S. Tsirkin
2017-07-17 15:24 ` Michal Hocko
2017-07-18 2:12 ` Wei Wang
2017-07-19 8:13 ` Michal Hocko
2017-07-19 12:01 ` Wei Wang
2017-07-24 9:00 ` Michal Hocko
2017-07-25 9:32 ` Wei Wang
2017-07-25 11:25 ` Michal Hocko
2017-07-25 11:56 ` Wei Wang
2017-07-25 12:41 ` Michal Hocko
2017-07-25 14:47 ` Wang, Wei W
2017-07-25 14:53 ` Michal Hocko
2017-07-26 2:22 ` Wei Wang
2017-07-26 10:24 ` Michal Hocko
2017-07-26 11:44 ` Wei Wang
2017-07-26 11:55 ` Michal Hocko
2017-07-26 12:47 ` Wang, Wei W
2017-07-12 12:40 ` [PATCH v12 7/8] mm: export symbol of next_zone and first_online_pgdat Wei Wang
2017-07-13 0:16 ` Michael S. Tsirkin
2017-07-13 8:41 ` [virtio-dev] " Wei Wang
2017-07-14 12:31 ` Michal Hocko
2017-07-12 12:40 ` [PATCH v12 8/8] virtio-balloon: VIRTIO_BALLOON_F_CMD_VQ Wei Wang
2017-07-13 0:22 ` Michael S. Tsirkin
2017-07-13 8:46 ` Wei Wang
2017-07-13 17:59 ` Michael S. Tsirkin
2017-07-13 0:14 ` [PATCH v12 0/8] Virtio-balloon Enhancement Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1499863221-16206-2-git-send-email-wei.w.wang@intel.com \
--to=wei.w.wang@intel.com \
--cc=aarcange@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=amit.shah@redhat.com \
--cc=cornelia.huck@de.ibm.com \
--cc=david@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=liliang.opensource@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mgorman@techsingularity.net \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quan.xu@aliyun.com \
--cc=virtio-dev@lists.oasis-open.org \
--cc=virtualization@lists.linux-foundation.org \
--cc=yang.zhang.wz@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).