[dpdk-dev] [PATCH] eal: map uio resources after hugepages when the base_virtaddr is configured.

[lxu]

---
 lib/librte_eal/linuxapp/eal/eal_pci_uio.c | 9 ++++++++-
 1 file changed, 8 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..bc7ed3a 100644
--- a/lib/librte_eal/linuxapp/eal/eal_pci_uio.c
+++ b/lib/librte_eal/linuxapp/eal/eal_pci_uio.c
@@ -289,6 +289,11 @@ pci_uio_map_resource(struct rte_pci_device *dev)
        struct rte_pci_addr *loc = &dev->addr;
        struct mapped_pci_resource *uio_res;
        struct pci_map *maps;
+       static void * requested_addr = NULL;
+       if (internal_config.base_virtaddr && NULL == requested_addr) {
+               requested_addr = (uint8_t *) internal_config.base_virtaddr 
+                       + internal_config.memory;
+       }

        dev->intr_handle.fd = -1;
        dev->intr_handle.type = RTE_INTR_HANDLE_UNKNOWN;
@@ -371,10 +376,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