mem: replace memseg with memseg lists

[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 dae3c8b..ba44da0 100644 (file)
--- a/lib/librte_eal/bsdapp/eal/eal_hugepage_info.c
+++ b/lib/librte_eal/bsdapp/eal/eal_hugepage_info.c
@@ -1,34 +1,5 @@
-/*-
- *   BSD LICENSE
- * 
- *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
- *   All rights reserved.
- * 
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- * 
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- * 
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
  */
 #include <sys/types.h>
 #include <sys/sysctl.h>
@@ -70,17 +41,24 @@ int
 eal_hugepage_info_init(void)
 {
        size_t sysctl_size;
-       int buffer_size, num_buffers, fd, error;
+       int num_buffers, fd, error;
+       int64_t buffer_size;
        /* 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;
 
+       internal_config.num_hugepage_sizes = 1;
+
+       /* nothing more to be done for secondary */
+       if (rte_eal_process_type() == RTE_PROC_SECONDARY)
+               return 0;
+
        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;
        }
 
@@ -89,7 +67,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;
        }
 
@@ -101,33 +79,32 @@ eal_hugepage_info_init(void)
 
        if (buffer_size >= 1<<30)
                RTE_LOG(INFO, EAL, "Contigmem driver has %d buffers, each of size %dGB\n",
-                               num_buffers, buffer_size>>30);
+                               num_buffers, (int)(buffer_size>>30));
        else if (buffer_size >= 1<<20)
                RTE_LOG(INFO, EAL, "Contigmem driver has %d buffers, each of size %dMB\n",
-                               num_buffers, buffer_size>>20);
+                               num_buffers, (int)(buffer_size>>20));
        else
                RTE_LOG(INFO, EAL, "Contigmem driver has %d buffers, each of size %dKB\n",
-                               num_buffers, buffer_size>>10);
+                               num_buffers, (int)(buffer_size>>10));
 
-       internal_config.num_hugepage_sizes = 1;
        hpi->hugedir = CONTIGMEM_DEV;
        hpi->hugepage_sz = buffer_size;
        hpi->num_pages[0] = num_buffers;
        hpi->lock_descriptor = fd;
-       
+
        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));
 
-       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;
 }