eal/linux: fix build with glibc < 2.12
[dpdk.git] / lib / librte_eal / linuxapp / eal / eal.c
index 2fb1acc..635ec36 100644 (file)
@@ -43,7 +43,6 @@
 #include <getopt.h>
 #include <sys/file.h>
 #include <fcntl.h>
-#include <dlfcn.h>
 #include <stddef.h>
 #include <errno.h>
 #include <limits.h>
@@ -59,7 +58,6 @@
 #include <rte_memory.h>
 #include <rte_memzone.h>
 #include <rte_launch.h>
-#include <rte_tailq.h>
 #include <rte_eal.h>
 #include <rte_eal_memconfig.h>
 #include <rte_per_lcore.h>
@@ -76,7 +74,6 @@
 #include <rte_version.h>
 #include <rte_atomic.h>
 #include <malloc_heap.h>
-#include <rte_eth_ring.h>
 
 #include "eal_private.h"
 #include "eal_thread.h"
 /* Allow the application to print its usage message too if set */
 static rte_usage_hook_t        rte_application_usage_hook = NULL;
 
-TAILQ_HEAD(shared_driver_list, shared_driver);
-
-/* Definition for shared object drivers. */
-struct shared_driver {
-       TAILQ_ENTRY(shared_driver) next;
-
-       char    name[PATH_MAX];
-       void*   lib_handle;
-};
-
-/* List of external loadable drivers */
-static struct shared_driver_list solib_list =
-TAILQ_HEAD_INITIALIZER(solib_list);
-
 /* early configuration structure, when memory config is not mmapped */
 static struct rte_mem_config early_mem_config;
 
@@ -352,17 +335,13 @@ eal_usage(const char *prgname)
        printf("\nUsage: %s ", prgname);
        eal_common_usage();
        printf("EAL Linux options:\n"
-              "  -d LIB.so    : add driver (can be used multiple times)\n"
-              "  --"OPT_XEN_DOM0" : support application running on Xen Domain0 "
-                          "without hugetlbfs\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_FILE_PREFIX": prefix for hugepage filenames\n"
-              "  --"OPT_BASE_VIRTADDR": specify base virtual address\n"
-              "  --"OPT_VFIO_INTR": specify desired interrupt mode for VFIO "
-                          "(legacy|msi|msix)\n"
-              "  --"OPT_CREATE_UIO_DEV": create /dev/uioX (usually done by hotplug)\n"
+              "  --"OPT_SOCKET_MEM"        Memory to allocate on sockets (comma separated values)\n"
+              "  --"OPT_HUGE_DIR"          Directory where hugetlbfs is mounted\n"
+              "  --"OPT_FILE_PREFIX"       Prefix for hugepage filenames\n"
+              "  --"OPT_BASE_VIRTADDR"     Base virtual address\n"
+              "  --"OPT_CREATE_UIO_DEV"    Create /dev/uioX (usually done by hotplug)\n"
+              "  --"OPT_VFIO_INTR"         Interrupt mode for VFIO (legacy|msi|msix)\n"
+              "  --"OPT_XEN_DOM0"          Support running on Xen dom0 without hugetlbfs\n"
               "\n");
        /* Allow the application to print its usage message too if hook is set */
        if ( rte_application_usage_hook ) {
@@ -503,17 +482,19 @@ eal_get_hugepage_mem_size(void)
        return (size < SIZE_MAX) ? (size_t)(size) : SIZE_MAX;
 }
 
