eal: factorize configuration adjustment

[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 7a5d55e..63710b0 100644 (file)
--- a/lib/librte_eal/common/eal_common_options.c
+++ b/lib/librte_eal/common/eal_common_options.c
@@ -47,6 +47,7 @@
 
 #include "eal_internal_cfg.h"
 #include "eal_options.h"
+#include "eal_filesystem.h"
 
 #define BITS_PER_HEX 4
 
@@ -84,6 +85,45 @@ eal_long_options[] = {
        {0, 0, 0, 0}
 };
 
+static int lcores_parsed;
+static int mem_parsed;
+
+void
+eal_reset_internal_config(struct internal_config *internal_cfg)
+{
+       int i;
+
+       internal_cfg->memory = 0;
+       internal_cfg->force_nrank = 0;
+       internal_cfg->force_nchannel = 0;
+       internal_cfg->hugefile_prefix = HUGEFILE_PREFIX_DEFAULT;
+       internal_cfg->hugepage_dir = NULL;
+       internal_cfg->force_sockets = 0;
+       /* zero out the NUMA config */
+       for (i = 0; i < RTE_MAX_NUMA_NODES; i++)
+               internal_cfg->socket_mem[i] = 0;
+       /* zero out hugedir descriptors */
+       for (i = 0; i < MAX_HUGEPAGE_SIZES; i++)
+               internal_cfg->hugepage_info[i].lock_descriptor = -1;
+       internal_cfg->base_virtaddr = 0;
+
+       internal_cfg->syslog_facility = LOG_DAEMON;
+       /* default value from build option */
+       internal_cfg->log_level = RTE_LOG_LEVEL;
+
+       internal_cfg->xen_dom0_support = 0;
+
+       /* if set to NONE, interrupt mode is determined automatically */
+       internal_cfg->vfio_intr_mode = RTE_INTR_MODE_NONE;
+
+#ifdef RTE_LIBEAL_USE_HPET
+       internal_cfg->no_hpet = 0;
+#else
+       internal_cfg->no_hpet = 1;
+#endif
+       internal_cfg->vmware_tsc_map = 0;
+}
+
 /*
  * Parse the coremask given as argument (hexadecimal string) and fill
  * the global configuration (core role and core count) with the parsed
@@ -160,6 +200,7 @@ eal_parse_coremask(const char *coremask)
                return -1;
        /* Update the count of enabled logical cores of the EAL configuration */
        cfg->lcore_count = count;
+       lcores_parsed = 1;
        return 0;
 }
 
@@ -268,6 +309,7 @@ eal_parse_common_option(int opt, const char *optarg,
                conf->memory = atoi(optarg);
                conf->memory *= 1024ULL;
                conf->memory *= 1024ULL;
+               mem_parsed = 1;
                break;
        /* force number of channels */
        case 'n':
@@ -357,6 +399,70 @@ eal_parse_common_option(int opt, const char *optarg,
        return 0;
 }
 
+int
+eal_adjust_config(struct internal_config *internal_cfg)
+{
+       int i;
+
+       if (internal_config.process_type == RTE_PROC_AUTO)
+               internal_config.process_type = eal_proc_type_detect();
+
+       /* if no memory amounts were requested, this will result in 0 and
+        * will be overridden later, right after eal_hugepage_info_init() */
+       for (i = 0; i < RTE_MAX_NUMA_NODES; i++)
+               internal_cfg->memory += internal_cfg->socket_mem[i];
+
+       return 0;
+}
+
+int
+eal_check_common_options(struct internal_config *internal_cfg)
+{
+       struct rte_config *cfg = rte_eal_get_configuration();
+
+       if (!lcores_parsed) {
+               RTE_LOG(ERR, EAL, "CPU cores must be enabled with option "
+                       "-c\n");
+               return -1;
+       }
+
+       if (internal_cfg->process_type == RTE_PROC_INVALID) {
+               RTE_LOG(ERR, EAL, "Invalid process type specified\n");
+               return -1;
+       }
+       if (internal_cfg->process_type == RTE_PROC_PRIMARY &&
+                       internal_cfg->force_nchannel == 0) {
+               RTE_LOG(ERR, EAL, "Number of memory channels (-n) not "
+                       "specified\n");
+               return -1;
+       }
+       if (index(internal_cfg->hugefile_prefix, '%') != NULL) {
+               RTE_LOG(ERR, EAL, "Invalid char, '%%', in --"OPT_FILE_PREFIX" "
+                       "option\n");
+               return -1;
+       }
+       if (mem_parsed && internal_cfg->force_sockets == 1) {
+               RTE_LOG(ERR, EAL, "Options -m and --"OPT_SOCKET_MEM" cannot "
+                       "be specified at the same time\n");
+               return -1;
+       }
+       if (internal_cfg->no_hugetlbfs &&
+                       (mem_parsed || internal_cfg->force_sockets == 1)) {
+               RTE_LOG(ERR, EAL, "Options -m or --"OPT_SOCKET_MEM" cannot "
+                       "be specified together with --"OPT_NO_HUGE"\n");
+               return -1;
+       }
+
+       if (rte_eal_devargs_type_count(RTE_DEVTYPE_WHITELISTED_PCI) != 0 &&
+               rte_eal_devargs_type_count(RTE_DEVTYPE_BLACKLISTED_PCI) != 0) {
+               RTE_LOG(ERR, EAL, "Options blacklist (-b) and whitelist (-w) "
+                       "cannot be used at the same time\n");
+               return -1;
+       }
+
+       return 0;
+}
+
 void
 eal_common_usage(void)
 {