mem: expose function for physical address use

[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 736b3bf..65c96b0 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.
@@ -59,8 +59,8 @@ rte_mem_virt2phy(const void *virtaddr)
        return RTE_BAD_PHYS_ADDR;
 }
 
-static int
-rte_eal_contigmem_init(void)
+int
+rte_eal_hugepage_init(void)
 {
        struct rte_mem_config *mcfg;
        uint64_t total_mem = 0;
@@ -75,6 +75,7 @@ rte_eal_contigmem_init(void)
                addr = malloc(internal_config.memory);
                mcfg->memseg[0].phys_addr = (phys_addr_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;
@@ -93,14 +94,15 @@ rte_eal_contigmem_init(void)
                        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);
                                return -1;
                        }
 
-                       rte_snprintf(physaddr_str, sizeof(physaddr_str), "hw.contigmem"
+                       snprintf(physaddr_str, sizeof(physaddr_str), "hw.contigmem"
                                        ".physaddr.%d", j);
                        error = sysctlbyname(physaddr_str, &physaddr, &sysctl_size,
                                        NULL, 0);
@@ -130,8 +132,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 +169,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 +193,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;
 }