use sizeof to avoid double use of a length define
[dpdk.git] / lib / librte_eal / linuxapp / eal / eal.c
index 1d468dd..200e879 100644 (file)
@@ -1,35 +1,6 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
- *   Copyright(c) 2012-2014 6WIND S.A.
- *   All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2018 Intel Corporation.
+ * Copyright(c) 2012-2014 6WIND S.A.
  */
 
 #include <stdio.h>
 #include <getopt.h>
 #include <sys/file.h>
 #include <fcntl.h>
-#include <dlfcn.h>
 #include <stddef.h>
 #include <errno.h>
 #include <limits.h>
-#include <errno.h>
 #include <sys/mman.h>
 #include <sys/queue.h>
+#include <sys/stat.h>
+#if defined(RTE_ARCH_X86)
 #include <sys/io.h>
+#endif
 
+#include <rte_compat.h>
 #include <rte_common.h>
 #include <rte_debug.h>
 #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_errno.h>
 #include <rte_per_lcore.h>
 #include <rte_lcore.h>
+#include <rte_service_component.h>
 #include <rte_log.h>
 #include <rte_random.h>
 #include <rte_cycles.h>
 #include <rte_string_fns.h>
 #include <rte_cpuflags.h>
 #include <rte_interrupts.h>
-#include <rte_pci.h>
+#include <rte_bus.h>
+#include <rte_dev.h>
 #include <rte_devargs.h>
-#include <rte_common.h>
 #include <rte_version.h>
 #include <rte_atomic.h>
 #include <malloc_heap.h>
-#include <rte_eth_ring.h>
-#include <rte_dev.h>
+#include <rte_vfio.h>
 
 #include "eal_private.h"
 #include "eal_thread.h"
 #include "eal_filesystem.h"
 #include "eal_hugepages.h"
 #include "eal_options.h"
+#include "eal_vfio.h"
 
 #define MEMSIZE_IF_NO_HUGE_PAGE (64ULL * 1024ULL * 1024ULL)
 
 #define SOCKET_MEM_STRLEN (RTE_MAX_NUMA_NODES * 10)
 
-#define HIGHEST_RPL 3
-
 /* 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;
 
@@ -117,8 +74,8 @@ static int mem_cfg_fd = -1;
 static struct flock wr_lock = {
                .l_type = F_WRLCK,
                .l_whence = SEEK_SET,
-               .l_start = offsetof(struct rte_mem_config, memseg),
-               .l_len = sizeof(early_mem_config.memseg),
+               .l_start = offsetof(struct rte_mem_config, memsegs),
+               .l_len = sizeof(early_mem_config.memsegs),
 };
 
 /* Address of global and public configuration */
@@ -135,6 +92,23 @@ struct internal_config internal_config;
 /* used by rte_rdtsc() */
 int rte_cycles_vmware_tsc_map;
 
+/* Return user provided mbuf pool ops name */
+const char * __rte_experimental
+rte_eal_mbuf_user_pool_ops(void)
+{
+       return internal_config.user_mbuf_pool_ops_name;
+}
+
+/* Return mbuf pool ops name */
+const char *
+rte_eal_mbuf_default_mempool_ops(void)
+{
+       if (internal_config.user_mbuf_pool_ops_name == NULL)
+               return RTE_MBUF_DEFAULT_MEMPOOL_OPS;
+
+       return internal_config.user_mbuf_pool_ops_name;
+}
+
 /* Return a pointer to the configuration structure */
 struct rte_config *
 rte_eal_get_configuration(void)
@@ -142,6 +116,12 @@ rte_eal_get_configuration(void)
        return &rte_config;
 }
 
+enum rte_iova_mode
+rte_eal_iova_mode(void)
+{
+       return rte_eal_get_configuration()->iova_mode;
+}
+
 /* parse a sysfs (or other) file containing one integer value */
 int
 eal_parse_sysfs_value(const char *filename, unsigned long *val)
