From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751730AbcFWIaa (ORCPT ); Thu, 23 Jun 2016 04:30:30 -0400 Received: from mga01.intel.com ([192.55.52.88]:48383 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751229AbcFWIa2 convert rfc822-to-8bit (ORCPT ); Thu, 23 Jun 2016 04:30:28 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,515,1459839600"; d="scan'208";a="723823417" From: "Li, Liang Z" To: "kvm@vger.kernel.org" CC: "virtio-dev@lists.oasis-open.org" , "qemu-devel@nongun.org" , "linux-kernel@vger.kernel.org" , "mst@redhat.com" , Paolo Bonzini , Cornelia Huck , Amit Shah Subject: RE: [PATCH 1/6] virtio-balloon: rework deflate to add page to a list Thread-Topic: [PATCH 1/6] virtio-balloon: rework deflate to add page to a list Thread-Index: AQHRxVl/+wq76AkcW0KL3jfLpAWFbJ/2x3wQ Date: Thu, 23 Jun 2016 08:30:24 +0000 Message-ID: References: <1465811233-21136-1-git-send-email-liang.z.li@intel.com> <1465811233-21136-2-git-send-email-liang.z.li@intel.com> In-Reply-To: <1465811233-21136-2-git-send-email-liang.z.li@intel.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMGEwMjk4ZmEtYzA2MS00NWM1LTk3ZDMtNjU2ODNmZGJmOGQzIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE1LjkuNi42IiwiVHJ1c3RlZExhYmVsSGFzaCI6IllPZWE3cUVnWW0rRFI1dnZRTjN4RXA5alE3ZW9oZTlScUM5cmpnRDBMSTg9In0= x-ctpclassification: CTP_IC x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Michael, Could you help to review this patch set and give some comments when you have time? My work is blocked here. Thanks ! Liang > -----Original Message----- > From: Li, Liang Z > Sent: Monday, June 13, 2016 5:47 PM > To: kvm@vger.kernel.org > Cc: virtio-dev@lists.oasis-open.org; qemu-devel@nongun.org; linux- > kernel@vger.kernel.org; mst@redhat.com; Li, Liang Z; Paolo Bonzini; Cornelia > Huck; Amit Shah > Subject: [PATCH 1/6] virtio-balloon: rework deflate to add page to a list > > will allow faster notifications using a bitmap down the road. > Now balloon_pfn_to_page() can be removed because it is not used. > > Signed-off-by: Liang Li > Signed-off-by: Michael S. Tsirkin > Cc: Paolo Bonzini > Cc: Cornelia Huck > Cc: Amit Shah > --- > 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 476c0e3..8d649a2 100644 > --- a/drivers/virtio/virtio_balloon.c > +++ b/drivers/virtio/virtio_balloon.c > @@ -98,12 +98,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; @@ -176,18 +170,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 */ > } > } > @@ -197,6 +189,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)); > @@ -208,6 +201,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; > } > > @@ -219,7 +213,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; > } > -- > 1.9.1