From patchwork Thu Jan 21 01:41:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Fehlig X-Patchwork-Id: 8076581 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 79D709F1C0 for ; Thu, 21 Jan 2016 01:46:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7DB5D205E5 for ; Thu, 21 Jan 2016 01:46:58 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 97F97205DA for ; Thu, 21 Jan 2016 01:46:57 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aM4ID-0008Jk-9H; Thu, 21 Jan 2016 01:44:09 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aM4IB-0008Jf-Ch for xen-devel@lists.xen.org; Thu, 21 Jan 2016 01:44:07 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id 05/A9-07165-6E730A65; Thu, 21 Jan 2016 01:44:06 +0000 X-Env-Sender: jfehlig@suse.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1453340644!18304295!1 X-Originating-IP: [137.65.250.81] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 36238 invoked from network); 21 Jan 2016 01:44:05 -0000 Received: from smtp2.provo.novell.com (HELO smtp2.provo.novell.com) (137.65.250.81) by server-15.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 21 Jan 2016 01:44:05 -0000 Received: from [137.65.135.33] (prv-ext-foundry1int.gns.novell.com [137.65.251.240]) by smtp2.provo.novell.com with ESMTP (TLS encrypted); Wed, 20 Jan 2016 18:43:54 -0700 Message-ID: <56A03759.6020807@suse.com> Date: Wed, 20 Jan 2016 18:41:45 -0700 From: Jim Fehlig User-Agent: Thunderbird 2.0.0.24 (X11/20100302) MIME-Version: 1.0 To: Joao Martins References: <1453316506-30502-1-git-send-email-joao.m.martins@oracle.com> In-Reply-To: <1453316506-30502-1-git-send-email-joao.m.martins@oracle.com> Cc: libvir-list@redhat.com, xen-devel@lists.xen.org Subject: Re: [Xen-devel] [PATCH] libxl: dispose libxl_dominfo after libxl_domain_info() X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Joao Martins wrote: > As suggested in a previous thread [0] this patch adds some missing calls > to libxl_dominfo_dispose when doing some of the libxl_domain_info > operations which would otherwise lead to memory leaks. > > [0] > https://www.redhat.com/archives/libvir-list/2015-September/msg00519.html > > Signed-off-by: Joao Martins > --- > src/libxl/libxl_driver.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c > index 73ed448..a449730 100644 > --- a/src/libxl/libxl_driver.c > +++ b/src/libxl/libxl_driver.c > @@ -358,6 +358,8 @@ libxlReconnectDomain(virDomainObjPtr vm, > > virObjectLock(vm); > > + libxl_dominfo_init(&d_info); > + > /* Does domain still exist? */ > rc = libxl_domain_info(cfg->ctx, &d_info, vm->def->id); > if (rc == ERROR_INVAL) { > @@ -389,11 +391,13 @@ libxlReconnectDomain(virDomainObjPtr vm, > /* Enable domain death events */ > libxl_evenable_domain_death(cfg->ctx, vm->def->id, 0, &priv->deathW); > > + libxl_dominfo_dispose(&d_info); > virObjectUnlock(vm); > virObjectUnref(cfg); > return 0; > > out: > + libxl_dominfo_dispose(&d_info); > libxlDomainCleanup(driver, vm); > if (!vm->persistent) > virDomainObjListRemoveLocked(driver->domains, vm); > @@ -1598,6 +1602,8 @@ libxlDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) > info->cpuTime = d_info.cpu_time; > info->memory = d_info.current_memkb; > info->maxMem = d_info.max_memkb; > + > + libxl_dominfo_dispose(&d_info); There should be a corresponding libxl_dominfo_init(). While looking at this, I audited all uses of libxl_domain_info() and found another missing _init(). With the below diff squashed in, I think this code is finally correct :-). Do you agree? Regards, Jim diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index 21c7610..4a9134e 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -1593,6 +1593,8 @@ libxlDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) info->memory = vm->def->mem.cur_balloon; info->maxMem = virDomainDefGetMemoryActual(vm->def); } else { + libxl_dominfo_init(&d_info); + if (libxl_domain_info(cfg->ctx, &d_info, vm->def->id) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("libxl_domain_info failed for domain '%d'"), @@ -4797,6 +4799,7 @@ libxlDomainMemoryStats(virDomainPtr dom, virCheckFlags(0, -1); + libxl_dominfo_init(&d_info); cfg = libxlDriverConfigGet(driver); if (!(vm = libxlDomObjFromDomain(dom))) @@ -4828,13 +4831,12 @@ libxlDomainMemoryStats(virDomainPtr dom, ret = i; - libxl_dominfo_dispose(&d_info); - endjob: if (!libxlDomainObjEndJob(driver, vm)) vm = NULL; cleanup: + libxl_dominfo_dispose(&d_info); if (vm) virObjectUnlock(vm); virObjectUnref(cfg);