@@ -225,7 +205,7 @@ rte_eal_config_create(void)
                rte_panic("Cannot mmap memory for rte_config\n");
        }
        memcpy(rte_mem_cfg_addr, &early_mem_config, sizeof(early_mem_config));
-       rte_config.mem_config = (struct rte_mem_config *) rte_mem_cfg_addr;
+       rte_config.mem_config = rte_mem_cfg_addr;
 
        /* store address of the config in the config itself so that secondary
         * processes could later map the config into this exact location */
@@ -254,7 +234,8 @@ rte_eal_config_attach(void)
        mem_config = (struct rte_mem_config *) mmap(NULL, sizeof(*mem_config),
                        PROT_READ, MAP_SHARED, mem_cfg_fd, 0);
        if (mem_config == MAP_FAILED)
-               rte_panic("Cannot mmap memory for rte_config\n");
+               rte_panic("Cannot mmap memory for rte_config! error %i (%s)\n",
+                         errno, strerror(errno));
 
        rte_config.mem_config = mem_config;
 }
@@ -279,15 +260,23 @@ rte_eal_config_reattach(void)
        mem_config = (struct rte_mem_config *) mmap(rte_mem_cfg_addr,
                        sizeof(*mem_config), PROT_READ | PROT_WRITE, MAP_SHARED,
                        mem_cfg_fd, 0);
+       if (mem_config == MAP_FAILED || mem_config != rte_mem_cfg_addr) {
+               if (mem_config != MAP_FAILED)
+                       /* errno is stale, don't use */
+                       rte_panic("Cannot mmap memory for rte_config at [%p], got [%p]"
+                                 " - please use '--base-virtaddr' option\n",
+                                 rte_mem_cfg_addr, mem_config);
+               else
+                       rte_panic("Cannot mmap memory for rte_config! error %i (%s)\n",
+                                 errno, strerror(errno));
+       }
        close(mem_cfg_fd);
-       if (mem_config == MAP_FAILED || mem_config != rte_mem_cfg_addr)
-               rte_panic("Cannot mmap memory for rte_config\n");
 
        rte_config.mem_config = mem_config;
 }
 
 /* Detect if we are a primary or a secondary process */
