eal: fix dependency in multi-process detection

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

diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c
index dc27954..7b399bc 100644 (file)
--- a/lib/librte_eal/bsdapp/eal/eal.c
+++ b/lib/librte_eal/bsdapp/eal/eal.c
@@ -286,12 +286,17 @@ eal_proc_type_detect(void)
        enum rte_proc_type_t ptype = RTE_PROC_PRIMARY;
        const char *pathname = eal_runtime_config_path();
 
-       /* if we can open the file but not get a write-lock we are a secondary
-        * process. NOTE: if we get a file handle back, we keep that open
-        * and don't close it to prevent a race condition between multiple opens */
-       if (((mem_cfg_fd = open(pathname, O_RDWR)) >= 0) &&
-                       (fcntl(mem_cfg_fd, F_SETLK, &wr_lock) < 0))
-               ptype = RTE_PROC_SECONDARY;
+       /* if there no shared config, there can be no secondary processes */
+       if (!internal_config.no_shconf) {
+               /* if we can open the file but not get a write-lock we are a
+                * secondary process. NOTE: if we get a file handle back, we
+                * keep that open and don't close it to prevent a race condition
+                * between multiple opens.
+                */
+               if (((mem_cfg_fd = open(pathname, O_RDWR)) >= 0) &&
+                               (fcntl(mem_cfg_fd, F_SETLK, &wr_lock) < 0))
+                       ptype = RTE_PROC_SECONDARY;
+       }
 
        RTE_LOG(INFO, EAL, "Auto-detected process type: %s\n",
                        ptype == RTE_PROC_PRIMARY ? "PRIMARY" : "SECONDARY");
@@ -468,6 +473,14 @@ eal_parse_args(int argc, char **argv)
                }
        }
 
+       /* create runtime data directory */
+       if (internal_config.no_shconf == 0 &&
+                       eal_create_runtime_dir() < 0) {
+               RTE_LOG(ERR, EAL, "Cannot create runtime directory\n");
+               ret = -1;
+               goto out;
+       }
+
        if (eal_adjust_config(&internal_config) != 0) {
                ret = -1;
                goto out;
@@ -600,13 +613,6 @@ rte_eal_init(int argc, char **argv)
                return -1;
        }
 
-       /* create runtime data directory */
-       if (eal_create_runtime_dir() < 0) {
-               rte_eal_init_alert("Cannot create runtime directory\n");
-               rte_errno = EACCES;
-               return -1;
-       }
-
        /* FreeBSD always uses legacy memory model */
        internal_config.legacy_mem = true;
 
@@ -625,6 +631,11 @@ 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");
+               return -1;
+       }
+
        /* Put mp channel init before bus scan so that we can init the vdev
         * bus through mp channel in the secondary process before the bus scan.
         */
@@ -713,11 +724,6 @@ rte_eal_init(int argc, char **argv)
                return -1;
        }
 
-       if (rte_eal_intr_init() < 0) {
-               rte_eal_init_alert("Cannot init interrupt-handling thread\n");
-               return -1;
-       }
-
        if (rte_eal_timer_init() < 0) {
                rte_eal_init_alert("Cannot init HPET or TSC timers\n");
                rte_errno = ENOTSUP;