eal: remove double space in init alert messages

[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 e59ac65..76536ba 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/eal.c
+++ b/lib/librte_eal/linuxapp/eal/eal.c
@@ -352,6 +352,24 @@ eal_proc_type_detect(void)
        return ptype;
 }
 
+/* copies data from internal config to shared config */
+static void
+eal_update_mem_config(void)
+{
+       struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
+       mcfg->legacy_mem = internal_config.legacy_mem;
+       mcfg->single_file_segments = internal_config.single_file_segments;
+}
+
+/* copies data from shared config to internal config */
+static void
+eal_update_internal_config(void)
+{
+       struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config;
+       internal_config.legacy_mem = mcfg->legacy_mem;
+       internal_config.single_file_segments = mcfg->single_file_segments;
+}
+
 /* Sets up rte_config structure with the pointer to shared memory config.*/
 static void
 rte_config_init(void)
@@ -361,11 +379,13 @@ rte_config_init(void)
        switch (rte_config.process_type){
        case RTE_PROC_PRIMARY:
                rte_eal_config_create();
+               eal_update_mem_config();
                break;
        case RTE_PROC_SECONDARY:
                rte_eal_config_attach();
                rte_eal_mcfg_wait_complete(rte_config.mem_config);
                rte_eal_config_reattach();
+               eal_update_internal_config();
                break;
        case RTE_PROC_AUTO:
        case RTE_PROC_INVALID:
@@ -725,6 +745,9 @@ check_socket(const struct rte_memseg_list *msl, void *arg)
 {
        int *socket_id = arg;
 
+       if (msl->external)
+               return 0;
+
        return *socket_id == msl->socket_id;
 }
 
@@ -835,7 +858,7 @@ rte_eal_init(int argc, char **argv)
        }
 
        if (eal_plugins_init() < 0) {
-               rte_eal_init_alert("Cannot init plugins\n");
+               rte_eal_init_alert("Cannot init plugins");
                rte_errno = EINVAL;
                rte_atomic32_clear(&run_once);
                return -1;
@@ -850,7 +873,7 @@ rte_eal_init(int argc, char **argv)
        rte_config_init();
 
        if (rte_eal_intr_init() < 0) {
-               rte_eal_init_alert("Cannot init interrupt-handling thread\n");
+               rte_eal_init_alert("Cannot init interrupt-handling thread");
                return -1;
        }
 
@@ -858,15 +881,21 @@ rte_eal_init(int argc, char **argv)
         * bus through mp channel in the secondary process before the bus scan.
         */
        if (rte_mp_channel_init() < 0) {
-               rte_eal_init_alert("failed to init mp channel\n");
+               rte_eal_init_alert("failed to init mp channel");
                if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
                        rte_errno = EFAULT;
                        return -1;
                }
        }
 
+       /* register multi-process action callbacks for hotplug */
+       if (rte_mp_dev_hotplug_init() < 0) {
+               rte_eal_init_alert("failed to register mp callback for hotplug");
+               return -1;
+       }
+
        if (rte_bus_scan()) {
-               rte_eal_init_alert("Cannot scan the buses for devices\n");
+               rte_eal_init_alert("Cannot scan the buses for devices");
                rte_errno = ENODEV;
                rte_atomic32_clear(&run_once);
                return -1;
@@ -924,7 +953,7 @@ rte_eal_init(int argc, char **argv)
 
 #ifdef VFIO_PRESENT
        if (rte_eal_vfio_setup() < 0) {
-               rte_eal_init_alert("Cannot init VFIO\n");
+               rte_eal_init_alert("Cannot init VFIO");
                rte_errno = EAGAIN;
                rte_atomic32_clear(&run_once);
                return -1;
@@ -935,13 +964,13 @@ rte_eal_init(int argc, char **argv)
         * initialize memzones first.
         */
        if (rte_eal_memzone_init() < 0) {
-               rte_eal_init_alert("Cannot init memzone\n");
+               rte_eal_init_alert("Cannot init memzone");
                rte_errno = ENODEV;
                return -1;
        }
 
        if (rte_eal_memory_init() < 0) {
-               rte_eal_init_alert("Cannot init memory\n");
+               rte_eal_init_alert("Cannot init memory");
                rte_errno = ENOMEM;
                return -1;
        }
@@ -950,25 +979,25 @@ rte_eal_init(int argc, char **argv)
        eal_hugedirs_unlock();
 
        if (rte_eal_malloc_heap_init() < 0) {
-               rte_eal_init_alert("Cannot init malloc heap\n");
+               rte_eal_init_alert("Cannot init malloc heap");
                rte_errno = ENODEV;
                return -1;
        }
 
        if (rte_eal_tailqs_init() < 0) {
-               rte_eal_init_alert("Cannot init tail queues for objects\n");
+               rte_eal_init_alert("Cannot init tail queues for objects");
                rte_errno = EFAULT;
                return -1;
        }
 
        if (rte_eal_alarm_init() < 0) {
-               rte_eal_init_alert("Cannot init interrupt-handling thread\n");
+               rte_eal_init_alert("Cannot init interrupt-handling thread");
                /* rte_eal_alarm_init sets rte_errno on failure. */
                return -1;
        }
 
        if (rte_eal_timer_init() < 0) {
-               rte_eal_init_alert("Cannot init HPET or TSC timers\n");
+               rte_eal_init_alert("Cannot init HPET or TSC timers");
                rte_errno = ENOTSUP;
                return -1;
        }
@@ -979,8 +1008,8 @@ rte_eal_init(int argc, char **argv)
 
        ret = eal_thread_dump_affinity(cpuset, sizeof(cpuset));
 
-       RTE_LOG(DEBUG, EAL, "Master lcore %u is ready (tid=%x;cpuset=[%s%s])\n",
-               rte_config.master_lcore, (int)thread_id, cpuset,
+       RTE_LOG(DEBUG, EAL, "Master lcore %u is ready (tid=%zx;cpuset=[%s%s])\n",
+               rte_config.master_lcore, (uintptr_t)thread_id, cpuset,
                ret == 0 ? "" : "...");
 
        RTE_LCORE_FOREACH_SLAVE(i) {
@@ -1022,14 +1051,14 @@ rte_eal_init(int argc, char **argv)
        /* initialize services so vdevs register service during bus_probe. */
        ret = rte_service_init();
        if (ret) {
-               rte_eal_init_alert("rte_service_init() failed\n");
+               rte_eal_init_alert("rte_service_init() failed");
                rte_errno = ENOEXEC;
                return -1;
        }
 
        /* Probe all the buses and devices/drivers on them */
        if (rte_bus_probe()) {
-               rte_eal_init_alert("Cannot probe devices\n");
+               rte_eal_init_alert("Cannot probe devices");
                rte_errno = ENOTSUP;
                return -1;
        }
@@ -1059,7 +1088,12 @@ mark_freeable(const struct rte_memseg_list *msl, const struct rte_memseg *ms,
                void *arg __rte_unused)
 {
        /* ms is const, so find this memseg */
-       struct rte_memseg *found = rte_mem_virt2memseg(ms->addr, msl);
+       struct rte_memseg *found;
+
+       if (msl->external)
+               return 0;
+
+       found = rte_mem_virt2memseg(ms->addr, msl);
 
        found->flags &= ~RTE_MEMSEG_FLAG_DO_NOT_FREE;