-static enum rte_proc_type_t
+enum rte_proc_type_t
 eal_proc_type_detect(void)
 {
        enum rte_proc_type_t ptype = RTE_PROC_PRIMARY;
@@ -310,9 +299,7 @@ eal_proc_type_detect(void)
 static void
 rte_config_init(void)
 {
-       rte_config.process_type = (internal_config.process_type == RTE_PROC_AUTO) ?
-                       eal_proc_type_detect() : /* for auto, detect the type */
-                       internal_config.process_type; /* otherwise use what's already set */
+       rte_config.process_type = internal_config.process_type;
 
        switch (rte_config.process_type){
        case RTE_PROC_PRIMARY:
@@ -355,17 +342,14 @@ 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_LEGACY_MEM"        Legacy memory mode (no dynamic allocation, contiguous segments)\n"
+              "  --"OPT_SINGLE_FILE_SEGMENTS" Put all hugepage memory in single files\n"
               "\n");
        /* Allow the application to print its usage message too if hook is set */
        if ( rte_application_usage_hook ) {
@@ -451,14 +435,17 @@ eal_parse_base_virtaddr(const char *arg)
                return -1;
 
        /* make sure we don't exceed 32-bit boundary on 32-bit target */
-#ifndef RTE_ARCH_X86_64
+#ifndef RTE_ARCH_64
        if (addr >= UINTPTR_MAX)
                return -1;
 #endif
 
-       /* align the addr on 2M boundary */
-       internal_config.base_virtaddr = RTE_PTR_ALIGN_CEIL((uintptr_t)addr,
-                                                          RTE_PGSIZE_2M);
+       /* align the addr on 16M boundary, 16MB is the minimum huge page
+        * size on IBM Power architecture. If the addr is aligned to 16MB,
+        * it can align to 2MB for x86. So this alignment can also be used
+        * on x86 */
+       internal_config.base_virtaddr =
+               RTE_PTR_ALIGN_CEIL((uintptr_t)addr, (size_t)RTE_PGSIZE_16M);
 
        return 0;
 }
@@ -485,152 +472,128 @@ eal_parse_vfio_intr(const char *mode)
        return -1;
 }
 
-static inline size_t
-eal_get_hugepage_mem_size(void)
+/* Parse the arguments for --log-level only */
+static void
+eal_log_level_parse(int argc, char **argv)
 {
-       uint64_t size = 0;
-       unsigned i, j;
+       int opt;
+       char **argvopt;
+       int option_index;
+       const int old_optind = optind;
+       const int old_optopt = optopt;
+       char * const old_optarg = optarg;
 
-       for (i = 0; i < internal_config.num_hugepage_sizes; i++) {
-               struct hugepage_info *hpi = &internal_config.hugepage_info[i];
-               if (hpi->hugedir != NULL) {
-                       for (j = 0; j < RTE_MAX_NUMA_NODES; j++) {
-                               size += hpi->hugepage_sz * hpi->num_pages[j];
-                       }
-               }
+       argvopt = argv;
+       optind = 1;
+
+       while ((opt = getopt_long(argc, argvopt, eal_short_options,
+                                 eal_long_options, &option_index)) != EOF) {
+
+               int ret;
+
+               /* getopt is not happy, stop right now */
+               if (opt == '?')
+                       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;
        }
 
-       return (size < SIZE_MAX) ? (size_t)(size) : SIZE_MAX;
+       /* 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, i;
+       int opt, ret;
        char **argvopt;
        int option_index;
-       int coremask_ok = 0;
        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;
-
-       internal_config.memory = 0;
-       internal_config.force_nrank = 0;
-       internal_config.force_nchannel = 0;
-       internal_config.hugefile_prefix = HUGEFILE_PREFIX_DEFAULT;
-       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;
-#ifdef RTE_LIBEAL_USE_HPET
-       internal_config.no_hpet = 0;
-#else
-       internal_config.no_hpet = 1;
-#endif
-       /* zero out the NUMA config */
-       for (i = 0; i < RTE_MAX_NUMA_NODES; i++)
-               internal_config.socket_mem[i] = 0;
-
-       /* zero out hugedir descriptors */
-       for (i = 0; i < MAX_HUGEPAGE_SIZES; i++)
-               internal_config.hugepage_info[i].lock_descriptor = -1;
-
-       internal_config.vmware_tsc_map = 0;
-       internal_config.base_virtaddr = 0;
+       optind = 1;
 
        while ((opt = getopt_long(argc, argvopt, eal_short_options,
                                  eal_long_options, &option_index)) != EOF) {
 
-               int ret;
-
                /* getopt is not happy, stop right now */
-               if (opt == '?')
-                       return -1;
+               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) {
-                       /* special case, note that the common parser accepted
-                        * the coremask option */
-                       if (opt == 'c')
-                               coremask_ok = 1;
+               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;
-
-               /* long options */
-               case OPT_XEN_DOM0_NUM:
-               #ifdef RTE_LIBRTE_XEN_DOM0
-                               internal_config.xen_dom0_support = 1;
-               #else
-                               RTE_LOG(ERR, EAL, "Can't support DPDK app "
-                                       "running on Dom0, please configure"
-                                       " RTE_LIBRTE_XEN_DOM0=y\n");
-                               return -1;
-               #endif
-                       break;
+               case 'h':
+                       eal_usage(prgname);
+                       exit(EXIT_SUCCESS);
 
                case OPT_HUGE_DIR_NUM:
-                               internal_config.hugepage_dir = optarg;
+                       internal_config.hugepage_dir = strdup(optarg);
                        break;
 
                case OPT_FILE_PREFIX_NUM:
-                               internal_config.hugefile_prefix = optarg;
+                       internal_config.hugefile_prefix = strdup(optarg);
                        break;
 
                case OPT_SOCKET_MEM_NUM:
-                               if (eal_parse_socket_mem(optarg) < 0) {
-                                       RTE_LOG(ERR, EAL, "invalid parameters for --"
-                                                       OPT_SOCKET_MEM "\n");
-                                       eal_usage(prgname);
-                                       return -1;
-                               }
+                       if (eal_parse_socket_mem(optarg) < 0) {
+                               RTE_LOG(ERR, EAL, "invalid parameters for --"
+                                               OPT_SOCKET_MEM "\n");
+                               eal_usage(prgname);
+                               ret = -1;
+                               goto out;
+                       }
                        break;
 
                case OPT_BASE_VIRTADDR_NUM:
-                               if (eal_parse_base_virtaddr(optarg) < 0) {
-                                       RTE_LOG(ERR, EAL, "invalid parameter for --"
-                                                       OPT_BASE_VIRTADDR "\n");
-                                       eal_usage(prgname);
-                                       return -1;
-                               }
+                       if (eal_parse_base_virtaddr(optarg) < 0) {
+                               RTE_LOG(ERR, EAL, "invalid parameter for --"
+                                               OPT_BASE_VIRTADDR "\n");
+                               eal_usage(prgname);
+                               ret = -1;
+                               goto out;
+                       }
                        break;
 
                case OPT_VFIO_INTR_NUM:
-                               if (eal_parse_vfio_intr(optarg) < 0) {
-                                       RTE_LOG(ERR, EAL, "invalid parameters for --"
-                                                       OPT_VFIO_INTR "\n");
-                                       eal_usage(prgname);
-                                       return -1;
-                               }
+                       if (eal_parse_vfio_intr(optarg) < 0) {
+                               RTE_LOG(ERR, EAL, "invalid parameters for --"
+                                               OPT_VFIO_INTR "\n");
+                               eal_usage(prgname);
+                               ret = -1;
+                               goto out;
+                       }
                        break;
 
                case OPT_CREATE_UIO_DEV_NUM:
-                               internal_config.create_uio_dev = 1;
+                       internal_config.create_uio_dev = 1;
+                       break;
+
+               case OPT_MBUF_POOL_OPS_NAME_NUM:
+                       internal_config.user_mbuf_pool_ops_name = optarg;
                        break;
 
                default:
@@ -647,96 +610,56 @@ eal_parse_args(int argc, char **argv)
                                        "on Linux\n", opt);
                        }
                        eal_usage(prgname);
-                       return -1;
+                       ret = -1;
+                       goto out;
                }
        }
 
