When user configure?base_virtaddr, we should believe they can take care it. In my case, I always check /proc/xxxx/maps to find a huge free address space, such as 0x20 0000 0000, to map all the hugepages and uio resource.? ------------------------------------------------------------------????Burakov, Anatoly <anatoly.burakov at intel.com>?????2014?11?6?(???) 22:29?????? <liang.xu at cinfotech.cn>?dev at dpdk.org <dev at dpdk.org>????RE: [PATCH v2] eal: map uio resources after hugepages when the base_virtaddr is configured. Few nitpicks.
Static variables are always initialized to 0, so "= NULL" isn't necessary, a declaration will suffice. Also, we have a macro RTE_PTR_ADD to add numbers to pointers, I think it would be better to use those. Otherwise, looks fine to me. I still feel uneasy about depending on nothing being mapped directly after hugepages (perhaps we could do mmap(bar_size) before trying pci_map_resource, and increment requested_addr until we find a free spot?), but I imagine this case would be quite rare, so probably it's not worth the added kludge. Thanks, Anatoly -----Original Message----- From: lxu [mailto:liang...@cinfotech.cn] Sent: Thursday, November 6, 2014 2:12 PM To: dev at dpdk.org Cc: Burakov, Anatoly Subject: [PATCH v2] eal: map uio resources after hugepages when the base_virtaddr is configured. --- lib/librte_eal/linuxapp/eal/eal_pci_uio.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/lib/librte_eal/linuxapp/eal/eal_pci_uio.c b/lib/librte_eal/linuxapp/eal/eal_pci_uio.c index 7e62266..a591da3 100644 --- a/lib/librte_eal/linuxapp/eal/eal_pci_uio.c +++ b/lib/librte_eal/linuxapp/eal/eal_pci_uio.c @@ -273,6 +273,24 @@ pci_get_uio_dev(struct rte_pci_device *dev, char *dstbuf, return uio_num; } +static inline const struct rte_memseg * +get_physmem_last(void) +{ + const struct rte_memseg * seg = rte_eal_get_physmem_layout(); + const struct rte_memseg * last = seg; + unsigned i = 0; + + for (i=0; i<RTE_MAX_MEMSEG; i++, seg++) { + if (seg->addr == NULL) + break; + + if(seg->addr > last->addr) + last = seg; + + } + return last; +} + /* map the PCI resource of a PCI device in virtual memory */ int pci_uio_map_resource(struct rte_pci_device *dev) @@ -290,6 +308,13 @@ pci_uio_map_resource(struct rte_pci_device *dev) struct mapped_pci_resource *uio_res; struct pci_map *maps; + /* map uio resource into user required virtual address */ + static void * requested_addr = NULL; + if (internal_config.base_virtaddr && NULL == requested_addr) { + const struct rte_memseg * last = get_physmem_last(); + requested_addr = (void *)(last->addr_64 + last->len); + } + dev->intr_handle.fd = -1; dev->intr_handle.type = RTE_INTR_HANDLE_UNKNOWN; @@ -371,10 +396,12 @@ pci_uio_map_resource(struct rte_pci_device *dev) if (maps[j].addr != NULL) fail = 1; else { - mapaddr = pci_map_resource(NULL, fd, (off_t)offset, + mapaddr = pci_map_resource(requested_addr, fd, (off_t)offset, (size_t)maps[j].size); if (mapaddr == NULL) fail = 1; + else if (NULL != requested_addr) + requested_addr = (uint8_t *)mapaddr + maps[j].size; } if (fail) { -- 1.9.1
