From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f48.google.com (mail-pa0-f48.google.com [209.85.220.48]) by dpdk.org (Postfix) with ESMTP id DE07F68A5 for ; Wed, 8 Jul 2015 12:35:41 +0200 (CEST) Received: by pactm7 with SMTP id tm7so129696729pac.2 for ; Wed, 08 Jul 2015 03:35:41 -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=V3bHaxMbdTlSBgDfOw91SfWVRyql0ASPdWF7hTnk01g=; b=Qi4jtp97NxIjRCLNMgtBW4DU9IvTXdw3lDLsbhNPdEiImj4UyZHWeUbp6LrXG4sT3Y rMFZDWz6HxhhoGRyZXURpvGS5brX+VSlKbk8/O741zam9nRzee992onpVNjx84exl4+a oBd+7LQ9+dBoYVfgu4hwLxh5quXgPs78hJQ/xXNNz1WL9/w2XwotjL+pgnO57UtklM4D 7zInPqzJ6kriBaoMS8BE3Rv7BjstvFEejnfnr9y6IeOuReDhX7PizIN3Ct5csKhQ7T54 +Tnx0pnD4z09AZygYOU4oSZZdJEx1taYiUOyy47lcGTnN5k1MH0SeaqSj4xUGbqUIFG2 i7rw== X-Gm-Message-State: ALoCoQlMf/Fz7o257BMMeGhSgxo7EClKY1jCbDnTBJxrH3u99bMnWNAFRPqG77H4SB9UytPK5Eas X-Received: by 10.70.35.201 with SMTP id k9mr18967627pdj.128.1436351741255; Wed, 08 Jul 2015 03:35:41 -0700 (PDT) Received: from localhost.localdomain (napt.igel.co.jp. [219.106.231.132]) by smtp.gmail.com with ESMTPSA id xf2sm2043139pab.25.2015.07.08.03.35.39 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 08 Jul 2015 03:35:40 -0700 (PDT) From: Tetsuya Mukawa To: dev@dpdk.org Date: Wed, 8 Jul 2015 19:34:44 +0900 Message-Id: <1436351693-2349-4-git-send-email-mukawa@igel.co.jp> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1436351693-2349-1-git-send-email-mukawa@igel.co.jp> References: <1435652668-3380-12-git-send-email-mukawa@igel.co.jp> <1436351693-2349-1-git-send-email-mukawa@igel.co.jp> Subject: [dpdk-dev] [PATCH v9 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: Wed, 08 Jul 2015 10:35:42 -0000 From: "Tetsuya.Mukawa" This patch fixes following memory leaks. - When open() is failed, uio_res and fds won't be freed in pci_uio_map_resource(). - When pci_map_resource() is failed but path is allocated correctly, path and fds won't be freed in pci_uio_map_recource(). Also, some mapped resources should be freed. - 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 Acked-by: Bernard Iremonger --- lib/librte_eal/bsdapp/eal/eal_pci.c | 18 ++++++--- lib/librte_eal/linuxapp/eal/eal_pci_uio.c | 63 ++++++++++++++++++++----------- 2 files changed, 53 insertions(+), 28 deletions(-) diff --git a/lib/librte_eal/bsdapp/eal/eal_pci.c b/lib/librte_eal/bsdapp/eal/eal_pci.c index a63d450..da17685 100644 --- a/lib/librte_eal/bsdapp/eal/eal_pci.c +++ b/lib/librte_eal/bsdapp/eal/eal_pci.c @@ -202,7 +202,7 @@ pci_uio_map_resource(struct rte_pci_device *dev) uint64_t offset; uint64_t pagesz; struct rte_pci_addr *loc = &dev->addr; - struct uio_resource *uio_res; + struct uio_resource *uio_res = NULL; struct uio_res_list *uio_res_list = RTE_TAILQ_CAST(rte_uio_tailq.head, uio_res_list); struct uio_map *maps; @@ -228,7 +228,7 @@ pci_uio_map_resource(struct rte_pci_device *dev) if (dev->intr_handle.fd < 0) { RTE_LOG(ERR, EAL, "Cannot open %s: %s\n", devname, strerror(errno)); - return -1; + goto error; } dev->intr_handle.type = RTE_INTR_HANDLE_UIO; @@ -236,7 +236,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 error; } snprintf(uio_res->path, sizeof(uio_res->path), "%s", devname); @@ -263,8 +263,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 error; } maps[j].addr = mapaddr; @@ -275,6 +274,15 @@ pci_uio_map_resource(struct rte_pci_device *dev) TAILQ_INSERT_TAIL(uio_res_list, uio_res, next); return 0; + +error: + rte_free(uio_res); + if (dev->intr_handle.fd >= 0) { + close(dev->intr_handle.fd); + dev->intr_handle.fd = -1; + dev->intr_handle.type = RTE_INTR_HANDLE_UNKNOWN; + } + return -1; } /* Scan one pci sysfs entry, and fill the devices list from it. */ diff --git a/lib/librte_eal/linuxapp/eal/eal_pci_uio.c b/lib/librte_eal/linuxapp/eal/eal_pci_uio.c index 37dc936..838b851 100644 --- a/lib/librte_eal/linuxapp/eal/eal_pci_uio.c +++ b/lib/librte_eal/linuxapp/eal/eal_pci_uio.c @@ -265,7 +265,7 @@ pci_get_uio_dev(struct rte_pci_device *dev, char *dstbuf, int pci_uio_map_resource(struct rte_pci_device *dev) { - int i, map_idx; + int i, map_idx = 0; char dirname[PATH_MAX]; char cfgname[PATH_MAX]; char devname[PATH_MAX]; /* contains the /dev/uioX */ @@ -273,7 +273,7 @@ pci_uio_map_resource(struct rte_pci_device *dev) int uio_num; uint64_t phaddr; struct rte_pci_addr *loc = &dev->addr; - struct mapped_pci_resource *uio_res; + struct mapped_pci_resource *uio_res = NULL; struct mapped_pci_res_list *uio_res_list = RTE_TAILQ_CAST(rte_uio_tailq.head, mapped_pci_res_list); struct pci_map *maps; @@ -300,7 +300,7 @@ pci_uio_map_resource(struct rte_pci_device *dev) if (dev->intr_handle.fd < 0) { RTE_LOG(ERR, EAL, "Cannot open %s: %s\n", devname, strerror(errno)); - return -1; + goto error; } snprintf(cfgname, sizeof(cfgname), @@ -309,7 +309,7 @@ pci_uio_map_resource(struct rte_pci_device *dev) if (dev->intr_handle.uio_cfg_fd < 0) { RTE_LOG(ERR, EAL, "Cannot open %s: %s\n", cfgname, strerror(errno)); - return -1; + goto error; } if (dev->kdrv == RTE_KDRV_IGB_UIO) @@ -320,7 +320,7 @@ pci_uio_map_resource(struct rte_pci_device *dev) /* set bus master that is not done by uio_pci_generic */ if (pci_uio_set_bus_master(dev->intr_handle.uio_cfg_fd)) { RTE_LOG(ERR, EAL, "Cannot set up bus mastering!\n"); - return -1; + goto error; } } @@ -329,7 +329,7 @@ pci_uio_map_resource(struct rte_pci_device *dev) if (uio_res == NULL) { RTE_LOG(ERR, EAL, "%s(): cannot store uio mmap details\n", __func__); - return -1; + goto error; } snprintf(uio_res->path, sizeof(uio_res->path), "%s", devname); @@ -337,9 +337,8 @@ pci_uio_map_resource(struct rte_pci_device *dev) /* Map all BARs */ maps = uio_res->maps; - for (i = 0, map_idx = 0; i != PCI_MAX_RESOURCE; i++) { + for (i = 0; i != PCI_MAX_RESOURCE; i++) { int fd; - int fail = 0; /* skip empty BAR */ phaddr = dev->mem_resource[i].phys_addr; @@ -353,6 +352,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 error; + /* * open resource file, to mmap it */ @@ -360,7 +364,8 @@ 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; + rte_free(maps[map_idx].path); + goto error; } /* try mapping somewhere close to the end of hugepages */ @@ -369,23 +374,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 error; + } 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; @@ -400,6 +397,24 @@ pci_uio_map_resource(struct rte_pci_device *dev) TAILQ_INSERT_TAIL(uio_res_list, uio_res, next); return 0; + +error: + for (i = 0; i < map_idx; i++) { + pci_unmap_resource(uio_res->maps[i].addr, + (size_t)uio_res->maps[i].size); + rte_free(maps[i].path); + } + rte_free(uio_res); + if (dev->intr_handle.uio_cfg_fd >= 0) { + close(dev->intr_handle.uio_cfg_fd); + dev->intr_handle.uio_cfg_fd = -1; + } + if (dev->intr_handle.fd >= 0) { + close(dev->intr_handle.fd); + dev->intr_handle.fd = -1; + dev->intr_handle.type = RTE_INTR_HANDLE_UNKNOWN; + } + return -1; } #ifdef RTE_LIBRTE_EAL_HOTPLUG @@ -411,9 +426,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 * -- 2.1.4