-       /* sanity checks */
-       if (!coremask_ok) {
-               RTE_LOG(ERR, EAL, "coremask not specified\n");
-               eal_usage(prgname);
-               return -1;
-       }
-       if (internal_config.process_type == RTE_PROC_AUTO){
-               internal_config.process_type = eal_proc_type_detect();
-       }
-       if (internal_config.process_type == RTE_PROC_INVALID){
-               RTE_LOG(ERR, EAL, "Invalid process type specified\n");
-               eal_usage(prgname);
-               return -1;
-       }
-       if (internal_config.process_type == RTE_PROC_PRIMARY &&
-                       internal_config.force_nchannel == 0) {
-               RTE_LOG(ERR, EAL, "Number of memory channels (-n) not specified\n");
-               eal_usage(prgname);
-               return -1;
-       }
-       if (index(internal_config.hugefile_prefix,'%') != NULL){
-               RTE_LOG(ERR, EAL, "Invalid char, '%%', in '"OPT_FILE_PREFIX"' option\n");
-               eal_usage(prgname);
-               return -1;
-       }
-       if (internal_config.memory > 0 && internal_config.force_sockets == 1) {
-               RTE_LOG(ERR, EAL, "Options -m and --socket-mem cannot be specified "
-                               "at the same time\n");
-               eal_usage(prgname);
-               return -1;
-       }
-       /* --no-huge doesn't make sense with either -m or --socket-mem */
-       if (internal_config.no_hugetlbfs &&
-                       (internal_config.memory > 0 ||
-                                       internal_config.force_sockets == 1)) {
-               RTE_LOG(ERR, EAL, "Options -m or --socket-mem cannot be specified "
-                               "together with --no-huge!\n");
-               eal_usage(prgname);
-               return -1;
-       }
-       /* --xen-dom0 doesn't make sense with --socket-mem */
-       if (internal_config.xen_dom0_support && internal_config.force_sockets == 1) {
-               RTE_LOG(ERR, EAL, "Options --socket-mem cannot be specified "
-                                       "together with --xen_dom0!\n");
-               eal_usage(prgname);
-               return -1;
+       if (eal_adjust_config(&internal_config) != 0) {
+               ret = -1;
+               goto out;
        }
 
-       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, "Error: blacklist [-b] and whitelist "
-                       "[-w] options cannot be used at the same time\n");
+       /* sanity checks */
+       if (eal_check_common_options(&internal_config) != 0) {
                eal_usage(prgname);
-               return -1;
+               ret = -1;
+               goto out;
        }
 
        if (optind >= 0)
                argv[optind-1] = prgname;
