eal: factorise unsupported option handling

[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 5d2adb9..bf63744 100644 (file)
--- a/lib/librte_eal/linuxapp/eal/eal.c
+++ b/lib/librte_eal/linuxapp/eal/eal.c
@@ -92,18 +92,16 @@
 #define OPT_NO_HUGE     "no-huge"
 #define OPT_FILE_PREFIX "file-prefix"
 #define OPT_SOCKET_MEM  "socket-mem"
-#define OPT_USE_DEVICE  "use-device"
 #define OPT_PCI_WHITELIST "pci-whitelist"
 #define OPT_PCI_BLACKLIST "pci-blacklist"
 #define OPT_VDEV        "vdev"
 #define OPT_SYSLOG      "syslog"
+#define OPT_LOG_LEVEL   "log-level"
 #define OPT_BASE_VIRTADDR   "base-virtaddr"
 #define OPT_XEN_DOM0    "xen-dom0"
 #define OPT_CREATE_UIO_DEV "create-uio-dev"
 #define OPT_VFIO_INTR    "vfio-intr"
 
-#define RTE_EAL_BLACKLIST_SIZE 0x100
-
 #define MEMSIZE_IF_NO_HUGE_PAGE (64ULL * 1024ULL * 1024ULL)
 
 #define SOCKET_MEM_STRLEN (RTE_MAX_NUMA_NODES * 10)
@@ -213,6 +211,14 @@ rte_eal_config_create(void)
        if (internal_config.no_shconf)
                return;
 
+       /* map the config before hugepage address so that we don't waste a page */
+       if (internal_config.base_virtaddr != 0)
+               rte_mem_cfg_addr = (void *)
+                       RTE_ALIGN_FLOOR(internal_config.base_virtaddr -
+                       sizeof(struct rte_mem_config), sysconf(_SC_PAGE_SIZE));
+       else
+               rte_mem_cfg_addr = NULL;
+
        if (mem_cfg_fd < 0){
                mem_cfg_fd = open(pathname, O_RDWR | O_CREAT, 0660);
                if (mem_cfg_fd < 0)
@@ -232,7 +238,7 @@ rte_eal_config_create(void)
                                "process running?\n", pathname);
        }
 
-       rte_mem_cfg_addr = mmap(NULL, sizeof(*rte_config.mem_config),
+       rte_mem_cfg_addr = mmap(rte_mem_cfg_addr, sizeof(*rte_config.mem_config),
                                PROT_READ | PROT_WRITE, MAP_SHARED, mem_cfg_fd, 0);
 
        if (rte_mem_cfg_addr == MAP_FAILED){
@@ -378,7 +384,8 @@ eal_usage(const char *prgname)
               "  --"OPT_XEN_DOM0" : support application running on Xen Domain0 "
                           "without hugetlbfs\n"
               "  --"OPT_SYSLOG"     : set syslog facility\n"
-              "  --"OPT_SOCKET_MEM" : memory to allocate on specific \n"
+              "  --"OPT_LOG_LEVEL"  : set default log level\n"
+              "  --"OPT_SOCKET_MEM" : memory to allocate on specific\n"
                   "                 sockets (use comma separated values)\n"
               "  --"OPT_HUGE_DIR"   : directory where hugetlbfs is mounted\n"
               "  --"OPT_PROC_TYPE"  : type of this process\n"
@@ -541,6 +548,28 @@ eal_parse_syslog(const char *facility)
        return -1;
 }
 
+static int
+eal_parse_log_level(const char *level, uint32_t *log_level)
+{
+       char *end;
+       unsigned long tmp;
+
+       errno = 0;
+       tmp = strtoul(level, &end, 0);
+
+       /* check for errors */
+       if ((errno != 0) || (level[0] == '\0') ||
+           end == NULL || (*end != '\0'))
+               return -1;
+
+       /* log_level is a uint32_t */
+       if (tmp >= UINT32_MAX)
+               return -1;
+
+       *log_level = tmp;
+       return 0;
+}
+
 static int
 eal_parse_socket_mem(char *socket_mem)
 {
@@ -693,6 +722,7 @@ eal_parse_args(int argc, char **argv)
                {OPT_PCI_BLACKLIST, 1, 0, 0},
                {OPT_VDEV, 1, 0, 0},
                {OPT_SYSLOG, 1, NULL, 0},
+               {OPT_LOG_LEVEL, 1, NULL, 0},
                {OPT_VFIO_INTR, 1, NULL, 0},
                {OPT_BASE_VIRTADDR, 1, 0, 0},
                {OPT_XEN_DOM0, 0, 0, 0},
@@ -710,6 +740,8 @@ eal_parse_args(int argc, char **argv)
        internal_config.hugepage_dir = NULL;
        internal_config.force_sockets = 0;
        internal_config.syslog_facility = LOG_DAEMON;
+       /* default value from build option */
+       internal_config.log_level = RTE_LOG_LEVEL;
        internal_config.xen_dom0_support = 0;
        /* if set to NONE, interrupt mode is determined automatically */
        internal_config.vfio_intr_mode = RTE_INTR_MODE_NONE;
@@ -847,12 +879,6 @@ eal_parse_args(int argc, char **argv)
                                        return -1;
                                }
                        }
-                       else if (!strcmp(lgopts[option_index].name, OPT_USE_DEVICE)) {
-                               printf("The --use-device option is deprecated, please use\n"
-                                       "--whitelist or --vdev instead.\n");
-                               eal_usage(prgname);
-                               return -1;
-                       }
                        else if (!strcmp(lgopts[option_index].name, OPT_PCI_BLACKLIST)) {
                                if (rte_eal_devargs_add(RTE_DEVTYPE_BLACKLISTED_PCI,
                                                optarg) < 0) {
@@ -881,6 +907,18 @@ eal_parse_args(int argc, char **argv)
                                        eal_usage(prgname);
                                        return -1;
                                }
+                       } else if (!strcmp(lgopts[option_index].name,
+                                        OPT_LOG_LEVEL)) {
+                               uint32_t log;
+
+                               if (eal_parse_log_level(optarg, &log) < 0) {
+                                       RTE_LOG(ERR, EAL,
+                                               "invalid parameters for --"
+                                               OPT_LOG_LEVEL "\n");
+                                       eal_usage(prgname);
+                                       return -1;
+                               }
+                               internal_config.log_level = log;
                        }
                        else if (!strcmp(lgopts[option_index].name, OPT_BASE_VIRTADDR)) {
                                if (eal_parse_base_virtaddr(optarg) < 0) {
@@ -900,6 +938,12 @@ eal_parse_args(int argc, char **argv)
                        }
                        else if (!strcmp(lgopts[option_index].name, OPT_CREATE_UIO_DEV)) {
                                internal_config.create_uio_dev = 1;
+                       } else {
+                               RTE_LOG(ERR, EAL, "Option %s is not supported "
+                                       "on Linux\n",
+                                       lgopts[option_index].name);
+                               eal_usage(prgname);
+                               return -1;
                        }
                        break;
 
@@ -1048,6 +1092,9 @@ rte_eal_init(int argc, char **argv)
        if (fctret < 0)
                exit(1);
 
+       /* set log level as early as possible */
+       rte_set_log_level(internal_config.log_level);
+
        if (internal_config.no_hugetlbfs == 0 &&
                        internal_config.process_type != RTE_PROC_SECONDARY &&
                        internal_config.xen_dom0_support == 0 &&