mempool: rename address mapping function to IOVA

[dpdk.git] / lib / librte_eal / bsdapp / eal / eal_memory.c

diff --git a/lib/librte_eal/bsdapp/eal/eal_memory.c b/lib/librte_eal/bsdapp/eal/eal_memory.c
index 65ee87d..6ba0585 100644 (file)
--- a/lib/librte_eal/bsdapp/eal/eal_memory.c
+++ b/lib/librte_eal/bsdapp/eal/eal_memory.c
@@ -45,7 +45,7 @@
 #include "eal_internal_cfg.h"
 #include "eal_filesystem.h"
 
-#define PAGE_SIZE (sysconf(_SC_PAGESIZE))
+#define EAL_PAGE_SIZE (sysconf(_SC_PAGESIZE))
 
 /*
  * Get physical address of any mapped virtual address in the current process.
@@ -54,13 +54,18 @@ phys_addr_t
 rte_mem_virt2phy(const void *virtaddr)
 {
        /* XXX not implemented. This function is only used by
-        * rte_mempool_virt2phy() when hugepages are disabled. */
+        * rte_mempool_virt2iova() when hugepages are disabled. */
        (void)virtaddr;
-       return RTE_BAD_PHYS_ADDR;
+       return RTE_BAD_IOVA;
+}
+rte_iova_t
+rte_mem_virt2iova(const void *virtaddr)
+{
+       return rte_mem_virt2phy(virtaddr);
 }
 
-static int
-rte_eal_contigmem_init(void)
+int
+rte_eal_hugepage_init(void)
 {
        struct rte_mem_config *mcfg;
        uint64_t total_mem = 0;
@@ -73,8 +78,9 @@ rte_eal_contigmem_init(void)
        /* for debug purposes, hugetlbfs can be disabled */
        if (internal_config.no_hugetlbfs) {
                addr = malloc(internal_config.memory);
-               mcfg->memseg[0].phys_addr = (phys_addr_t)(uintptr_t)addr;
+               mcfg->memseg[0].iova = (rte_iova_t)(uintptr_t)addr;
                mcfg->memseg[0].addr = addr;
+               mcfg->memseg[0].hugepage_sz = RTE_PGSIZE_4K;
                mcfg->memseg[0].len = internal_config.memory;
                mcfg->memseg[0].socket_id = 0;
                return 0;
@@ -87,13 +93,14 @@ rte_eal_contigmem_init(void)
                hpi = &internal_config.hugepage_info[i];
                for (j = 0; j < hpi->num_pages[0]; j++) {
                        struct rte_memseg *seg;
-                       uint64_t physaddr;
+                       rte_iova_t physaddr;
                        int error;
                        size_t sysctl_size = sizeof(physaddr);
                        char physaddr_str[64];
 
                        addr = mmap(NULL, hpi->hugepage_sz, PROT_READ|PROT_WRITE,
-                                       MAP_SHARED, hpi->lock_descriptor, j * PAGE_SIZE);
+                                   MAP_SHARED, hpi->lock_descriptor,
+                                   j * EAL_PAGE_SIZE);
                        if (addr == MAP_FAILED) {
                                RTE_LOG(ERR, EAL, "Failed to mmap buffer %u from %s\n",
                                                j, hpi->hugedir);
@@ -112,7 +119,7 @@ rte_eal_contigmem_init(void)
 
                        seg = &mcfg->memseg[seg_idx++];
                        seg->addr = addr;
-                       seg->phys_addr = physaddr;
+                       seg->iova = physaddr;
                        seg->hugepage_sz = hpi->hugepage_sz;
                        seg->len = hpi->hugepage_sz;
                        seg->nchannel = mcfg->nchannel;
@@ -130,8 +137,8 @@ rte_eal_contigmem_init(void)
        return 0;
 }
 
-static int
-rte_eal_contigmem_attach(void)
+int
+rte_eal_hugepage_attach(void)
 {
        const struct hugepage_info *hpi;
        int fd_hugepage_info, fd_hugepage = -1;
@@ -167,7 +174,8 @@ rte_eal_contigmem_attach(void)
                struct rte_memseg *seg = &mcfg->memseg[i];
 
                addr = mmap(seg->addr, hpi->hugepage_sz, PROT_READ|PROT_WRITE,
-                               MAP_SHARED|MAP_FIXED, fd_hugepage, i * PAGE_SIZE);
+                           MAP_SHARED|MAP_FIXED, fd_hugepage,
+                           i * EAL_PAGE_SIZE);
                if (addr == MAP_FAILED || addr != seg->addr) {
                        RTE_LOG(ERR, EAL, "Failed to mmap buffer %u from %s\n",
                                i, hpi->hugedir);
@@ -190,35 +198,8 @@ error:
        return -1;
 }
 
-
-static int
-rte_eal_memdevice_init(void)
-{
-       struct rte_config *config;
-
-       if (rte_eal_process_type() == RTE_PROC_SECONDARY)
-               return 0;
-
-       config = rte_eal_get_configuration();
-       config->mem_config->nchannel = internal_config.force_nchannel;
-       config->mem_config->nrank = internal_config.force_nrank;
-
-       return 0;
-}
-
-/* init memory subsystem */
 int
-rte_eal_memory_init(void)
+rte_eal_using_phys_addrs(void)
 {
-       RTE_LOG(INFO, EAL, "Setting up physically contiguous memory...\n");
-       const int retval = rte_eal_process_type() == RTE_PROC_PRIMARY ?
-                       rte_eal_contigmem_init() :
-                       rte_eal_contigmem_attach();
-       if (retval < 0)
-               return -1;
-
-       if (internal_config.no_shconf == 0 && rte_eal_memdevice_init() < 0)
-               return -1;
-
        return 0;
 }