From: Tetsuya Mukawa <mukawa@igel.co.jp>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH v2 09/15] eal: Add pci_uio_map_uio_resource_by_index()
Date: Thu, 12 Mar 2015 19:17:48 +0900 [thread overview]
Message-ID: <1426155474-1596-10-git-send-email-mukawa@igel.co.jp> (raw)
In-Reply-To: <1426155474-1596-1-git-send-email-mukawa@igel.co.jp>
This patch adds a new function called pci_uio_map_resource_by_index().
The function hides how to map uio resource in linuxapp and bsdapp.
With the function, pci_uio_map_resource() will be more abstracted.
Signed-off-by: Tetsuya Mukawa <mukawa@igel.co.jp>
---
lib/librte_eal/bsdapp/eal/eal_pci.c | 108 +++++++++++++++-----------
lib/librte_eal/linuxapp/eal/eal_pci_uio.c | 124 +++++++++++++++++-------------
2 files changed, 135 insertions(+), 97 deletions(-)
diff --git a/lib/librte_eal/bsdapp/eal/eal_pci.c b/lib/librte_eal/bsdapp/eal/eal_pci.c
index f88cd15..3e63835 100644
--- a/lib/librte_eal/bsdapp/eal/eal_pci.c
+++ b/lib/librte_eal/bsdapp/eal/eal_pci.c
@@ -245,20 +245,73 @@ pci_uio_alloc_uio_resource(struct rte_pci_device *dev,
return 0;
}
-/* map the PCI resource of a PCI device in virtual memory */
static int
-pci_uio_map_resource(struct rte_pci_device *dev)
+pci_uio_map_uio_resource_by_index(struct rte_pci_device *dev, int res_idx,
+ struct mapped_pci_resource *uio_res, int map_idx)
{
- int i, map_idx, ret;
+ int fd;
char *devname;
void *mapaddr;
- uint64_t phaddr;
uint64_t offset;
uint64_t pagesz;
+ struct pci_map *maps;
+
+ if ((dev == NULL) || (uio_res == NULL) || (uio_res->path == NULL))
+ return -1;
+
+ maps = uio_res->maps;
+ devname = uio_res->path;
+ pagesz = sysconf(_SC_PAGESIZE);
+
+ /* 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));
+ return -1;
+ }
+
+ /*
+ * 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 fail;
+ }
+
+ /* if matching map is found, then use it */
+ offset = res_idx * pagesz;
+ mapaddr = pci_map_resource(NULL, fd, (off_t)offset,
+ (size_t)dev->mem_resource[res_idx].len, 0);
+ close(fd);
+ if (mapaddr == NULL)
+ goto fail;
+
+ maps[map_idx].phaddr = dev->mem_resource[res_idx].phys_addr;
+ maps[map_idx].size = dev->mem_resource[res_idx].len;
+ maps[map_idx].addr = mapaddr;
+ maps[map_idx].offset = offset;
+ strcpy(maps[map_idx].path, devname);
+ dev->mem_resource[res_idx].addr = mapaddr;
+
+ return 0;
+
+fail:
+ rte_free(maps[map_idx].path);
+ return -1;
+}
+
+/* map the PCI resource of a PCI device in virtual memory */
+static int
+pci_uio_map_resource(struct rte_pci_device *dev)
+{
+ int i, map_idx, ret;
+ uint64_t phaddr;
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;
dev->intr_handle.fd = -1;
dev->intr_handle.type = RTE_INTR_HANDLE_UNKNOWN;
@@ -273,51 +326,18 @@ pci_uio_map_resource(struct rte_pci_device *dev)
return ret;
/* Map all BARs */
- pagesz = sysconf(_SC_PAGESIZE);
- devname = uio_res->path;
-
- maps = uio_res->maps;
for (i = 0, map_idx = 0; i != PCI_MAX_RESOURCE; i++) {
- int fd;
-
/* skip empty BAR */
phaddr = dev->mem_resource[i].phys_addr;
if (phaddr == 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 fail0;
- }
+ ret = pci_uio_map_uio_resource_by_index(dev, i,
+ uio_res, map_idx);
+ if (ret != 0)
+ goto fail;
- /* if matching map is found, then use it */
- offset = i * pagesz;
- mapaddr = pci_map_resource(NULL, fd, (off_t)offset,
- (size_t)dev->mem_resource[i].len, 0);
- close(fd);
- if (mapaddr == NULL)
- goto fail1;
-
- maps[map_idx].phaddr = dev->mem_resource[i].phys_addr;
- maps[map_idx].size = dev->mem_resource[i].len;
- maps[map_idx].addr = mapaddr;
- maps[map_idx].offset = offset;
- strcpy(maps[map_idx].path, devname);
map_idx++;
- dev->mem_resource[i].addr = mapaddr;
}
uio_res->nb_maps = map_idx;
@@ -326,9 +346,7 @@ pci_uio_map_resource(struct rte_pci_device *dev)
return 0;
-fail1:
- rte_free(maps[map_idx].path);
-fail0:
+fail:
rte_free(uio_res);
return -1;
}
diff --git a/lib/librte_eal/linuxapp/eal/eal_pci_uio.c b/lib/librte_eal/linuxapp/eal/eal_pci_uio.c
index 099c413..6fca796 100644
--- a/lib/librte_eal/linuxapp/eal/eal_pci_uio.c
+++ b/lib/librte_eal/linuxapp/eal/eal_pci_uio.c
@@ -327,19 +327,82 @@ pci_uio_alloc_uio_resource(struct rte_pci_device *dev,
return 0;
}
+static int
+pci_uio_map_uio_resource_by_index(struct rte_pci_device *dev, int res_idx,
+ struct mapped_pci_resource *uio_res, int map_idx)
+{
+ int fd;
+ char devname[PATH_MAX]; /* contains the /dev/uioX */
+ void *mapaddr;
+ struct rte_pci_addr *loc;
+ struct pci_map *maps;
+
+ if ((dev == NULL) || (uio_res == NULL) || (uio_res->path == NULL))
+ return -1;
+
+ loc = &dev->addr;
+ maps = uio_res->maps;
+
+ /* update devname for mmap */
+ snprintf(devname, sizeof(devname),
+ SYSFS_PCI_DEVICES "/" PCI_PRI_FMT "/resource%d",
+ loc->domain, loc->bus, loc->devid,
+ loc->function, res_idx);
+
+ /* 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));
+ return -1;
+ }
+
+ /*
+ * 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 fail;
+ }
+
+ /* try mapping somewhere close to the end of hugepages */
+ if (pci_map_addr == NULL)
+ pci_map_addr = pci_find_max_end_va();
+
+ mapaddr = pci_map_resource(pci_map_addr, fd, 0,
+ (size_t)dev->mem_resource[res_idx].len, 0);
+ close(fd);
+ if (mapaddr == MAP_FAILED)
+ goto fail;
+
+ pci_map_addr = RTE_PTR_ADD(mapaddr,
+ (size_t)dev->mem_resource[res_idx].len);
+
+ maps[map_idx].phaddr = dev->mem_resource[res_idx].phys_addr;
+ maps[map_idx].size = dev->mem_resource[res_idx].len;
+ maps[map_idx].addr = mapaddr;
+ maps[map_idx].offset = 0;
+ strcpy(maps[map_idx].path, devname);
+ dev->mem_resource[res_idx].addr = mapaddr;
+
+ return 0;
+
+fail:
+ rte_free(maps[map_idx].path);
+ return -1;
+}
+
/* map the PCI resource of a PCI device in virtual memory */
int
pci_uio_map_resource(struct rte_pci_device *dev)
{
int i, map_idx, ret;
- char devname[PATH_MAX]; /* contains the /dev/uioX */
- void *mapaddr;
uint64_t phaddr;
- struct rte_pci_addr *loc = &dev->addr;
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;
dev->intr_handle.fd = -1;
dev->intr_handle.uio_cfg_fd = -1;
@@ -355,59 +418,18 @@ pci_uio_map_resource(struct rte_pci_device *dev)
return ret;
/* Map all BARs */
- maps = uio_res->maps;
for (i = 0, map_idx = 0; i != PCI_MAX_RESOURCE; i++) {
- int fd;
-
/* skip empty BAR */
phaddr = dev->mem_resource[i].phys_addr;
if (phaddr == 0)
continue;
- /* update devname for mmap */
- snprintf(devname, sizeof(devname),
- SYSFS_PCI_DEVICES "/" PCI_PRI_FMT "/resource%d",
- 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) {
- 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 fail0;
- }
-
- /* try mapping somewhere close to the end of hugepages */
- if (pci_map_addr == NULL)
- pci_map_addr = pci_find_max_end_va();
-
- mapaddr = pci_map_resource(pci_map_addr, fd, 0,
- (size_t)dev->mem_resource[i].len, 0);
- close(fd);
- if (mapaddr == MAP_FAILED)
- goto fail1;
+ ret = pci_uio_map_uio_resource_by_index(dev, i,
+ uio_res, map_idx);
+ if (ret != 0)
+ goto fail;
- pci_map_addr = RTE_PTR_ADD(mapaddr,
- (size_t)dev->mem_resource[i].len);
-
- maps[map_idx].phaddr = dev->mem_resource[i].phys_addr;
- maps[map_idx].size = dev->mem_resource[i].len;
- maps[map_idx].addr = mapaddr;
- maps[map_idx].offset = 0;
- strcpy(maps[map_idx].path, devname);
map_idx++;
- dev->mem_resource[i].addr = mapaddr;
}
uio_res->nb_maps = map_idx;
@@ -416,9 +438,7 @@ pci_uio_map_resource(struct rte_pci_device *dev)
return 0;
-fail1:
- rte_free(maps[map_idx].path);
-fail0:
+fail:
rte_free(uio_res);
return -1;
}
--
1.9.1
next prev parent reply other threads:[~2015-03-12 10: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
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 ` Tetsuya Mukawa [this message]
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=1426155474-1596-10-git-send-email-mukawa@igel.co.jp \
--to=mukawa@igel.co.jp \
--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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).