+       ret = optind-1;
 
-       /* if no memory amounts were requested, this will result in 0 and
-        * will be overriden later, right after eal_hugepage_info_init() */
-       for (i = 0; i < RTE_MAX_NUMA_NODES; i++)
-               internal_config.memory += internal_config.socket_mem[i];
+out:
+       /* restore getopt lib */
+       optind = old_optind;
+       optopt = old_optopt;
+       optarg = old_optarg;
 
-       ret = optind-1;
-       optind = 0; /* reset getopt lib */
        return ret;
 }
 
+static int
+check_socket(const struct rte_memseg_list *msl, void *arg)
+{
+       int *socket_id = arg;
+
+       if (msl->socket_id == *socket_id && msl->memseg_arr.count != 0)
+               return 1;
+
+       return 0;
+}
+
 static void
 eal_check_mem_on_local_socket(void)
 {
-       const struct rte_memseg *ms;
-       int i, socket_id;
+       int socket_id;
 
        socket_id = rte_lcore_to_socket_id(rte_config.master_lcore);
 
-       ms = rte_eal_get_physmem_layout();
-
-       for (i = 0; i < RTE_MAX_MEMSEG; i++)
-               if (ms[i].socket_id == socket_id &&
-                               ms[i].len > 0)
-                       return;
-
-       RTE_LOG(WARNING, EAL, "WARNING: Master core has no "
-                       "memory on local socket!\n");
+       if (rte_memseg_list_walk(check_socket, &socket_id) == 0)
+               RTE_LOG(WARNING, EAL, "WARNING: Master core has no memory on local socket!\n");
 }
 
 static int
@@ -751,15 +674,39 @@ rte_eal_mcfg_complete(void)
        /* ALL shared mem_config related INIT DONE */
        if (rte_config.process_type == RTE_PROC_PRIMARY)
                rte_config.mem_config->magic = RTE_MAGIC;
+
+       internal_config.init_complete = 1;
 }
 
 /*
  * Request iopl privilege for all RPL, returns 0 on success
+ * iopl() call is mostly for the i386 architecture. For other architectures,
+ * return -1 to indicate IO privilege can't be changed in this way.
  */
-static int
+int
 rte_eal_iopl_init(void)
 {
-       return iopl(HIGHEST_RPL);
+#if defined(RTE_ARCH_X86)
+       if (iopl(3) != 0)
+               return -1;
+#endif
+       return 0;
+}
+
+#ifdef VFIO_PRESENT
+static int rte_eal_vfio_setup(void)
+{
+       if (rte_vfio_enable("vfio"))
+               return -1;
+
+       return 0;
+}
+#endif
+
+static void rte_eal_init_alert(const char *msg)
+{
+       fprintf(stderr, "EAL: FATAL: %s\n", msg);
+       RTE_LOG(ERR, EAL, "%s\n", msg);
 }
 
 /* Launch threads, called at application init(). */