-/* Parse the argument given in the command line of the application */
-static int
-eal_parse_args(int argc, char **argv)
+/* Parse the arguments for --log-level only */
+static void
+eal_log_level_parse(int argc, char **argv)
 {
-       int opt, ret;
+       int opt;
        char **argvopt;
        int option_index;
-       char *prgname = argv[0];
-       struct shared_driver *solib;
+       const int old_optind = optind;
+       const int old_optopt = optopt;
+       char * const old_optarg = optarg;
 
        argvopt = argv;
+       optind = 1;
 
        eal_reset_internal_config(&internal_config);
 
@@ -524,31 +505,62 @@ eal_parse_args(int argc, char **argv)
 
                /* getopt is not happy, stop right now */
                if (opt == '?')
-                       return -1;
+                       break;
+
+               ret = (opt == OPT_LOG_LEVEL_NUM) ?
+                       eal_parse_common_option(opt, optarg, &internal_config) : 0;
+
+               /* common parser is not happy */
+               if (ret < 0)
+                       break;
+       }
+
+       /* restore getopt lib */
+       optind = old_optind;
+       optopt = old_optopt;
+       optarg = old_optarg;
+}
+
+/* Parse the argument given in the command line of the application */
+static int
+eal_parse_args(int argc, char **argv)
+{
+       int opt, ret;
+       char **argvopt;
+       int option_index;
+       char *prgname = argv[0];
+       const int old_optind = optind;
+       const int old_optopt = optopt;
+       char * const old_optarg = optarg;
+
+       argvopt = argv;
+       optind = 1;
+
+       while ((opt = getopt_long(argc, argvopt, eal_short_options,
+                                 eal_long_options, &option_index)) != EOF) {
+
+               /* getopt is not happy, stop right now */
+               if (opt == '?') {
+                       eal_usage(prgname);
+                       ret = -1;
+                       goto out;
+               }
 
                ret = eal_parse_common_option(opt, optarg, &internal_config);
                /* common parser is not happy */
                if (ret < 0) {
                        eal_usage(prgname);
-                       return -1;
+                       ret = -1;
+                       goto out;
                }
                /* common parser handled this option */
                if (ret == 0)
                        continue;
 
                switch (opt) {
-               /* force loading of external driver */
-               case 'd':
-                       solib = malloc(sizeof(*solib));
-                       if (solib == NULL) {
-                               RTE_LOG(ERR, EAL, "malloc(solib) failed\n");
-                               return -1;
-                       }
-                       memset(solib, 0, sizeof(*solib));
-                       strncpy(solib->name, optarg, PATH_MAX-1);
-                       solib->name[PATH_MAX-1] = 0;
-                       TAILQ_INSERT_TAIL(&solib_list, solib, next);
-                       break;
+               case 'h':
+                       eal_usage(prgname);
+                       exit(EXIT_SUCCESS);
 
                /* long options */
                case OPT_XEN_DOM0_NUM:
@@ -558,7 +570,8 @@ eal_parse_args(int argc, char **argv)
                        RTE_LOG(ERR, EAL, "Can't support DPDK app "
                                "running on Dom0, please configure"
                                " RTE_LIBRTE_XEN_DOM0=y\n");
-                       return -1;
+                       ret = -1;
+                       goto out;
 #endif
                        break;
 
@@ -575,7 +588,8 @@ eal_parse_args(int argc, char **argv)
                                RTE_LOG(ERR, EAL, "invalid parameters for --"
                                                OPT_SOCKET_MEM "\n");
                                eal_usage(prgname);
-                               return -1;
+                               ret = -1;
+                               goto out;
                        }
                        break;
 
@@ -584,7 +598,8 @@ eal_parse_args(int argc, char **argv)
                                RTE_LOG(ERR, EAL, "invalid parameter for --"
                                                OPT_BASE_VIRTADDR "\n");
                                eal_usage(prgname);
-                               return -1;
+                               ret = -1;
+                               goto out;
                        }
                        break;
 
@@ -593,7 +608,8 @@ eal_parse_args(int argc, char **argv)
                                RTE_LOG(ERR, EAL, "invalid parameters for --"
                                                OPT_VFIO_INTR "\n");
                                eal_usage(prgname);
-                               return -1;
+                               ret = -1;
+                               goto out;
                        }
                        break;
 
@@ -615,17 +631,21 @@ eal_parse_args(int argc, char **argv)
                                        "on Linux\n", opt);
                        }
                        eal_usage(prgname);
-                       return -1;
+                       ret = -1;
+                       goto out;
                }
        }
 
-       if (eal_adjust_config(&internal_config) != 0)
-               return -1;
+       if (eal_adjust_config(&internal_config) != 0) {
+               ret = -1;
+               goto out;
+       }
 
        /* sanity checks */
        if (eal_check_common_options(&internal_config) != 0) {
                eal_usage(prgname);
-               return -1;
+               ret = -1;
+               goto out;
        }
 
        /* --xen-dom0 doesn't make sense with --socket-mem */
@@ -633,13 +653,20 @@ eal_parse_args(int argc, char **argv)
                RTE_LOG(ERR, EAL, "Options --"OPT_SOCKET_MEM" cannot be specified "
                        "together with --"OPT_XEN_DOM0"\n");
                eal_usage(prgname);
-               return -1;
+               ret = -1;
+               goto out;
        }
 
        if (optind >= 0)
                argv[optind-1] = prgname;
        ret = optind-1;
-       optind = 0; /* reset getopt lib */
+
+out:
+       /* restore getopt lib */
+       optind = old_optind;
+       optopt = old_optopt;
+       optarg = old_optarg;
+
        return ret;
 }
 
@@ -700,8 +727,9 @@ rte_eal_init(int argc, char **argv)
        int i, fctret, ret;
        pthread_t thread_id;
        static rte_atomic32_t run_once = RTE_ATOMIC32_INIT(0);
