From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pd0-f179.google.com (mail-pd0-f179.google.com [209.85.192.179]) by dpdk.org (Postfix) with ESMTP id 1611E37A4 for ; Thu, 26 Mar 2015 03:44:28 +0100 (CET) Received: by pdnc3 with SMTP id c3so48071268pdn.0 for ; Wed, 25 Mar 2015 19:44:27 -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=Bj7MX5M8lqOJhcLhvV7fbPMzasyW4JnccV1L2xzKeZ8=; b=R7us7DXgGEh7atP/8Oq2x/p3+TXY3839sxkImx3XO6Kpt885Fp1MGNmDtLR6ddwmGu S8bI0FYXJHMJrb2NV4F4VizxtYthRGQxlD0gm6rxA1FiJhArQ8N9GpqvX3Pa5nAv7aF7 Sfa1aTW7pRzlo4S0OvIWbiI5jfp9tdldZ0SI79g+jRfN7sDTFMh5xKw+x/7LHQ+nAY1W TqUMIst8cxJoB7NZCsYWUBntSEQX8l/1r5J1WySRjITlC15hQqKGs/Gi1U73QylgfKHD ZG4X1rITMEwFmKrvwRJD2sVFxqrexHOcpbav6Xab/99EHNzxrS0YloXljtN4hQrOmPjc LZsg== X-Gm-Message-State: ALoCoQl0hhGK8DiqQPr9IDECI6OMTrIjYMme+qvbp1dL3n/Bxv+QV4SpL2HCxC5fi4Te+oY/oM1T X-Received: by 10.66.141.231 with SMTP id rr7mr22858472pab.72.1427337867190; Wed, 25 Mar 2015 19:44:27 -0700 (PDT) Received: from [10.16.129.101] (napt.igel.co.jp. [219.106.231.132]) by mx.google.com with ESMTPSA id fm3sm3822299pab.29.2015.03.25.19.44.25 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Mar 2015 19:44:26 -0700 (PDT) Message-ID: <55137287.2090000@igel.co.jp> Date: Thu, 26 Mar 2015 11:44:23 +0900 From: Tetsuya Mukawa User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: "Iremonger, Bernard" , "dev@dpdk.org" References: <1426584645-28828-7-git-send-email-mukawa@igel.co.jp> <1427170717-13879-1-git-send-email-mukawa@igel.co.jp> <1427170717-13879-4-git-send-email-mukawa@igel.co.jp> <8CEF83825BEC744B83065625E567D7C204A02409@IRSMSX108.ger.corp.intel.com> In-Reply-To: <8CEF83825BEC744B83065625E567D7C204A02409@IRSMSX108.ger.corp.intel.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [dpdk-dev] [PATCH v2 3/6] 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: Thu, 26 Mar 2015 02:44:28 -0000 On 2015/03/26 0:00, Iremonger, Bernard wrote: > >> -----Original Message----- >> From: Tetsuya Mukawa [mailto:mukawa@igel.co.jp] >> Sent: Tuesday, March 24, 2015 4:19 AM >> To: dev@dpdk.org >> Cc: Iremonger, Bernard; Richardson, Bruce; david.marchand@6wind.com; Tetsuya Mukawa >> Subject: [PATCH v2 3/6] eal: Fix memory leaks and needless increment of pci_map_addr >> >> This patch fixes following memory leaks. >> - When pci_map_resource() is failed but path is allocated correctly, >> path won't be freed in pci_uio_map_recource(). >> - When open() is failed, uio_res won't be freed in >> pci_uio_map_resource(). >> - When pci_uio_unmap() is called, path should be freed. >> >> Also, fixes below. >> - When pci_map_resource() is failed, mapaddr will be MAP_FAILED. >> In this case, pci_map_addr should not be incremented in >> pci_uio_map_resource(). >> - To shrink code, move close(). >> - Remove fail variable. >> >> Signed-off-by: Tetsuya Mukawa >> --- >> lib/librte_eal/linuxapp/eal/eal_pci_uio.c | 35 ++++++++++++++++++------------- >> 1 file changed, 20 insertions(+), 15 deletions(-) >> >> diff --git a/lib/librte_eal/linuxapp/eal/eal_pci_uio.c b/lib/librte_eal/linuxapp/eal/eal_pci_uio.c >> index f0277be..0128cec 100644 >> --- a/lib/librte_eal/linuxapp/eal/eal_pci_uio.c >> +++ b/lib/librte_eal/linuxapp/eal/eal_pci_uio.c >> @@ -333,7 +333,6 @@ pci_uio_map_resource(struct rte_pci_device *dev) >> maps = uio_res->maps; >> for (i = 0, map_idx = 0; i != PCI_MAX_RESOURCE; i++) { >> int fd; >> - int fail = 0; >> >> /* skip empty BAR */ >> phaddr = dev->mem_resource[i].phys_addr; @@ -347,6 +346,11 @@ >> pci_uio_map_resource(struct rte_pci_device *dev) >> loc->domain, loc->bus, loc->devid, loc->function, >> i); >> >> + /* allocate memory to keep path */ >> + maps[map_idx].path = rte_malloc(NULL, strlen(devname) + 1, 0); >> + if (maps[map_idx].path == NULL) >> + goto fail0; >> + >> /* >> * open resource file, to mmap it >> */ >> @@ -354,7 +358,7 @@ pci_uio_map_resource(struct rte_pci_device *dev) >> if (fd < 0) { >> RTE_LOG(ERR, EAL, "Cannot open %s: %s\n", >> devname, strerror(errno)); >> - return -1; >> + goto fail1; >> } >> >> /* try mapping somewhere close to the end of hugepages */ @@ -363,23 +367,13 @@ >> 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); >> + close(fd); >> if (mapaddr == MAP_FAILED) >> - fail = 1; >> + goto fail1; >> >> 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; >> @@ -394,6 +388,15 @@ pci_uio_map_resource(struct rte_pci_device *dev) >> TAILQ_INSERT_TAIL(uio_res_list, uio_res, next); >> >> return 0; >> + >> +fail1: >> + rte_free(maps[map_idx].path); >> +fail0: >> + for (i = 0; i < map_idx; i++) > Hi Tetsuya, > > fail1: falls through to fail0: > Would it be cleaner to drop fail1: and change the for loop in fail0: to > for (i = 0; i <= map_idx; i++) Hi Bernard, Thanks for suggestion. I will rewrite a bit to be more cleaner. Regards, Tetsuya > Regards, > > Bernard. > >> + rte_free(maps[i].path); >> + rte_free(uio_res); >> + >> + return -1; >> } >> >> #ifdef RTE_LIBRTE_EAL_HOTPLUG >> @@ -405,9 +408,11 @@ pci_uio_unmap(struct mapped_pci_resource *uio_res) >> if (uio_res == NULL) >> return; >> >> - for (i = 0; i != uio_res->nb_maps; i++) >> + for (i = 0; i != uio_res->nb_maps; i++) { >> pci_unmap_resource(uio_res->maps[i].addr, >> (size_t)uio_res->maps[i].size); >> + rte_free(uio_res->maps[i].path); >> + } >> } >> >> static struct mapped_pci_resource * >> -- >> 1.9.1