From: Tetsuya Mukawa <mukawa@igel.co.jp> To: "Iremonger, Bernard" <bernard.iremonger@intel.com>, "dev@dpdk.org" <dev@dpdk.org> Subject: Re: [dpdk-dev] [PATCH 6/6] eal: Fix interface of pci_map_resource() Date: Tue, 24 Mar 2015 13:18:31 +0900 Message-ID: <5510E597.8020607@igel.co.jp> (raw) In-Reply-To: <8CEF83825BEC744B83065625E567D7C2049F3E04@IRSMSX108.ger.corp.intel.com> On 2015/03/20 18:53, Iremonger, Bernard wrote: >> -----Original Message----- >> From: Tetsuya Mukawa [mailto:mukawa@igel.co.jp] >> Sent: Tuesday, March 17, 2015 9:31 AM >> To: dev@dpdk.org >> Cc: Iremonger, Bernard; Richardson, Bruce; Tetsuya Mukawa >> Subject: [PATCH 6/6] eal: Fix interface of pci_map_resource() >> >> 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 descriptor should be opened and >> closed out of pci_map_resource(). >> Also, remove redundant error messages from linuxapp. >> >> Signed-off-by: Tetsuya Mukawa <mukawa@igel.co.jp> >> --- >> lib/librte_eal/bsdapp/eal/eal_pci.c | 109 ++++++++++++++++++------------ >> lib/librte_eal/linuxapp/eal/eal_pci_uio.c | 21 +++--- >> 2 files changed, 75 insertions(+), 55 deletions(-) >> >> diff --git a/lib/librte_eal/bsdapp/eal/eal_pci.c b/lib/librte_eal/bsdapp/eal/eal_pci.c >> index 08b91b4..21a3d79 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 { >> >> struct rte_pci_addr pci_addr; >> char path[PATH_MAX]; >> - size_t nb_maps; >> + int nb_maps; >> struct pci_map maps[PCI_MAX_RESOURCE]; }; >> >> @@ -122,47 +122,30 @@ pci_unbind_kernel_driver(struct rte_pci_device *dev __rte_unused) >> >> /* map a particular resource from a file */ static void * -pci_map_resource(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; >> >> - /* >> - * open devname, to mmap it >> - */ >> - fd = 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 = mmap(requested_addr, size, PROT_READ | PROT_WRITE, >> - MAP_SHARED, fd, offset); >> - close(fd); >> - if (mapaddr == MAP_FAILED || >> - (requested_addr != NULL && mapaddr != 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 == 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; > Hi Tetsuya, > > Previously pci_map_resource() returned NULL when MAP_FAILED occurred. > It now returns MAP_FAILED. > Where pci_map_resource() is called it should now check for MAP_FAILED instead of NULL, or else the return value of NULL should be restored. > There is another comment below. Hi Bernard, I appreciate for your comment. Yes it should be. I will fix it. Regards, Tetsuya > > >> - } >> - >> - RTE_LOG(DEBUG, EAL, " PCI memory mapped at %p\n", mapaddr); >> + } else >> + RTE_LOG(DEBUG, EAL, " PCI memory mapped at %p\n", mapaddr); >> >> return mapaddr; >> - >> -fail: >> - return NULL; >> } >> >> 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 = >> 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) { >> >> /* 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; >> >> for (i = 0; i != 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) >> - != uio_res->maps[i].addr) { >> + /* >> + * open devname, to mmap it >> + */ >> + fd = 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 = 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 != 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) >> >> maps = uio_res->maps; >> for (i = 0, map_idx = 0; i != PCI_MAX_RESOURCE; i++) { >> + int fd; >> >> /* skip empty BAR */ >> if ((phaddr = dev->mem_resource[i].phys_addr) == 0) >> continue; >> >> + /* allocate memory to keep path */ >> + maps[map_idx].path = rte_malloc(NULL, strlen(devname) + 1, 0); >> + if (maps[map_idx].path == NULL) { >> + RTE_LOG(ERR, EAL, "Cannot allocate memory for " >> + "path: %s\n", strerror(errno)); >> + goto fail0; >> + } >> + >> + /* >> + * open resource file, to mmap it >> + */ >> + fd = 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 = i * pagesz; >> - maps[map_idx].offset = offset; >> + mapaddr = pci_map_resource(NULL, fd, (off_t)offset, >> + (size_t)dev->mem_resource[i].len, 0); >> + close(fd); >> + if (mapaddr == NULL) > The check here should be for MAP_FAILED instead of NULL. > > Regards, > Bernard. > > >> + goto fail1; >> + >> maps[map_idx].phaddr = dev->mem_resource[i].phys_addr; >> maps[map_idx].size = dev->mem_resource[i].len; >> - mapaddr = pci_map_resource(NULL, devname, (off_t)offset, >> - (size_t)maps[map_idx].size); >> - if ((maps[map_idx].addr != NULL) || (mapaddr == NULL)) { >> - rte_free(uio_res); >> - return -1; >> - } >> - >> maps[map_idx].addr = mapaddr; >> + maps[map_idx].offset = offset; >> + strcpy(maps[map_idx].path, devname); >> map_idx++; >> dev->mem_resource[i].addr = mapaddr; >> } >> @@ -275,6 +292,12 @@ 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: >> + rte_free(uio_res); >> + 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 5044884..9eeaebb 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 != uio_res->maps[i].addr) { >> - if (mapaddr == 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) >> >> /* allocate memory to keep path */ >> maps[map_idx].path = rte_malloc(NULL, strlen(devname) + 1, 0); >> - if (maps[map_idx].path == NULL) >> + if (maps[map_idx].path == NULL) { >> + RTE_LOG(ERR, EAL, "Cannot allocate memory for " >> + "path: %s\n", strerror(errno)); >> goto fail0; >> + } >> >> /* >> * open resource file, to mmap it >> -- >> 1.9.1
next prev parent reply other threads:[~2015-03-24 4:18 UTC|newest] Thread overview: 87+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-03-04 3:11 [dpdk-dev] [PATCH 1/3] BSD: Support Port Hotplug function Tetsuya Mukawa 2015-03-04 3:11 ` [dpdk-dev] [PATCH 2/3] eal, ethdev: Remove CONFIG_RTE_LIBRTE_EAL_HOTPLUG Tetsuya Mukawa 2015-03-04 3:11 ` [dpdk-dev] [PATCH 3/3] doc: Remove BSD limitation from hotplug section of programmer's guide Tetsuya Mukawa 2015-03-06 10:32 ` [dpdk-dev] [PATCH 1/3] BSD: Support Port Hotplug function Iremonger, Bernard 2015-03-09 2:23 ` Tetsuya Mukawa 2015-03-12 10:24 ` Tetsuya Mukawa 2015-03-12 10:17 ` [dpdk-dev] [PATCH v2 00/15] eal: Port Hotplug support for BSD Tetsuya Mukawa 2015-03-12 10:17 ` [dpdk-dev] [PATCH v2 01/15] eal: Fix cording style of eal_pci.c and eal_pci_uio.c Tetsuya Mukawa 2015-03-12 10:48 ` Bruce Richardson 2015-03-12 10:57 ` Qiu, Michael 2015-03-12 11:09 ` Bruce Richardson 2015-03-13 0:25 ` Tetsuya Mukawa 2015-03-12 10:17 ` [dpdk-dev] [PATCH v2 02/15] eal: Close file descriptor of uio configuration Tetsuya Mukawa 2015-03-13 13:54 ` Iremonger, Bernard 2015-03-12 10:17 ` [dpdk-dev] [PATCH v2 03/15] eal: Fix memory leak of pci_uio_map_resource() Tetsuya Mukawa 2015-03-13 14:04 ` Iremonger, Bernard 2015-03-17 9:30 ` [dpdk-dev] [PATCH 0/6] Clean up pci uio implementations Tetsuya Mukawa 2015-03-17 9:30 ` [dpdk-dev] [PATCH 1/6] eal: Fix cording style of eal_pci.c and eal_pci_uio.c Tetsuya Mukawa 2015-03-18 14:29 ` Bruce Richardson 2015-03-18 15:08 ` David Marchand 2015-03-17 9:30 ` [dpdk-dev] [PATCH 2/6] eal: Close file descriptor of uio configuration Tetsuya Mukawa 2015-03-18 15:19 ` David Marchand 2015-03-20 1:53 ` Tetsuya Mukawa 2015-03-19 16:04 ` Iremonger, Bernard 2015-03-20 1:54 ` Tetsuya Mukawa 2015-03-17 9:30 ` [dpdk-dev] [PATCH 3/6] eal: Fix memory leaks and needless incrementation of pci uio implementation Tetsuya Mukawa 2015-03-18 15:39 ` David Marchand 2015-03-20 1:53 ` Tetsuya Mukawa 2015-03-19 16:20 ` Iremonger, Bernard 2015-03-20 1:54 ` Tetsuya Mukawa 2015-03-17 9:30 ` [dpdk-dev] [PATCH 4/6] eal/bsdapp: Change names of pci related data structure Tetsuya Mukawa 2015-03-17 9:30 ` [dpdk-dev] [PATCH 5/6] eal: Use map_idx in pci_uio_map_resource() of bsdapp to work same as linuxapp Tetsuya Mukawa 2015-03-17 9:30 ` [dpdk-dev] [PATCH 6/6] eal: Fix interface of pci_map_resource() Tetsuya Mukawa 2015-03-20 9:53 ` Iremonger, Bernard 2015-03-24 4:18 ` Tetsuya Mukawa [this message] 2015-03-24 4:18 ` [dpdk-dev] [PATCH v2 0/6] Clean up pci uio implementations Tetsuya Mukawa 2015-03-24 4:18 ` [dpdk-dev] [PATCH v2 1/6] eal: Fix coding style of eal_pci.c and eal_pci_uio.c Tetsuya Mukawa 2015-03-24 4:18 ` [dpdk-dev] [PATCH v2 2/6] eal: Close file descriptor of uio configuration Tetsuya Mukawa 2015-03-24 18:33 ` Stephen Hemminger 2015-03-25 3:17 ` Tetsuya Mukawa 2015-03-25 5:07 ` Stephen Hemminger 2015-03-26 4:19 ` Tetsuya Mukawa 2015-03-26 10:03 ` Iremonger, Bernard 2015-03-27 6:01 ` Tetsuya Mukawa 2015-03-24 4:18 ` [dpdk-dev] [PATCH v2 3/6] eal: Fix memory leaks and needless increment of pci_map_addr Tetsuya Mukawa 2015-03-25 15:00 ` Iremonger, Bernard 2015-03-26 2:44 ` Tetsuya Mukawa 2015-03-24 4:18 ` [dpdk-dev] [PATCH v2 4/6] eal/bsdapp: Change names of pci related data structure Tetsuya Mukawa 2015-03-24 4:18 ` [dpdk-dev] [PATCH v2 5/6] eal: Use map_idx in pci_uio_map_resource() of bsdapp to work same as linuxapp Tetsuya Mukawa 2015-03-25 15:27 ` Iremonger, Bernard 2015-03-26 2:50 ` Tetsuya Mukawa 2015-03-26 10:41 ` Iremonger, Bernard 2015-03-27 8:19 ` Tetsuya Mukawa 2015-03-24 4:18 ` [dpdk-dev] [PATCH v2 6/6] eal: Fix interface of pci_map_resource() Tetsuya Mukawa 2015-03-25 15:03 ` Iremonger, Bernard 2015-03-27 8:39 ` [dpdk-dev] [PATCH v3 0/5] Clean up pci uio implementations Tetsuya Mukawa 2015-03-27 8:39 ` [dpdk-dev] [PATCH v3 1/5] eal: Fix coding style of eal_pci.c and eal_pci_uio.c Tetsuya Mukawa 2015-03-27 8:39 ` [dpdk-dev] [PATCH v3 2/5] eal: Close file descriptor of uio configuration Tetsuya Mukawa 2015-03-27 8:39 ` [dpdk-dev] [PATCH v3 3/5] eal: Fix memory leaks and needless increment of pci_map_addr Tetsuya Mukawa 2015-03-27 8:39 ` [dpdk-dev] [PATCH v3 4/5] eal/bsdapp: Change names of pci related data structure Tetsuya Mukawa 2015-03-27 8:39 ` [dpdk-dev] [PATCH v3 5/5] eal: Fix uio mapping differences between linuxapp and bsdapp Tetsuya Mukawa 2015-04-21 13:15 ` [dpdk-dev] [PATCH v3 0/5] Clean up pci uio implementations Iremonger, Bernard 2015-04-23 4:23 ` Tetsuya Mukawa 2015-04-23 8:12 ` Iremonger, Bernard 2015-04-23 9:48 ` Tetsuya Mukawa 2015-03-12 10:17 ` [dpdk-dev] [PATCH v2 04/15] eal: Fix needless incrementation of pci_map_addr Tetsuya Mukawa 2015-03-13 14:49 ` Iremonger, Bernard 2015-03-12 10:17 ` [dpdk-dev] [PATCH v2 05/15] eal/bsdapp: Change names of pci related data structure Tetsuya Mukawa 2015-03-12 10:17 ` [dpdk-dev] [PATCH v2 06/15] eal: Use map_idx in pci_uio_map_resource() of bsdapp to work same as linuxapp Tetsuya Mukawa 2015-03-12 10:17 ` [dpdk-dev] [PATCH v2 07/15] eal: Fix interface of pci_map_resource() of bsdapp Tetsuya Mukawa 2015-03-12 11:04 ` Bruce Richardson 2015-03-12 10:17 ` [dpdk-dev] [PATCH v2 08/15] eal: Add pci_uio_alloc_uio_resource() Tetsuya Mukawa 2015-03-12 10:17 ` [dpdk-dev] [PATCH v2 09/15] eal: Add pci_uio_map_uio_resource_by_index() Tetsuya Mukawa 2015-03-12 10:17 ` [dpdk-dev] [PATCH v2 10/15] eal: Consolidate pci_map and mapped_pci_resource of linuxapp and bsdapp Tetsuya Mukawa 2015-03-12 10:17 ` [dpdk-dev] [PATCH v2 11/15] eal: Consolidate rte_eal_pci_probe/close_one_driver() " Tetsuya Mukawa 2015-03-13 15:03 ` Iremonger, Bernard 2015-03-12 10:17 ` [dpdk-dev] [PATCH v2 12/15] eal: Consolidate pci_map/unmap_device() " Tetsuya Mukawa 2015-03-13 15:10 ` Iremonger, Bernard 2015-03-12 10:17 ` [dpdk-dev] [PATCH v2 13/15] eal: Consolidate pci_map/unmap_resource() " Tetsuya Mukawa 2015-03-13 15:23 ` Iremonger, Bernard 2015-03-12 10:17 ` [dpdk-dev] [PATCH v2 14/15] eal: Consolidate pci uio functions " Tetsuya Mukawa 2015-03-12 10:17 ` [dpdk-dev] [PATCH v2 15/15] eal: Enable Port Hotplug as default in Linux and BSD Tetsuya Mukawa 2015-03-13 15:47 ` Iremonger, Bernard 2015-03-17 8:08 ` Tetsuya Mukawa 2015-03-19 11:41 ` Iremonger, Bernard 2015-03-13 11:46 ` [dpdk-dev] [PATCH v2 00/15] eal: Port Hotplug support for BSD Iremonger, Bernard 2015-03-16 3:36 ` Tetsuya Mukawa
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=5510E597.8020607@igel.co.jp \ --to=mukawa@igel.co.jp \ --cc=bernard.iremonger@intel.com \ --cc=dev@dpdk.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
DPDK patches and discussions This inbox may be cloned and mirrored by anyone: git clone --mirror https://inbox.dpdk.org/dev/0 dev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 dev dev/ https://inbox.dpdk.org/dev \ dev@dpdk.org public-inbox-index dev Example config snippet for mirrors. Newsgroup available over NNTP: nntp://inbox.dpdk.org/inbox.dpdk.dev AGPL code for this site: git clone https://public-inbox.org/public-inbox.git