From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 83A375A53 for ; Mon, 15 Jun 2015 16:29:42 +0200 (CEST) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga101.fm.intel.com with ESMTP; 15 Jun 2015 07:29:40 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,618,1427785200"; d="scan'208";a="746984867" Received: from irsmsx101.ger.corp.intel.com ([163.33.3.153]) by orsmga002.jf.intel.com with ESMTP; 15 Jun 2015 07:29:40 -0700 Received: from irsmsx108.ger.corp.intel.com ([169.254.11.59]) by IRSMSX101.ger.corp.intel.com ([169.254.1.217]) with mapi id 14.03.0224.002; Mon, 15 Jun 2015 15:29:39 +0100 From: "Iremonger, Bernard" To: Tetsuya Mukawa , "dev@dpdk.org" Thread-Topic: [PATCH v4 3/5] eal: Fix memory leaks and needless increment of pci_map_addr Thread-Index: AQHQkfh9uXCyrRoLjkqPl39L4QWo7p2tytcA Date: Mon, 15 Jun 2015 14:29:38 +0000 Message-ID: <8CEF83825BEC744B83065625E567D7C204A2EE67@IRSMSX108.ger.corp.intel.com> References: <1432014898-3543-1-git-send-email-mukawa@igel.co.jp> <1432014898-3543-4-git-send-email-mukawa@igel.co.jp> In-Reply-To: <1432014898-3543-4-git-send-email-mukawa@igel.co.jp> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [163.33.239.180] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH v4 3/5] 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: Mon, 15 Jun 2015 14:29:43 -0000 > -----Original Message----- > From: Tetsuya Mukawa [mailto:mukawa@igel.co.jp] > Sent: Tuesday, May 19, 2015 6:55 AM > To: dev@dpdk.org > Cc: Iremonger, Bernard; Tetsuya Mukawa > Subject: [PATCH v4 3/5] eal: Fix memory leaks and needless increment of > pci_map_addr >=20 > 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(). > - When pci_uio_unmap() is called, path should be freed. >=20 > 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. >=20 > Signed-off-by: Tetsuya Mukawa > --- > lib/librte_eal/bsdapp/eal/eal_pci.c | 14 +++++++-- > lib/librte_eal/linuxapp/eal/eal_pci_uio.c | 51 ++++++++++++++++++++-----= - > ----- > 2 files changed, 44 insertions(+), 21 deletions(-) >=20 > 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 =3D rte_zmalloc("UIO_RES", sizeof (*uio_res), 0)) =3D=3D N= ULL) > { > RTE_LOG(ERR, EAL, > "%s(): cannot store uio mmap details\n", __func__); > - return -1; > + goto close_fd; > } >=20 > snprintf(uio_res->path, sizeof(uio_res->path), "%s", devname); @@ > -262,8 +262,7 @@ pci_uio_map_resource(struct rte_pci_device *dev) > (mapaddr =3D pci_map_resource(NULL, devname, > (off_t)offset, > (size_t)maps[j].size) > ) =3D=3D NULL) { > - rte_free(uio_res); > - return -1; > + goto free_uio_res; > } >=20 > maps[j].addr =3D mapaddr; > @@ -274,6 +273,15 @@ pci_uio_map_resource(struct rte_pci_device *dev) > TAILQ_INSERT_TAIL(uio_res_list, uio_res, next); >=20 > return 0; > + > +free_uio_res: > + rte_free(uio_res); > +close_fd: > + close(dev->intr_handle.fd); > + dev->intr_handle.fd =3D -1; > + dev->intr_handle.type =3D RTE_INTR_HANDLE_UNKNOWN; > + > + return -1; > } >=20 > /* 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 34316b6..2dd83d3 100644 > --- a/lib/librte_eal/linuxapp/eal/eal_pci_uio.c > +++ b/lib/librte_eal/linuxapp/eal/eal_pci_uio.c > @@ -308,7 +308,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 close_fd; > } >=20 > if (dev->kdrv =3D=3D RTE_KDRV_IGB_UIO) > @@ -328,7 +328,7 @@ pci_uio_map_resource(struct rte_pci_device *dev) > if (uio_res =3D=3D NULL) { > RTE_LOG(ERR, EAL, > "%s(): cannot store uio mmap details\n", __func__); > - return -1; > + goto close_fd; > } >=20 > snprintf(uio_res->path, sizeof(uio_res->path), "%s", devname); @@ > -338,7 +338,6 @@ pci_uio_map_resource(struct rte_pci_device *dev) > maps =3D uio_res->maps; > for (i =3D 0, map_idx =3D 0; i !=3D PCI_MAX_RESOURCE; i++) { > int fd; > - int fail =3D 0; >=20 > /* skip empty BAR */ > phaddr =3D dev->mem_resource[i].phys_addr; @@ -352,6 > +351,11 @@ pci_uio_map_resource(struct rte_pci_device *dev) > loc->domain, loc->bus, loc->devid, loc- > >function, > i); >=20 > + /* allocate memory to keep path */ > + maps[map_idx].path =3D rte_malloc(NULL, strlen(devname) + > 1, 0); > + if (maps[map_idx].path =3D=3D NULL) > + goto free_uio_res; > + > /* > * open resource file, to mmap it > */ > @@ -359,7 +363,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 free_uio_res; > } >=20 > /* try mapping somewhere close to the end of hugepages */ > @@ -368,23 +373,15 @@ pci_uio_map_resource(struct rte_pci_device *dev) >=20 > mapaddr =3D pci_map_resource(pci_map_addr, fd, 0, > (size_t)dev->mem_resource[i].len, 0); > - if (mapaddr =3D=3D MAP_FAILED) > - fail =3D 1; > + close(fd); > + if (mapaddr =3D=3D MAP_FAILED) { > + rte_free(maps[map_idx].path); > + goto free_uio_res; > + } >=20 > pci_map_addr =3D RTE_PTR_ADD(mapaddr, > (size_t)dev->mem_resource[i].len); >=20 > - maps[map_idx].path =3D rte_malloc(NULL, strlen(devname) + > 1, 0); > - if (maps[map_idx].path =3D=3D NULL) > - fail =3D 1; > - > - if (fail) { > - rte_free(uio_res); > - close(fd); > - return -1; > - } > - close(fd); > - > maps[map_idx].phaddr =3D dev->mem_resource[i].phys_addr; > maps[map_idx].size =3D dev->mem_resource[i].len; > maps[map_idx].addr =3D mapaddr; > @@ -399,6 +396,22 @@ pci_uio_map_resource(struct rte_pci_device *dev) > TAILQ_INSERT_TAIL(uio_res_list, uio_res, next); >=20 > return 0; > + > +free_uio_res: > + for (i =3D 0; i < map_idx; i++) > + rte_free(maps[i].path); > + rte_free(uio_res); > +close_fd: > + if (dev->intr_handle.uio_cfg_fd >=3D 0) { > + close(dev->intr_handle.uio_cfg_fd); > + dev->intr_handle.uio_cfg_fd =3D -1; > + } > + > + close(dev->intr_handle.fd); > + dev->intr_handle.fd =3D -1; > + dev->intr_handle.type =3D RTE_INTR_HANDLE_UNKNOWN; > + > + return -1; > } >=20 > #ifdef RTE_LIBRTE_EAL_HOTPLUG > @@ -410,9 +423,11 @@ pci_uio_unmap(struct mapped_pci_resource > *uio_res) > if (uio_res =3D=3D NULL) > return; >=20 > - for (i =3D 0; i !=3D uio_res->nb_maps; i++) > + for (i =3D 0; i !=3D 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); > + } > } >=20 > static struct mapped_pci_resource * > -- > 2.1.4 Hi Tetsuya, This patch fails to apply to the latest code. Applying: eal: Fix memory leaks and needless increment of pci_map_addr error: patch failed: lib/librte_eal/linuxapp/eal/eal_pci_uio.c:309 It looks like another rebase is needed. Regards, Bernard.