eal: deduplicate memory initialization

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

diff --git a/lib/librte_eal/linuxapp/eal/eal_memory.c b/lib/librte_eal/linuxapp/eal/eal_memory.c
index 341fefb..ac2745e 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/eal_memory.c
+++ b/lib/librte_eal/linuxapp/eal/eal_memory.c
@@ -111,8 +111,28 @@
 
 static uint64_t baseaddr_offset;
 
+static unsigned proc_pagemap_readable;
+
 #define RANDOMIZE_VA_SPACE_FILE "/proc/sys/kernel/randomize_va_space"
 
+static void
+test_proc_pagemap_readable(void)
+{
+       int fd = open("/proc/self/pagemap", O_RDONLY);
+
+       if (fd < 0) {
+               RTE_LOG(ERR, EAL,
+                       "Cannot open /proc/self/pagemap: %s. "
+                       "virt2phys address translation will not work\n",
+                       strerror(errno));
+               return;
+       }
+
+       /* Is readable */
+       close(fd);
+       proc_pagemap_readable = 1;
+}
+
 /* Lock page in physical memory and prevent from swapping. */
 int
 rte_mem_lock_page(const void *virt)
@@ -135,6 +155,10 @@ rte_mem_virt2phy(const void *virtaddr)
        int page_size;
        off_t offset;
 
+       /* Cannot parse /proc/self/pagemap, no need to log errors everywhere */
+       if (!proc_pagemap_readable)
+               return RTE_BAD_PHYS_ADDR;
+
        /* standard page size */
        page_size = getpagesize();
 
@@ -239,7 +263,7 @@ get_virtual_area(size_t *size, size_t hugepage_sz)
        }
        else addr = NULL;
 
-       RTE_LOG(INFO, EAL, "Ask a virtual area of 0x%zx bytes\n", *size);
+       RTE_LOG(DEBUG, EAL, "Ask a virtual area of 0x%zx bytes\n", *size);
 
        fd = open("/dev/zero", O_RDONLY);
        if (fd < 0){
@@ -255,7 +279,8 @@ get_virtual_area(size_t *size, size_t hugepage_sz)
 
        if (addr == MAP_FAILED) {
                close(fd);
-               RTE_LOG(INFO, EAL, "Cannot get a virtual area\n");
+               RTE_LOG(ERR, EAL, "Cannot get a virtual area: %s\n",
+                       strerror(errno));
                return NULL;
        }
 
@@ -268,7 +293,7 @@ get_virtual_area(size_t *size, size_t hugepage_sz)
        aligned_addr &= (~(hugepage_sz - 1));
        addr = (void *)(aligned_addr);
 
-       RTE_LOG(INFO, EAL, "Virtual area found at %p (size = 0x%zx)\n",
+       RTE_LOG(DEBUG, EAL, "Virtual area found at %p (size = 0x%zx)\n",
                addr, *size);
 
        /* increment offset */
@@ -604,7 +629,7 @@ find_numasocket(struct hugepage_file *hugepg_tbl, struct hugepage_info *hpi)
 
        f = fopen("/proc/self/numa_maps", "r");
        if (f == NULL) {
-               RTE_LOG(INFO, EAL, "cannot open /proc/self/numa_maps,"
+               RTE_LOG(NOTICE, EAL, "cannot open /proc/self/numa_maps,"
                                " consider that all memory is in socket_id 0\n");
                return 0;
        }
@@ -1001,7 +1026,7 @@ calc_num_pages_per_socket(uint64_t * memory,
                                        0x100000);
                        available = requested -
                                        ((unsigned) (memory[socket] / 0x100000));
-                       RTE_LOG(INFO, EAL, "Not enough memory available on socket %u! "
+                       RTE_LOG(ERR, EAL, "Not enough memory available on socket %u! "
                                        "Requested: %uMB, available: %uMB\n", socket,
                                        requested, available);
                        return -1;
@@ -1012,7 +1037,7 @@ calc_num_pages_per_socket(uint64_t * memory,
        if (total_mem > 0) {
                requested = (unsigned) (internal_config.memory / 0x100000);
                available = requested - (unsigned) (total_mem / 0x100000);
-               RTE_LOG(INFO, EAL, "Not enough memory available! Requested: %uMB,"
+               RTE_LOG(ERR, EAL, "Not enough memory available! Requested: %uMB,"
                                " available: %uMB\n", requested, available);
                return -1;
        }
@@ -1030,7 +1055,7 @@ calc_num_pages_per_socket(uint64_t * memory,
  *  6. unmap the first mapping
  *  7. fill memsegs in configuration with contiguous zones
  */
-static int
+int
 rte_eal_hugepage_init(void)
 {
        struct rte_mem_config *mcfg;
@@ -1047,6 +1072,8 @@ rte_eal_hugepage_init(void)
        int new_pages_count[MAX_HUGEPAGE_SIZES];
 #endif
 
+       test_proc_pagemap_readable();
+
        memset(used_hp, 0, sizeof(used_hp));
 
        /* get pointer to global configuration */
@@ -1063,8 +1090,9 @@ rte_eal_hugepage_init(void)
                }
                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 = SOCKET_ID_ANY;
+               mcfg->memseg[0].socket_id = 0;
                return 0;
        }
 
@@ -1079,7 +1107,6 @@ rte_eal_hugepage_init(void)
 #endif
        }
 
-
        /* calculate total number of hugepages available. at this point we haven't
         * yet started sorting them so they all are on socket 0 */
        for (i = 0; i < (int) internal_config.num_hugepage_sizes; i++) {
@@ -1220,13 +1247,13 @@ rte_eal_hugepage_init(void)
        for (i = 0; i < (int) internal_config.num_hugepage_sizes; i++) {
                for (j = 0; j < RTE_MAX_NUMA_NODES; j++) {
                        if (used_hp[i].num_pages[j] > 0) {
-                               RTE_LOG(INFO, EAL,
-                                               "Requesting %u pages of size %uMB"
-                                               " from socket %i\n",
-                                               used_hp[i].num_pages[j],
-                                               (unsigned)
-                                                       (used_hp[i].hugepage_sz / 0x100000),
-                                               j);
+                               RTE_LOG(DEBUG, EAL,
+                                       "Requesting %u pages of size %uMB"
+                                       " from socket %i\n",
+                                       used_hp[i].num_pages[j],
+                                       (unsigned)
+                                       (used_hp[i].hugepage_sz / 0x100000),
+                                       j);
                        }
                }
        }
@@ -1370,7 +1397,7 @@ getFileSize(int fd)
  * configuration and finds the hugepages which form that segment, mapping them
  * in order to form a contiguous block in the virtual memory space
  */
-static int
+int
 rte_eal_hugepage_attach(void)
 {
        const struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
@@ -1387,6 +1414,8 @@ rte_eal_hugepage_attach(void)
                                "into secondary processes\n");
        }
 
+       test_proc_pagemap_readable();
+
        if (internal_config.xen_dom0_support) {
 #ifdef RTE_LIBRTE_XEN_DOM0
                if (rte_xen_dom0_memory_attach() < 0) {
@@ -1530,36 +1559,3 @@ error:
                close(fd_hugepage);
        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_LOG(INFO, EAL, "Setting up memory...\n");
-       const int retval = rte_eal_process_type() == RTE_PROC_PRIMARY ?
-                       rte_eal_hugepage_init() :
-                       rte_eal_hugepage_attach();
-       if (retval < 0)
-               return -1;
-
-       if (internal_config.no_shconf == 0 && rte_eal_memdevice_init() < 0)
-               return -1;
-
-       return 0;
-}