@@ -769,41 +716,108 @@ 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))
+       /* checks if the machine is adequate */
+       if (!rte_cpu_is_supported()) {
+               rte_eal_init_alert("unsupported cpu type.");
+               rte_errno = ENOTSUP;
                return -1;
+       }
+
+       if (!rte_atomic32_test_and_set(&run_once)) {
+               rte_eal_init_alert("already called initialization.");
+               rte_errno = EALREADY;
+               return -1;
+       }
 
        logid = strrchr(argv[0], '/');
        logid = strdup(logid ? logid + 1: argv[0]);
 
        thread_id = pthread_self();
 
-       if (rte_eal_log_early_init() < 0)
-               rte_panic("Cannot init early logs\n");
+       eal_reset_internal_config(&internal_config);
 
-       if (rte_eal_cpu_init() < 0)
-               rte_panic("Cannot detect lcores\n");
+       /* set log level as early as possible */
+       eal_log_level_parse(argc, argv);
+
+       if (rte_eal_cpu_init() < 0) {
+               rte_eal_init_alert("Cannot detect lcores.");
+               rte_errno = ENOTSUP;
+               return -1;
+       }
 
        fctret = eal_parse_args(argc, argv);
-       if (fctret < 0)
-               exit(1);
+       if (fctret < 0) {
+               rte_eal_init_alert("Invalid 'command line' arguments.");
+               rte_errno = EINVAL;
+               rte_atomic32_clear(&run_once);
+               return -1;
+       }
 
-       /* set log level as early as possible */
-       rte_set_log_level(internal_config.log_level);
+       if (eal_plugins_init() < 0) {
+               rte_eal_init_alert("Cannot init plugins\n");
+               rte_errno = EINVAL;
+               rte_atomic32_clear(&run_once);
+               return -1;
+       }
+
+       if (eal_option_device_parse()) {
+               rte_errno = ENODEV;
+               rte_atomic32_clear(&run_once);
+               return -1;
+       }
+
+       rte_config_init();
+
+       /* 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.
+        */
+       if (rte_mp_channel_init() < 0) {
+               rte_eal_init_alert("failed to init mp channel\n");
+               if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
+                       rte_errno = EFAULT;
+                       return -1;
+               }
+       }
+
+       if (rte_bus_scan()) {
+               rte_eal_init_alert("Cannot scan the buses for devices\n");
+               rte_errno = ENODEV;
+               rte_atomic32_clear(&run_once);
+               return -1;
+       }
 
