Imported Upstream version 17.05

[deb_dpdk.git] / lib / librte_eal / common / eal_common_options.c

diff --git a/lib/librte_eal/common/eal_common_options.c b/lib/librte_eal/common/eal_common_options.c
index 6ca8af1..f470195 100644 (file)
--- a/lib/librte_eal/common/eal_common_options.c
+++ b/lib/librte_eal/common/eal_common_options.c
@@ -118,7 +118,7 @@ static const char *default_solib_dir = RTE_EAL_PMD_PATH;
 /*
  * Stringified version of solib path used by dpdk-pmdinfo.py
  * Note: PLEASE DO NOT ALTER THIS without making a corresponding
- * change to tools/dpdk-pmdinfo.py
+ * change to usertools/dpdk-pmdinfo.py
  */
 static const char dpdk_solib_path[] __attribute__((used)) =
 "DPDK_PLUGIN_PATH=" RTE_EAL_PMD_PATH;
@@ -126,6 +126,7 @@ static const char dpdk_solib_path[] __attribute__((used)) =
 
 static int master_lcore_parsed;
 static int mem_parsed;
+static int core_parsed;
 
 void
 eal_reset_internal_config(struct internal_config *internal_cfg)
@@ -147,12 +148,6 @@ eal_reset_internal_config(struct internal_config *internal_cfg)
        internal_cfg->base_virtaddr = 0;
 
        internal_cfg->syslog_facility = LOG_DAEMON;
-       /* default value from build option */
-#if RTE_LOG_LEVEL >= RTE_LOG_DEBUG
-       internal_cfg->log_level = RTE_LOG_INFO;
-#else
-       internal_cfg->log_level = RTE_LOG_LEVEL;
-#endif
 
        internal_cfg->xen_dom0_support = 0;
 
@@ -738,25 +733,49 @@ eal_parse_syslog(const char *facility, struct internal_config *conf)
 }
 
 static int
-eal_parse_log_level(const char *level, uint32_t *log_level)
+eal_parse_log_level(const char *arg)
 {
-       char *end;
+       char *end, *str, *type, *level;
        unsigned long tmp;
 
+       str = strdup(arg);
+       if (str == NULL)
+               return -1;
+
+       if (strchr(str, ',') == NULL) {
+               type = NULL;
+               level = str;
+       } else {
+               type = strsep(&str, ",");
+               level = strsep(&str, ",");
+       }
+
        errno = 0;
        tmp = strtoul(level, &end, 0);
 
        /* check for errors */
        if ((errno != 0) || (level[0] == '\0') ||
-           end == NULL || (*end != '\0'))
-               return -1;
+                   end == NULL || (*end != '\0'))
+               goto fail;
 
        /* log_level is a uint32_t */
        if (tmp >= UINT32_MAX)
-               return -1;
+               goto fail;
+
+       if (type == NULL) {
+               rte_log_set_global_level(tmp);
+       } else if (rte_log_set_level_regexp(type, tmp) < 0) {
+               printf("cannot set log level %s,%lu\n",
+                       type, tmp);
+               goto fail;
+       }
 
-       *log_level = tmp;
+       free(str);
        return 0;
+
+fail:
+       free(str);
+       return -1;
 }
 
 static enum rte_proc_type_t
@@ -797,6 +816,7 @@ eal_parse_common_option(int opt, const char *optarg,
                        RTE_LOG(ERR, EAL, "invalid coremask\n");
                        return -1;
                }
+               core_parsed = 1;
                break;
        /* corelist */
        case 'l':
@@ -804,6 +824,7 @@ eal_parse_common_option(int opt, const char *optarg,
                        RTE_LOG(ERR, EAL, "invalid core list\n");
                        return -1;
                }
+               core_parsed = 1;
                break;
        /* size of memory */
        case 'm':
@@ -895,15 +916,12 @@ eal_parse_common_option(int opt, const char *optarg,
                break;
 
        case OPT_LOG_LEVEL_NUM: {
-               uint32_t log;
-
-               if (eal_parse_log_level(optarg, &log) < 0) {
+               if (eal_parse_log_level(optarg) < 0) {
                        RTE_LOG(ERR, EAL,
                                "invalid parameters for --"
                                OPT_LOG_LEVEL "\n");
                        return -1;
                }
-               conf->log_level = log;
                break;
        }
        case OPT_LCORES_NUM:
@@ -912,6 +930,7 @@ eal_parse_common_option(int opt, const char *optarg,
                                OPT_LCORES "\n");
                        return -1;
                }
+               core_parsed = 1;
                break;
 
        /* don't know what to do, leave this to caller */
@@ -923,12 +942,38 @@ eal_parse_common_option(int opt, const char *optarg,
        return 0;
 }
 
+static void
+eal_auto_detect_cores(struct rte_config *cfg)
+{
+       unsigned int lcore_id;
+       unsigned int removed = 0;
+       rte_cpuset_t affinity_set;
+       pthread_t tid = pthread_self();
+
+       if (pthread_getaffinity_np(tid, sizeof(rte_cpuset_t),
+                               &affinity_set) < 0)
+               CPU_ZERO(&affinity_set);
+
+       for (lcore_id = 0; lcore_id < RTE_MAX_LCORE; lcore_id++) {
+               if (cfg->lcore_role[lcore_id] == ROLE_RTE &&
+                   !CPU_ISSET(lcore_id, &affinity_set)) {
+                       cfg->lcore_role[lcore_id] = ROLE_OFF;
+                       removed++;
+               }
+       }
+
+       cfg->lcore_count -= removed;
+}
+
 int
 eal_adjust_config(struct internal_config *internal_cfg)
 {
        int i;
        struct rte_config *cfg = rte_eal_get_configuration();
 
+       if (!core_parsed)
+               eal_auto_detect_cores(cfg);
+
        if (internal_config.process_type == RTE_PROC_AUTO)
                internal_config.process_type = eal_proc_type_detect();
 
@@ -1027,7 +1072,9 @@ eal_common_usage(void)
               "  --"OPT_VMWARE_TSC_MAP"    Use VMware TSC map instead of native RDTSC\n"
               "  --"OPT_PROC_TYPE"         Type of this process (primary|secondary|auto)\n"
               "  --"OPT_SYSLOG"            Set syslog facility\n"
-              "  --"OPT_LOG_LEVEL"         Set default log level\n"
+              "  --"OPT_LOG_LEVEL"=<int>   Set global log level\n"
+              "  --"OPT_LOG_LEVEL"=<type-regexp>,<int>\n"
+              "                      Set specific log level\n"
               "  -v                  Display version information on startup\n"
               "  -h, --help          This help\n"
               "\nEAL options for DEBUG use only:\n"