New upstream version 18.08

[deb_dpdk.git] / lib / librte_eal / bsdapp / eal / eal_hugepage_info.c

diff --git a/lib/librte_eal/bsdapp/eal/eal_hugepage_info.c b/lib/librte_eal/bsdapp/eal/eal_hugepage_info.c
index be2dbf0..1e8f5df 100644 (file)
--- a/lib/librte_eal/bsdapp/eal/eal_hugepage_info.c
+++ b/lib/librte_eal/bsdapp/eal/eal_hugepage_info.c
@@ -19,10 +19,10 @@
  * Used in this file to store the hugepage file map on disk
  */
 static void *
-create_shared_memory(const char *filename, const size_t mem_size)
+map_shared_memory(const char *filename, const size_t mem_size, int flags)
 {
        void *retval;
-       int fd = open(filename, O_CREAT | O_RDWR, 0666);
+       int fd = open(filename, flags, 0666);
        if (fd < 0)
                return NULL;
        if (ftruncate(fd, mem_size) < 0) {
@@ -34,6 +34,18 @@ create_shared_memory(const char *filename, const size_t mem_size)
        return retval;
 }
 
+static void *
+open_shared_memory(const char *filename, const size_t mem_size)
+{
+       return map_shared_memory(filename, mem_size, O_RDWR);
+}
+
+static void *
+create_shared_memory(const char *filename, const size_t mem_size)
+{
+       return map_shared_memory(filename, mem_size, O_RDWR | O_CREAT);
+}
+
 /*
  * No hugepage support on freebsd, but we dummy it, using contigmem driver
  */
@@ -46,13 +58,16 @@ eal_hugepage_info_init(void)
        /* re-use the linux "internal config" structure for our memory data */
        struct hugepage_info *hpi = &internal_config.hugepage_info[0];
        struct hugepage_info *tmp_hpi;
+       unsigned int i;
+
+       internal_config.num_hugepage_sizes = 1;
 
        sysctl_size = sizeof(num_buffers);
        error = sysctlbyname("hw.contigmem.num_buffers", &num_buffers,
                        &sysctl_size, NULL, 0);
 
        if (error != 0) {
-               RTE_LOG(ERR, EAL, "could not read sysctl hw.contigmem.num_buffers");
+               RTE_LOG(ERR, EAL, "could not read sysctl hw.contigmem.num_buffers\n");
                return -1;
        }
 
@@ -61,7 +76,7 @@ eal_hugepage_info_init(void)
                        &sysctl_size, NULL, 0);
 
        if (error != 0) {
-               RTE_LOG(ERR, EAL, "could not read sysctl hw.contigmem.buffer_size");
+               RTE_LOG(ERR, EAL, "could not read sysctl hw.contigmem.buffer_size\n");
                return -1;
        }
 
@@ -81,25 +96,61 @@ eal_hugepage_info_init(void)
                RTE_LOG(INFO, EAL, "Contigmem driver has %d buffers, each of size %dKB\n",
                                num_buffers, (int)(buffer_size>>10));
 
-       internal_config.num_hugepage_sizes = 1;
-       hpi->hugedir = CONTIGMEM_DEV;
+       strlcpy(hpi->hugedir, CONTIGMEM_DEV, sizeof(hpi->hugedir));
        hpi->hugepage_sz = buffer_size;
        hpi->num_pages[0] = num_buffers;
        hpi->lock_descriptor = fd;
 
+       /* for no shared files mode, do not create shared memory config */
+       if (internal_config.no_shconf)
+               return 0;
+
        tmp_hpi = create_shared_memory(eal_hugepage_info_path(),
-                                       sizeof(struct hugepage_info));
+                       sizeof(internal_config.hugepage_info));
        if (tmp_hpi == NULL ) {
                RTE_LOG(ERR, EAL, "Failed to create shared memory!\n");
                return -1;
        }
 
-       memcpy(tmp_hpi, hpi, sizeof(struct hugepage_info));
+       memcpy(tmp_hpi, hpi, sizeof(internal_config.hugepage_info));
+
+       /* we've copied file descriptors along with everything else, but they
+        * will be invalid in secondary process, so overwrite them
+        */
+       for (i = 0; i < RTE_DIM(internal_config.hugepage_info); i++) {
+               struct hugepage_info *tmp = &tmp_hpi[i];
+               tmp->lock_descriptor = -1;
+       }
 
-       if ( munmap(tmp_hpi, sizeof(struct hugepage_info)) < 0) {
+       if (munmap(tmp_hpi, sizeof(internal_config.hugepage_info)) < 0) {
                RTE_LOG(ERR, EAL, "Failed to unmap shared memory!\n");
                return -1;
        }
 
        return 0;
 }
+
+/* copy stuff from shared info into internal config */
+int
+eal_hugepage_info_read(void)
+{
+       struct hugepage_info *hpi = &internal_config.hugepage_info[0];
+       struct hugepage_info *tmp_hpi;
+
+       internal_config.num_hugepage_sizes = 1;
+
+       tmp_hpi = open_shared_memory(eal_hugepage_info_path(),
+                                 sizeof(internal_config.hugepage_info));
+       if (tmp_hpi == NULL) {
+               RTE_LOG(ERR, EAL, "Failed to open shared memory!\n");
+               return -1;
+       }
+
+       memcpy(hpi, tmp_hpi, sizeof(internal_config.hugepage_info));
+
+       if (munmap(tmp_hpi, sizeof(internal_config.hugepage_info)) < 0) {
+               RTE_LOG(ERR, EAL, "Failed to unmap shared memory!\n");
+               return -1;
+       }
+       return 0;
+}