eal: fix vdev allocation on non-0 numa socket
authorMaxime Leroy <maxime.leroy@6wind.com>
Wed, 30 Apr 2014 13:15:08 +0000 (15:15 +0200)
committerThomas Monjalon <thomas.monjalon@6wind.com>
Wed, 30 Apr 2014 20:59:17 +0000 (22:59 +0200)
vdev ethdev can not be allocated on a numa socket that is not socket 0.
The reason comes from rte_eth_dev_allocate() which uses rte_socket_id() to
identify the socket on which vdev driver data should be allocated.
However, at this initialization step, rte_socket_id() always returns 0.

Looking at rte_socket_id(), it needs rte_lcore_id() which uses the per-core
global _lcore_id variable. This variable is initialised by
eal_thread_init_master.

So eal_thread_init_master should be called before rte_eal_vdev_init().

Signed-off-by: Maxime Leroy <maxime.leroy@6wind.com>
Acked-by: Thomas Monjalon <thomas.monjalon@6wind.com>
lib/librte_eal/linuxapp/eal/eal.c

index 04b2b32..39951fc 100644 (file)
@@ -1058,12 +1058,14 @@ rte_eal_init(int argc, char **argv)
                        RTE_LOG(WARNING, EAL, "%s\n", dlerror());
        }
 
-       if (rte_eal_vdev_init() < 0)
-               rte_panic("Cannot init virtual devices\n");
+       eal_thread_init_master(rte_config.master_lcore);
 
        RTE_LOG(DEBUG, EAL, "Master core %u is ready (tid=%x)\n",
                rte_config.master_lcore, (int)thread_id);
 
+       if (rte_eal_vdev_init() < 0)
+               rte_panic("Cannot init virtual devices\n");
+
        RTE_LCORE_FOREACH_SLAVE(i) {
 
                /*
@@ -1084,8 +1086,6 @@ rte_eal_init(int argc, char **argv)
                        rte_panic("Cannot create thread\n");
        }
 
-       eal_thread_init_master(rte_config.master_lcore);
-
        /*
         * Launch a dummy function on all slave lcores, so that master lcore
         * knows they are all ready when this function returns.