From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f44.google.com (mail-pa0-f44.google.com [209.85.220.44]) by dpdk.org (Postfix) with ESMTP id 94122DE6 for ; Fri, 3 Jul 2015 10:51:38 +0200 (CEST) Received: by pacws9 with SMTP id ws9so55243664pac.0 for ; Fri, 03 Jul 2015 01:51:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :cc:subject:references:in-reply-to:content-type :content-transfer-encoding; bh=m0E0eLcU1+LIhxnNa4+pdTFU5UTG/rEwBNtAFMltCu4=; b=ZN8Hn1Gb/PiUz5bbYz0hyCLgBObFIwl1f7vJCoDPStB5TESsjcW94uOkB3rstxS9D+ SzS4vPHGpw3fu16Iz0MSOimu+ar1h55yP6AZYg8E3Msc2PFfdWf494elVD1eocrMZZwf zHodm32P6d79dZ3PYbuZPOCFDON+6/jieun4C8I96Ta+yqZoPwylp68H6UuiN8aWI0xB SITIZB5DuAZ5vZyoOuBCA5vgEheX5W5SkjSUvdnhNUtk+0gyHh7n+3xqVIWJ+lIRvHUt HwFwZUuWxKOdZRjER8R6AyAAFei2PCDrgNwbpyDL8ynjw3gb4ahLlzxW4CzyjsbbI2AV Hatg== X-Gm-Message-State: ALoCoQnKM+e/X9lNXIjqzI/ZVrPv7XzvzX/fawwG+gY9unNFb7yNMvTTUJdq+ijKFimeg1Q6OohS X-Received: by 10.70.8.131 with SMTP id r3mr75282866pda.62.1435913497985; Fri, 03 Jul 2015 01:51:37 -0700 (PDT) Received: from [10.16.129.101] (napt.igel.co.jp. [219.106.231.132]) by mx.google.com with ESMTPSA id go5sm8247866pbd.36.2015.07.03.01.51.36 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Jul 2015 01:51:37 -0700 (PDT) Message-ID: <55964D18.4020008@igel.co.jp> Date: Fri, 03 Jul 2015 17:51:36 +0900 From: Tetsuya Mukawa User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Bruce Richardson References: <1435306705-11645-4-git-send-email-mukawa@igel.co.jp> <1435652668-3380-1-git-send-email-mukawa@igel.co.jp> <1435652668-3380-4-git-send-email-mukawa@igel.co.jp> <20150702095722.GA3828@bricha3-MOBL3> In-Reply-To: <20150702095722.GA3828@bricha3-MOBL3> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Cc: dev@dpdk.org Subject: Re: [dpdk-dev] [PATCH v7 03/12] eal: Fix memory leaks and needless increment of pci_map_addr X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Jul 2015 08:51:39 -0000 On 2015/07/02 18:57, Bruce Richardson wrote: > On Tue, Jun 30, 2015 at 05:24:19PM +0900, Tetsuya Mukawa wrote: >> --- >> lib/librte_eal/bsdapp/eal/eal_pci.c | 14 ++++++-- >> lib/librte_eal/linuxapp/eal/eal_pci_uio.c | 56 ++++++++++++++++++++----------- >> 2 files changed, 48 insertions(+), 22 deletions(-) >> >> diff --git a/lib/librte_eal/bsdapp/eal/eal_pci.c b/lib/librte_eal/bsdapp/eal/eal_pci.c >> index 8e24fd1..b071f07 100644 >> --- a/lib/librte_eal/bsdapp/eal/eal_pci.c >> +++ b/lib/librte_eal/bsdapp/eal/eal_pci.c >> @@ -235,7 +235,7 @@ pci_uio_map_resource(struct rte_pci_device *dev) >> if ((uio_res = rte_zmalloc("UIO_RES", sizeof (*uio_res), 0)) == NULL) { >> RTE_LOG(ERR, EAL, >> "%s(): cannot store uio mmap details\n", __func__); >> - return -1; >> + goto close_fd; >> } >> >> snprintf(uio_res->path, sizeof(uio_res->path), "%s", devname); >> @@ -262,8 +262,7 @@ pci_uio_map_resource(struct rte_pci_device *dev) >> (mapaddr = pci_map_resource(NULL, devname, (off_t)offset, >> (size_t)maps[j].size) >> ) == NULL) { >> - rte_free(uio_res); >> - return -1; >> + goto free_uio_res; >> } >> >> maps[j].addr = mapaddr; >> @@ -274,6 +273,15 @@ pci_uio_map_resource(struct rte_pci_device *dev) >> TAILQ_INSERT_TAIL(uio_res_list, uio_res, next); >> >> return 0; >> + >> +free_uio_res: >> + rte_free(uio_res); > If you initialize uio_res to NULL when it is defined, you can get rid of the > distinction between "free_uio_res" and "close_fd" labels. > > Similarly, if you check for a valid dev->intr_handle.fd value before close, you can have a > generic "error" leg, and replace all return -1's with goto error. While not as > useful as merging the labels, it might be something to consider. Hi Bruce, Thanks for comments. Sure, I will cleanup my patch like your mentioned. It will be easier to read. >> @@ -368,23 +373,15 @@ pci_uio_map_resource(struct rte_pci_device *dev) >> >> mapaddr = pci_map_resource(pci_map_addr, fd, 0, >> (size_t)dev->mem_resource[i].len, 0); >> - if (mapaddr == MAP_FAILED) >> - fail = 1; >> + close(fd); >> + if (mapaddr == MAP_FAILED) { >> + rte_free(maps[map_idx].path); >> + goto free_uio_res; >> + } >> >> pci_map_addr = RTE_PTR_ADD(mapaddr, >> (size_t)dev->mem_resource[i].len); >> >> - maps[map_idx].path = rte_malloc(NULL, strlen(devname) + 1, 0); >> - if (maps[map_idx].path == NULL) >> - fail = 1; >> - >> - if (fail) { >> - rte_free(uio_res); >> - close(fd); >> - return -1; >> - } >> - close(fd); >> - >> maps[map_idx].phaddr = dev->mem_resource[i].phys_addr; >> maps[map_idx].size = dev->mem_resource[i].len; >> maps[map_idx].addr = mapaddr; >> @@ -399,6 +396,25 @@ pci_uio_map_resource(struct rte_pci_device *dev) >> TAILQ_INSERT_TAIL(uio_res_list, uio_res, next); >> >> return 0; >> + >> +free_uio_res: >> + for (i = 0; i < map_idx; i++) { > If you move the initialization of map_idx = 0 from the "for" loop to the definition > at the start of the function, you may again be able to merge these two labels > into one. Also I will fix it in next patches. Regards, Tetsuya