From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id 8EF325FEB for ; Wed, 25 Mar 2015 16:04:00 +0100 (CET) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga102.jf.intel.com with ESMTP; 25 Mar 2015 08:04:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,465,1422950400"; d="scan'208";a="472461791" Received: from irsmsx107.ger.corp.intel.com ([163.33.3.99]) by FMSMGA003.fm.intel.com with ESMTP; 25 Mar 2015 08:03:58 -0700 Received: from irsmsx108.ger.corp.intel.com ([169.254.11.49]) by IRSMSX107.ger.corp.intel.com ([163.33.3.99]) with mapi id 14.03.0224.002; Wed, 25 Mar 2015 15:03:58 +0000 From: "Iremonger, Bernard" To: Tetsuya Mukawa , "dev@dpdk.org" Thread-Topic: [PATCH v2 6/6] eal: Fix interface of pci_map_resource() Thread-Index: AQHQZemtvxmd4fz/fkG8xqJJomUgyZ0tTa4Q Date: Wed, 25 Mar 2015 15:03:57 +0000 Message-ID: <8CEF83825BEC744B83065625E567D7C204A02424@IRSMSX108.ger.corp.intel.com> References: <1426584645-28828-7-git-send-email-mukawa@igel.co.jp> <1427170717-13879-1-git-send-email-mukawa@igel.co.jp> <1427170717-13879-7-git-send-email-mukawa@igel.co.jp> In-Reply-To: <1427170717-13879-7-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 v2 6/6] eal: Fix interface of pci_map_resource() 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, 25 Mar 2015 15:04:01 -0000 > -----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; Tets= uya Mukawa > Subject: [PATCH v2 6/6] eal: Fix interface of pci_map_resource() >=20 > The function is implemented in both linuxapp and bsdapp, but interface is= different. The patch fixes > the function of bsdapp to do same as linuxapp. After applying it, file de= scriptor should be opened and > closed out of pci_map_resource(). > Also, remove redundant error messages from linuxapp. >=20 > Signed-off-by: Tetsuya Mukawa > --- > lib/librte_eal/bsdapp/eal/eal_pci.c | 111 ++++++++++++++++++------= ------ > lib/librte_eal/linuxapp/eal/eal_pci_uio.c | 21 +++--- > 2 files changed, 77 insertions(+), 55 deletions(-) >=20 > diff --git a/lib/librte_eal/bsdapp/eal/eal_pci.c b/lib/librte_eal/bsdapp/= eal/eal_pci.c > index 08b91b4..d83916b 100644 > --- a/lib/librte_eal/bsdapp/eal/eal_pci.c > +++ b/lib/librte_eal/bsdapp/eal/eal_pci.c > @@ -100,7 +100,7 @@ struct mapped_pci_resource { >=20 > struct rte_pci_addr pci_addr; > char path[PATH_MAX]; > - size_t nb_maps; > + int nb_maps; > struct pci_map maps[PCI_MAX_RESOURCE]; }; >=20 > @@ -122,47 +122,30 @@ pci_unbind_kernel_driver(struct rte_pci_device *dev= __rte_unused) >=20 > /* map a particular resource from a file */ static void * -pci_map_reso= urce(void *requested_addr, > const char *devname, off_t offset, > - size_t size) > +pci_map_resource(void *requested_addr, int fd, off_t offset, size_t size= , > + int additional_flags) > { > - int fd; > void *mapaddr; >=20 > - /* > - * open devname, to mmap it > - */ > - fd =3D open(devname, O_RDWR); > - if (fd < 0) { > - RTE_LOG(ERR, EAL, "Cannot open %s: %s\n", > - devname, strerror(errno)); > - goto fail; > - } > - > /* Map the PCI memory resource of device */ > mapaddr =3D mmap(requested_addr, size, PROT_READ | PROT_WRITE, > - MAP_SHARED, fd, offset); > - close(fd); > - if (mapaddr =3D=3D MAP_FAILED || > - (requested_addr !=3D NULL && mapaddr !=3D requested_addr)) { > - RTE_LOG(ERR, EAL, "%s(): cannot mmap(%s(%d), %p, 0x%lx, 0x%lx):" > - " %s (%p)\n", __func__, devname, fd, requested_addr, > + MAP_SHARED | additional_flags, fd, offset); > + if (mapaddr =3D=3D MAP_FAILED) { > + RTE_LOG(ERR, EAL, > + "%s(): cannot mmap(%d, %p, 0x%lx, 0x%lx): %s (%p)\n", > + __func__, fd, requested_addr, > (unsigned long)size, (unsigned long)offset, > strerror(errno), mapaddr); > - goto fail; > - } > - > - RTE_LOG(DEBUG, EAL, " PCI memory mapped at %p\n", mapaddr); > + } else > + RTE_LOG(DEBUG, EAL, " PCI memory mapped at %p\n", mapaddr); >=20 > return mapaddr; > - > -fail: > - return NULL; > } >=20 > static int > pci_uio_map_secondary(struct rte_pci_device *dev) { > - size_t i; > + int i, fd; > struct mapped_pci_resource *uio_res; > struct mapped_pci_res_list *uio_res_list =3D > RTE_TAILQ_CAST(rte_uio_tailq.head, mapped_pci_res_list); @@ -170,19 > +153,34 @@ pci_uio_map_secondary(struct rte_pci_device *dev) > TAILQ_FOREACH(uio_res, uio_res_list, next) { >=20 > /* skip this element if it doesn't match our PCI address */ > - if (memcmp(&uio_res->pci_addr, &dev->addr, sizeof(dev->addr))) > + if (rte_eal_compare_pci_addr(&uio_res->pci_addr, &dev->addr)) > continue; >=20 > for (i =3D 0; i !=3D uio_res->nb_maps; i++) { > - if (pci_map_resource(uio_res->maps[i].addr, > - uio_res->path, > - (off_t)uio_res->maps[i].offset, > - (size_t)uio_res->maps[i].size) > - !=3D uio_res->maps[i].addr) { > + /* > + * open devname, to mmap it > + */ > + fd =3D open(uio_res->maps[i].path, O_RDWR); > + if (fd < 0) { > + RTE_LOG(ERR, EAL, "Cannot open %s: %s\n", > + uio_res->maps[i].path, strerror(errno)); > + return -1; > + } > + > + void *mapaddr =3D pci_map_resource(uio_res->maps[i].addr, > + fd, (off_t)uio_res->maps[i].offset, > + (size_t)uio_res->maps[i].size, 0); > + if (mapaddr !=3D uio_res->maps[i].addr) { > RTE_LOG(ERR, EAL, > - "Cannot mmap device resource\n"); > + "Cannot mmap device resource " > + "file %s to address: %p\n", > + uio_res->maps[i].path, > + uio_res->maps[i].addr); > + close(fd); > return -1; > } > + /* fd is not needed in slave process, close it */ > + close(fd); > } > return 0; > } > @@ -248,24 +246,43 @@ pci_uio_map_resource(struct rte_pci_device *dev) >=20 > maps =3D uio_res->maps; > for (i =3D 0, map_idx =3D 0; i !=3D PCI_MAX_RESOURCE; i++) { > + int fd; >=20 > /* skip empty BAR */ > if ((phaddr =3D dev->mem_resource[i].phys_addr) =3D=3D 0) > continue; >=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) { > + RTE_LOG(ERR, EAL, "Cannot allocate memory for " > + "path: %s\n", strerror(errno)); > + goto fail0; > + } > + > + /* > + * open resource file, to mmap it > + */ > + fd =3D open(devname, O_RDWR); > + if (fd < 0) { > + RTE_LOG(ERR, EAL, "Cannot open %s: %s\n", > + devname, strerror(errno)); > + goto fail1; > + } > + > /* if matching map is found, then use it */ > offset =3D i * pagesz; > - maps[map_idx].offset =3D offset; > + mapaddr =3D pci_map_resource(NULL, fd, (off_t)offset, > + (size_t)dev->mem_resource[i].len, 0); > + close(fd); > + if (mapaddr =3D=3D MAP_FAILED) > + goto fail1; > + > maps[map_idx].phaddr =3D dev->mem_resource[i].phys_addr; > maps[map_idx].size =3D dev->mem_resource[i].len; > - mapaddr =3D pci_map_resource(NULL, devname, (off_t)offset, > - (size_t)maps[map_idx].size); > - if ((maps[map_idx].addr !=3D NULL) || (mapaddr =3D=3D NULL)) { > - rte_free(uio_res); > - return -1; > - } > - > maps[map_idx].addr =3D mapaddr; > + maps[map_idx].offset =3D offset; > + strcpy(maps[map_idx].path, devname); > map_idx++; > dev->mem_resource[i].addr =3D mapaddr; > } > @@ -275,6 +292,14 @@ pci_uio_map_resource(struct rte_pci_device *dev) > TAILQ_INSERT_TAIL(uio_res_list, uio_res, next); >=20 > return 0; > + > +fail1: > + rte_free(maps[map_idx].path); > +fail0: > + for (i =3D 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 =3D 0; i <=3D map_idx; i++)=20 Regards, Bernard. > + rte_free(maps[i].path); > + rte_free(uio_res); > + 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 0128cec..1f94d3a 100644 > --- a/lib/librte_eal/linuxapp/eal/eal_pci_uio.c > +++ b/lib/librte_eal/linuxapp/eal/eal_pci_uio.c > @@ -116,17 +116,11 @@ pci_uio_map_secondary(struct rte_pci_device *dev) > fd, (off_t)uio_res->maps[i].offset, > (size_t)uio_res->maps[i].size, 0); > if (mapaddr !=3D uio_res->maps[i].addr) { > - if (mapaddr =3D=3D MAP_FAILED) > - RTE_LOG(ERR, EAL, > - "Cannot mmap device resource file %s: %s\n", > - uio_res->maps[i].path, > - strerror(errno)); > - else > - RTE_LOG(ERR, EAL, > - "Cannot mmap device resource file %s to > address: %p\n", > - uio_res->maps[i].path, > - uio_res->maps[i].addr); > - > + RTE_LOG(ERR, EAL, > + "Cannot mmap device resource " > + "file %s to address: %p\n", > + uio_res->maps[i].path, > + uio_res->maps[i].addr); > close(fd); > return -1; > } > @@ -348,8 +342,11 @@ pci_uio_map_resource(struct rte_pci_device *dev) >=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) > + if (maps[map_idx].path =3D=3D NULL) { > + RTE_LOG(ERR, EAL, "Cannot allocate memory for " > + "path: %s\n", strerror(errno)); > goto fail0; > + } >=20 > /* > * open resource file, to mmap it > -- > 1.9.1