From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753284AbaAXPg1 (ORCPT ); Fri, 24 Jan 2014 10:36:27 -0500 Received: from smtp.citrix.com ([66.165.176.89]:27991 "EHLO SMTP.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753064AbaAXPg0 (ORCPT ); Fri, 24 Jan 2014 10:36:26 -0500 X-IronPort-AV: E=Sophos;i="4.95,713,1384300800"; d="scan'208";a="96206346" Message-ID: <1390577782.13513.8.camel@kazak.uk.xensource.com> Subject: Re: [Xen-devel] [PATCH] xen-blkback: fix memory leak when persistent grants are used From: Ian Campbell To: Matt Wilson CC: Matt Wilson , , , Matt Rushton , David Vrabel , Anthony Liguori , Roger Pau =?ISO-8859-1?Q?Monn=E9?= Date: Fri, 24 Jan 2014 15:36:22 +0000 In-Reply-To: <1390555293.2124.6.camel@kazak.uk.xensource.com> References: <1390505326-9368-1-git-send-email-msw@linux.com> <1390555293.2124.6.camel@kazak.uk.xensource.com> Organization: Citrix Systems, Inc. Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.4.4-3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Originating-IP: [10.80.2.80] X-DLP: MIA2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 2014-01-24 at 09:21 +0000, Ian Campbell wrote: > On Thu, 2014-01-23 at 11:28 -0800, Matt Wilson wrote: > > From: Matt Rushton > > > > Currently shrink_free_pagepool() is called before the pages used for > > persistent grants are released via free_persistent_gnts(). This > > results in a memory leak when a VBD that uses persistent grants is > > torn down. > > This may well be the explanation for the memory leak I was observing on > ARM last night. I'll give it a go and let you know. Results are a bit inconclusive unfortunately, it seems like I am seeing some other leak too (or instead). Totally unscientifically it does seem to be leaking more slowly than before, so perhaps this patch has helped, but nothing conclusive I'm afraid. I don't think that quite qualifies for a Tested-by though, sorry. Ian. > > > Cc: Konrad Rzeszutek Wilk > > Cc: "Roger Pau Monné" > > Cc: Ian Campbell > > Cc: David Vrabel > > Cc: linux-kernel@vger.kernel.org > > Cc: xen-devel@lists.xen.org > > Cc: Anthony Liguori > > Signed-off-by: Matt Rushton > > Signed-off-by: Matt Wilson > > --- > > drivers/block/xen-blkback/blkback.c | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/block/xen-blkback/blkback.c b/drivers/block/xen-blkback/blkback.c > > index 6620b73..30ef7b3 100644 > > --- a/drivers/block/xen-blkback/blkback.c > > +++ b/drivers/block/xen-blkback/blkback.c > > @@ -625,9 +625,6 @@ purge_gnt_list: > > print_stats(blkif); > > } > > > > - /* Since we are shutting down remove all pages from the buffer */ > > - shrink_free_pagepool(blkif, 0 /* All */); > > - > > /* Free all persistent grant pages */ > > if (!RB_EMPTY_ROOT(&blkif->persistent_gnts)) > > free_persistent_gnts(blkif, &blkif->persistent_gnts, > > @@ -636,6 +633,9 @@ purge_gnt_list: > > BUG_ON(!RB_EMPTY_ROOT(&blkif->persistent_gnts)); > > blkif->persistent_gnt_c = 0; > > > > + /* Since we are shutting down remove all pages from the buffer */ > > + shrink_free_pagepool(blkif, 0 /* All */); > > + > > if (log_stats) > > print_stats(blkif); > > > > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel