mem: replace memseg with memseg lists

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

diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c
index 77f6cb7..ffcbd71 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/eal.c
+++ b/lib/librte_eal/linuxapp/eal/eal.c
@@ -74,8 +74,8 @@ static int mem_cfg_fd = -1;
 static struct flock wr_lock = {
                .l_type = F_WRLCK,
                .l_whence = SEEK_SET,
-               .l_start = offsetof(struct rte_mem_config, memseg),
-               .l_len = sizeof(early_mem_config.memseg),
+               .l_start = offsetof(struct rte_mem_config, memsegs),
+               .l_len = sizeof(early_mem_config.memsegs),
 };
 
 /* Address of global and public configuration */
@@ -348,6 +348,7 @@ eal_usage(const char *prgname)
               "  --"OPT_BASE_VIRTADDR"     Base virtual address\n"
               "  --"OPT_CREATE_UIO_DEV"    Create /dev/uioX (usually done by hotplug)\n"
               "  --"OPT_VFIO_INTR"         Interrupt mode for VFIO (legacy|msi|msix)\n"
+              "  --"OPT_LEGACY_MEM"        Legacy memory mode (no dynamic allocation, contiguous segments)\n"
               "\n");
        /* Allow the application to print its usage message too if hook is set */
        if ( rte_application_usage_hook ) {
@@ -639,11 +640,14 @@ out:
 }
 
 static int
-check_mem(const struct rte_memseg *ms, void *arg)
+check_socket(const struct rte_memseg_list *msl, void *arg)
 {
-       int *socket = arg;
+       int *socket_id = arg;
 
-       return ms->socket_id == *socket;
+       if (msl->socket_id == *socket_id && msl->memseg_arr.count != 0)
+               return 1;
+
+       return 0;
 }
 
 static void
@@ -653,7 +657,7 @@ eal_check_mem_on_local_socket(void)
 
        socket_id = rte_lcore_to_socket_id(rte_config.master_lcore);
 
-       if (rte_memseg_walk(check_mem, &socket_id) == 0)
+       if (rte_memseg_list_walk(check_socket, &socket_id) == 0)
                RTE_LOG(WARNING, EAL, "WARNING: Master core has no memory on local socket!\n");
 }
 
@@ -767,6 +771,8 @@ rte_eal_init(int argc, char **argv)
                rte_atomic32_clear(&run_once);
                return -1;
        }
+       /* for now, always set legacy mem */
+       internal_config.legacy_mem = 1;
 
        if (eal_plugins_init() < 0) {
                rte_eal_init_alert("Cannot init plugins\n");