-       if (internal_config.no_hugetlbfs == 0 &&
-                       internal_config.process_type != RTE_PROC_SECONDARY &&
-                       internal_config.xen_dom0_support == 0 &&
-                       eal_hugepage_info_init() < 0)
-               rte_panic("Cannot get hugepage information\n");
+       /* autodetect the iova mapping mode (default is iova_pa) */
+       rte_eal_get_configuration()->iova_mode = rte_bus_get_iommu_class();
+
+       /* Workaround for KNI which requires physical address to work */
+       if (rte_eal_get_configuration()->iova_mode == RTE_IOVA_VA &&
+                       rte_eal_check_module("rte_kni") == 1) {
+               rte_eal_get_configuration()->iova_mode = RTE_IOVA_PA;
+               RTE_LOG(WARNING, EAL,
+                       "Some devices want IOVA as VA but PA will be used because.. "
+                       "KNI module inserted\n");
+       }
+
+       if (internal_config.no_hugetlbfs == 0) {
+               /* rte_config isn't initialized yet */
+               ret = internal_config.process_type == RTE_PROC_PRIMARY ?
+                               eal_hugepage_info_init() :
+                               eal_hugepage_info_read();
+               if (ret < 0) {
+                       rte_eal_init_alert("Cannot get hugepage information.");
+                       rte_errno = EACCES;
+                       rte_atomic32_clear(&run_once);
+                       return -1;
+               }
+       }
 
        if (internal_config.memory == 0 && internal_config.force_sockets == 0) {
                if (internal_config.no_hugetlbfs)
                        internal_config.memory = MEMSIZE_IF_NO_HUGE_PAGE;
-               else
-                       internal_config.memory = eal_get_hugepage_mem_size();
        }
 
        if (internal_config.vmware_tsc_map == 1) {
@@ -819,66 +833,78 @@ rte_eal_init(int argc, char **argv)
 
        rte_srand(rte_rdtsc());
 
-       rte_config_init();
-
-       if (rte_eal_iopl_init() == 0)
-               rte_config.flags |= EAL_FLG_HIGH_IOPL;
-
-       if (rte_eal_pci_init() < 0)
-               rte_panic("Cannot init PCI\n");
+       if (rte_eal_log_init(logid, internal_config.syslog_facility) < 0) {
+               rte_eal_init_alert("Cannot init logging.");
+               rte_errno = ENOMEM;
+               rte_atomic32_clear(&run_once);
+               return -1;
+       }
 
-#ifdef RTE_LIBRTE_IVSHMEM
-       if (rte_eal_ivshmem_init() < 0)
-               rte_panic("Cannot init IVSHMEM\n");
+#ifdef VFIO_PRESENT
+       if (rte_eal_vfio_setup() < 0) {
+               rte_eal_init_alert("Cannot init VFIO\n");
+               rte_errno = EAGAIN;
+               rte_atomic32_clear(&run_once);
+               return -1;
+       }
 #endif
+       /* in secondary processes, memory init may allocate additional fbarrays
+        * not present in primary processes, so to avoid any potential issues,
+        * initialize memzones first.
+        */
+       if (rte_eal_memzone_init() < 0) {
+               rte_eal_init_alert("Cannot init memzone\n");
+               rte_errno = ENODEV;
+               return -1;
+       }
 
-       if (rte_eal_memory_init() < 0)
-               rte_panic("Cannot init memory\n");
+       if (rte_eal_memory_init() < 0) {
+               rte_eal_init_alert("Cannot init memory\n");
+               rte_errno = ENOMEM;
+               return -1;
+       }
 
        /* the directories are locked during eal_hugepage_info_init */
        eal_hugedirs_unlock();
 
-       if (rte_eal_memzone_init() < 0)
-               rte_panic("Cannot init memzone\n");
-
-       if (rte_eal_tailqs_init() < 0)
-               rte_panic("Cannot init tail queues for objects\n");
-
-#ifdef RTE_LIBRTE_IVSHMEM
-       if (rte_eal_ivshmem_obj_init() < 0)
-               rte_panic("Cannot init IVSHMEM objects\n");
-#endif
-
-       if (rte_eal_log_init(logid, internal_config.syslog_facility) < 0)
-               rte_panic("Cannot init logs\n");
+       if (rte_eal_malloc_heap_init() < 0) {
+               rte_eal_init_alert("Cannot init malloc heap\n");
+               rte_errno = ENODEV;
+               return -1;
+       }
 
-       if (rte_eal_alarm_init() < 0)
-               rte_panic("Cannot init interrupt-handling thread\n");
+       if (rte_eal_tailqs_init() < 0) {
+               rte_eal_init_alert("Cannot init tail queues for objects\n");
+               rte_errno = EFAULT;
+               return -1;
+       }
 
-       if (rte_eal_intr_init() < 0)
-               rte_panic("Cannot init interrupt-handling thread\n");
+       if (rte_eal_alarm_init() < 0) {
+               rte_eal_init_alert("Cannot init interrupt-handling thread\n");
+               /* rte_eal_alarm_init sets rte_errno on failure. */
+               return -1;
+       }
 
-       if (rte_eal_timer_init() < 0)
-               rte_panic("Cannot init HPET or TSC timers\n");
+       if (rte_eal_timer_init() < 0) {
+               rte_eal_init_alert("Cannot init HPET or TSC timers\n");
+               rte_errno = ENOTSUP;
+               return -1;
+       }
 
        eal_check_mem_on_local_socket();
 
-       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());
-       }
-
        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, sizeof(cpuset));
 
