From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pd0-f173.google.com (mail-pd0-f173.google.com [209.85.192.173]) by dpdk.org (Postfix) with ESMTP id 832759ABB for ; Tue, 24 Mar 2015 05:18:59 +0100 (CET) Received: by pdbop1 with SMTP id op1so208565820pdb.2 for ; Mon, 23 Mar 2015 21:18:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Y+C2LYmnJ1+hOkFrBcNef7/KhmLQm3Q8bbBkpanFjRw=; b=P9uiDLcOpN5QoSydaWiGDp9CAM58O+X3XqQ/+MSAyZovIC82uWWlneM4jyafwCU8v2 Dob0KEL9jp3kvWKOdAPxmGujU4igsNLEuyc0R2vfWJKtQ9tRj9oQB+JfPD11yKxXgDMA AbRXS0xCP2UzHTTVHD5Ym5DvU9PySo4pL1Ga4cm8xX5MP9+pVsq/z0KfhxzSkOLx80Zf U85sAl7d0I60tSs+M54KFI34+rNq//DsKAi32UAr2BpL+zFBByeQ9kBkKe1F5JmHTlM/ k5XraIC0H+21KVGLL93EoBl0ZQsMlNw0jwu/WHY1xSUZz+NRMNJ+FXwHfgAjV3bGZpkQ SApA== X-Gm-Message-State: ALoCoQl1S1mXjIUKvGnUpuenrRtDUCsBtvIVa34SIORTroCEWvVTtpa4de4Nl31DHsXKsGIPJW9m X-Received: by 10.66.171.199 with SMTP id aw7mr4471921pac.6.1427170737918; Mon, 23 Mar 2015 21:18:57 -0700 (PDT) Received: from localhost.localdomain (napt.igel.co.jp. [219.106.231.132]) by mx.google.com with ESMTPSA id jx5sm2482078pbc.85.2015.03.23.21.18.55 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Mar 2015 21:18:57 -0700 (PDT) From: Tetsuya Mukawa To: dev@dpdk.org Date: Tue, 24 Mar 2015 13:18:34 +0900 Message-Id: <1427170717-13879-4-git-send-email-mukawa@igel.co.jp> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1427170717-13879-1-git-send-email-mukawa@igel.co.jp> References: <1426584645-28828-7-git-send-email-mukawa@igel.co.jp> <1427170717-13879-1-git-send-email-mukawa@igel.co.jp> Subject: [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: Tue, 24 Mar 2015 04:19:00 -0000 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++) + 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