-       struct shared_driver *solib = NULL;
        const char *logid;
+       char cpuset[RTE_CPU_AFFINITY_STR_LEN];
+       char thread_name[RTE_MAX_THREAD_NAME_LEN];
 
        if (!rte_atomic32_test_and_set(&run_once))
                return -1;
@@ -714,6 +742,11 @@ rte_eal_init(int argc, char **argv)
        if (rte_eal_log_early_init() < 0)
                rte_panic("Cannot init early logs\n");
 
+       eal_log_level_parse(argc, argv);
+
+       /* set log level as early as possible */
+       rte_set_log_level(internal_config.log_level);
+
        if (rte_eal_cpu_init() < 0)
                rte_panic("Cannot detect lcores\n");
 
@@ -721,9 +754,6 @@ 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 &&
@@ -783,9 +813,6 @@ rte_eal_init(int argc, char **argv)
        if (rte_eal_alarm_init() < 0)
                rte_panic("Cannot init interrupt-handling thread\n");
 
-       if (rte_eal_intr_init() < 0)
-               rte_panic("Cannot init interrupt-handling thread\n");
-
        if (rte_eal_timer_init() < 0)
                rte_panic("Cannot init HPET or TSC timers\n");
 
@@ -793,21 +820,23 @@ rte_eal_init(int argc, char **argv)
 
        rte_eal_mcfg_complete();
 
-       TAILQ_FOREACH(solib, &solib_list, next) {
-               RTE_LOG(INFO, EAL, "open shared lib %s\n", solib->name);
-               solib->lib_handle = dlopen(solib->name, RTLD_NOW);
-               if (solib->lib_handle == NULL)
-                       RTE_LOG(WARNING, EAL, "%s\n", dlerror());
-       }
+       if (eal_plugins_init() < 0)
+               rte_panic("Cannot init plugins\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);
+       ret = eal_thread_dump_affinity(cpuset, RTE_CPU_AFFINITY_STR_LEN);
+
+       RTE_LOG(DEBUG, EAL, "Master lcore %u is ready (tid=%x;cpuset=[%s%s])\n",
+               rte_config.master_lcore, (int)thread_id, cpuset,
+               ret == 0 ? "" : "...");
 
        if (rte_eal_dev_init() < 0)
                rte_panic("Cannot init pmd devices\n");
 
+       if (rte_eal_intr_init() < 0)
+               rte_panic("Cannot init interrupt-handling thread\n");
+
        RTE_LCORE_FOREACH_SLAVE(i) {
 
                /*
@@ -826,6 +855,15 @@ rte_eal_init(int argc, char **argv)
                                     eal_thread_loop, NULL);
                if (ret != 0)
                        rte_panic("Cannot create thread\n");
+
+               /* Set thread_name for aid in debugging. */
+               snprintf(thread_name, RTE_MAX_THREAD_NAME_LEN,
+                       "lcore-slave-%d", i);
+               ret = rte_thread_setname(lcore_config[i].thread_id,
+                                               thread_name);
+               if (ret != 0)
+                       RTE_LOG(ERR, EAL,
+                               "Cannot set name for lcore thread\n");
        }
 
        /*
@@ -846,16 +884,44 @@ rte_eal_init(int argc, char **argv)
 enum rte_lcore_role_t
 rte_eal_lcore_role(unsigned lcore_id)
 {
-       return (rte_config.lcore_role[lcore_id]);
+       return rte_config.lcore_role[lcore_id];
 }
 
 enum rte_proc_type_t
 rte_eal_process_type(void)
 {
-       return (rte_config.process_type);
+       return rte_config.process_type;
 }
 
 int rte_eal_has_hugepages(void)
 {
        return ! internal_config.no_hugetlbfs;
 }
+
+int
+rte_eal_check_module(const char *module_name)
+{
+       char mod_name[30]; /* Any module names can be longer than 30 bytes? */
+       int ret = 0;
+       int n;
+
+       if (NULL == module_name)
+               return -1;
+
+       FILE *fd = fopen("/proc/modules", "r");
+       if (NULL == fd) {
+               RTE_LOG(ERR, EAL, "Open /proc/modules failed!"
+                       " error %i (%s)\n", errno, strerror(errno));
+               return -1;
+       }
+       while (!feof(fd)) {
+               n = fscanf(fd, "%29s %*[^\n]", mod_name);
+               if ((n == 1) && !strcmp(mod_name, module_name)) {
+                       ret = 1;
+                       break;
+               }
+       }
+       fclose(fd);
+
+       return ret;
+}