-       if (rte_eal_dev_init(PMD_INIT_PRE_PCI_PROBE) < 0)
-               rte_panic("Cannot init pmd devices\n");
+       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_intr_init() < 0) {
+               rte_eal_init_alert("Cannot init interrupt-handling thread\n");
+               return -1;
+       }
 
        RTE_LCORE_FOREACH_SLAVE(i) {
 
@@ -898,6 +924,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, sizeof(thread_name),
+                       "lcore-slave-%d", i);
+               ret = rte_thread_setname(lcore_config[i].thread_id,
+                                               thread_name);
+               if (ret != 0)
+                       RTE_LOG(DEBUG, EAL,
+                               "Cannot set name for lcore thread\n");
        }
 
        /*
@@ -907,31 +942,112 @@ rte_eal_init(int argc, char **argv)
        rte_eal_mp_remote_launch(sync_func, NULL, SKIP_MASTER);
        rte_eal_mp_wait_lcore();
 
-       /* Probe & Initialize PCI devices */
-       if (rte_eal_pci_probe())
-                       rte_panic("Cannot probe PCI\n");
+       /* initialize services so vdevs register service during bus_probe. */
+       ret = rte_service_init();
+       if (ret) {
+               rte_eal_init_alert("rte_service_init() failed\n");
+               rte_errno = ENOEXEC;
+               return -1;
+       }
+
+       /* Probe all the buses and devices/drivers on them */
+       if (rte_bus_probe()) {
+               rte_eal_init_alert("Cannot probe devices\n");
+               rte_errno = ENOTSUP;
+               return -1;
+       }
+
+#ifdef VFIO_PRESENT
+       /* Register mp action after probe() so that we got enough info */
+       if (rte_vfio_is_enabled("vfio") && vfio_mp_sync_setup() < 0)
+               return -1;
+#endif
 
-       /* Initialize any outstanding devices */
-       if (rte_eal_dev_init(PMD_INIT_POST_PCI_PROBE) < 0)
-               rte_panic("Cannot init pmd devices\n");
+       /* initialize default service/lcore mappings and start running. Ignore
+        * -ENOTSUP, as it indicates no service coremask passed to EAL.
+        */
+       ret = rte_service_start_with_defaults();
+       if (ret < 0 && ret != -ENOTSUP) {
+               rte_errno = ENOEXEC;
+               return -1;
+       }
+
+       rte_eal_mcfg_complete();
 
        return fctret;
 }
 
+int __rte_experimental
+rte_eal_cleanup(void)
+{
+       rte_service_finalize();
+       return 0;
+}
+
 /* get core role */
 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_has_pci(void)
+{
+       return !internal_config.no_pci;
+}
+
+int rte_eal_create_uio_dev(void)
+{
+       return internal_config.create_uio_dev;
+}
+
+enum rte_intr_mode
+rte_eal_vfio_intr_mode(void)
+{
+       return internal_config.vfio_intr_mode;
+}
+
+int
+rte_eal_check_module(const char *module_name)
+{
+       char sysfs_mod_name[PATH_MAX];
+       struct stat st;
+       int n;
+
+       if (NULL == module_name)
+               return -1;
+
+       /* Check if there is sysfs mounted */
+       if (stat("/sys/module", &st) != 0) {
+               RTE_LOG(DEBUG, EAL, "sysfs is not mounted! error %i (%s)\n",
+                       errno, strerror(errno));
+               return -1;
+       }
+
+       /* A module might be built-in, therefore try sysfs */
+       n = snprintf(sysfs_mod_name, PATH_MAX, "/sys/module/%s", module_name);
+       if (n < 0 || n > PATH_MAX) {
+               RTE_LOG(DEBUG, EAL, "Could not format module path\n");
+               return -1;
+       }
+
+       if (stat(sysfs_mod_name, &st) != 0) {
+               RTE_LOG(DEBUG, EAL, "Module %s not found! error %i (%s)\n",
+                       sysfs_mod_name, errno, strerror(errno));
+               return 0;
+       }
+
+       /* Module has been found */
+       return 1;
+}