X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_eal%2Flinuxapp%2Feal%2Feal.c;h=9ff2a443e96c40d7d5b97e6ef062f6fcd4c38135;hb=894f5cc4411e1d853f80af4db6c74c1ec413f992;hp=c0e50f9b788a3fc351650c9ceb9679840075f29c;hpb=04210699eeeb4f06b58940b593f1fa6ab265ac02;p=dpdk.git diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c index c0e50f9b78..9ff2a443e9 100644 --- a/lib/librte_eal/linuxapp/eal/eal.c +++ b/lib/librte_eal/linuxapp/eal/eal.c @@ -1,35 +1,35 @@ /*- * BSD LICENSE * - * Copyright(c) 2010-2013 Intel Corporation. All rights reserved. + * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. + * Copyright(c) 2012-2013 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 + * 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 + * * 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 + * * 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 + * * 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 + * 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. - * */ #include @@ -42,12 +42,15 @@ #include #include #include +#include +#include #include #include #include #include #include #include +#include #include #include @@ -70,6 +73,7 @@ #include #include #include +#include #include "eal_private.h" #include "eal_thread.h" @@ -81,11 +85,15 @@ #define OPT_PROC_TYPE "proc-type" #define OPT_NO_SHCONF "no-shconf" #define OPT_NO_HPET "no-hpet" +#define OPT_VMWARE_TSC_MAP "vmware-tsc-map" #define OPT_NO_PCI "no-pci" #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_SYSLOG "syslog" +#define OPT_BASE_VIRTADDR "base-virtaddr" +#define OPT_XEN_DOM0 "xen-dom0" #define RTE_EAL_BLACKLIST_SIZE 0x100 @@ -93,6 +101,10 @@ #define SOCKET_MEM_STRLEN (RTE_MAX_NUMA_NODES * 10) +#define HIGHEST_RPL 3 + +#define BITS_PER_HEX 4 + #define GET_BLACKLIST_FIELD(in, fd, lim, dlm) \ { \ unsigned long val; \ @@ -107,6 +119,21 @@ /* 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; @@ -134,6 +161,9 @@ struct lcore_config lcore_config[RTE_MAX_LCORE]; /* internal configuration */ struct internal_config internal_config; +/* used by rte_rdtsc() */ +int rte_cycles_vmware_tsc_map; + /* Return a pointer to the configuration structure */ struct rte_config * rte_eal_get_configuration(void) @@ -297,13 +327,13 @@ eal_hugedirs_unlock(void) for (i = 0; i < MAX_HUGEPAGE_SIZES; i++) { /* skip uninitialized */ - if (internal_config.hugepage_info[i].lock_descriptor == 0) + if (internal_config.hugepage_info[i].lock_descriptor < 0) continue; /* unlock hugepage file */ flock(internal_config.hugepage_info[i].lock_descriptor, LOCK_UN); close(internal_config.hugepage_info[i].lock_descriptor); /* reset the field */ - internal_config.hugepage_info[i].lock_descriptor = 0; + internal_config.hugepage_info[i].lock_descriptor = -1; } } @@ -317,22 +347,32 @@ eal_usage(const char *prgname) " -c COREMASK : A hexadecimal bitmask of cores to run on\n" " -n NUM : Number of memory channels\n" " -v : Display version information on startup\n" + " -d LIB.so : add driver (can be used multiple times)\n" " -b : to prevent EAL from using specified " "PCI device\n" " (multiple -b options are allowed)\n" " -m MB : memory to allocate (see also --"OPT_SOCKET_MEM")\n" " -r NUM : force number of memory ranks (don't detect)\n" + " --"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" " sockets (use comma separated values)\n" " --"OPT_HUGE_DIR" : directory where hugetlbfs is mounted\n" " --"OPT_PROC_TYPE" : type of this process\n" " --"OPT_FILE_PREFIX": prefix for hugepage filenames\n" + " --"OPT_USE_DEVICE": use the specified ethernet device(s) only. " + "Use comma-separate <[domain:]bus:devid.func> values.\n" + " [NOTE: Cannot be used with -b option]\n" + " --"OPT_VMWARE_TSC_MAP": use VMware TSC map instead of " + "native RDTSC\n" + " --"OPT_BASE_VIRTADDR": specify base virtual address\n" "\nEAL options for DEBUG use only:\n" " --"OPT_NO_HUGE" : use malloc instead of hugetlbfs\n" " --"OPT_NO_PCI" : disable pci\n" " --"OPT_NO_HPET" : disable hpet\n" - " --"OPT_NO_SHCONF": no shared config (mmap'd files)\n\n", + " --"OPT_NO_SHCONF": no shared config (mmap'd files)\n" + "\n", prgname); /* Allow the application to print its usage message too if hook is set */ if ( rte_application_usage_hook ) { @@ -359,33 +399,67 @@ rte_set_application_usage_hook( rte_usage_hook_t usage_func ) * the global configuration (core role and core count) with the parsed * value. */ +static int xdigit2val(unsigned char c) +{ + int val; + if(isdigit(c)) + val = c - '0'; + else if(isupper(c)) + val = c - 'A' + 10; + else + val = c - 'a' + 10; + return val; +} static int eal_parse_coremask(const char *coremask) { struct rte_config *cfg = rte_eal_get_configuration(); - unsigned i; - char *end = NULL; - unsigned long long cm; + int i, j, idx = 0 ; unsigned count = 0; + char c; + int val; - /* parse hexadecimal string */ - cm = strtoull(coremask, &end, 16); - if ((coremask[0] == '\0') || (end == NULL) || (*end != '\0') || (cm == 0)) + if (coremask == NULL) + return -1; + /* Remove all blank characters ahead and after . + * Remove 0x/0X if exists. + */ + while (isblank(*coremask)) + coremask++; + if (coremask[0] == '0' && ((coremask[1] == 'x') + || (coremask[1] == 'X')) ) + coremask += 2; + i = strnlen(coremask, PATH_MAX); + while ((i > 0) && isblank(coremask[i - 1])) + i--; + if (i == 0) return -1; - RTE_LOG(DEBUG, EAL, "coremask set to %llx\n", cm); - /* set core role and core count */ - for (i = 0; i < RTE_MAX_LCORE; i++) { - if ((1ULL << i) & cm) { - if (count == 0) - cfg->master_lcore = i; - cfg->lcore_role[i] = ROLE_RTE; - count++; + for (i = i - 1; i >= 0 && idx < RTE_MAX_LCORE; i--) { + c = coremask[i]; + if (isxdigit(c) == 0) { + /* invalid characters */ + return (-1); } - else { - cfg->lcore_role[i] = ROLE_OFF; + val = xdigit2val(c); + for(j = 0; j < BITS_PER_HEX && idx < RTE_MAX_LCORE; j++, idx++) { + if((1 << j) & val) { + cfg->lcore_role[idx] = ROLE_RTE; + if(count == 0) + cfg->master_lcore = idx; + count++; + } else { + cfg->lcore_role[idx] = ROLE_OFF; + } } } + for(; i >= 0; i--) + if(coremask[i] != '0') + return -1; + for(; idx < RTE_MAX_LCORE; idx++) + cfg->lcore_role[idx] = ROLE_OFF; + if(count == 0) + return -1; return 0; } @@ -478,6 +552,31 @@ eal_parse_socket_mem(char *socket_mem) return 0; } +static int +eal_parse_base_virtaddr(const char *arg) +{ + char *end; + uint64_t addr; + + addr = strtoull(arg, &end, 16); + + /* check for errors */ + if ((errno != 0) || (arg[0] == '\0') || end == NULL || (*end != '\0')) + return -1; + + /* make sure we don't exceed 32-bit boundary on 32-bit target */ +#ifndef RTE_ARCH_X86_64 + if (addr >= UINTPTR_MAX) + return -1; +#endif + + /* align the addr on 2M boundary */ + addr = RTE_PTR_ALIGN_CEIL(addr, RTE_PGSIZE_2M); + + internal_config.base_virtaddr = (uintptr_t) addr; + return 0; +} + static inline size_t eal_get_hugepage_mem_size(void) { @@ -509,28 +608,15 @@ eal_parse_proc_type(const char *arg) return RTE_PROC_INVALID; } -static int -eal_parse_blacklist(const char *input, struct rte_pci_addr *dev2bl) -{ - GET_BLACKLIST_FIELD(input, dev2bl->domain, UINT16_MAX, ':'); - GET_BLACKLIST_FIELD(input, dev2bl->bus, UINT8_MAX, ':'); - GET_BLACKLIST_FIELD(input, dev2bl->devid, UINT8_MAX, '.'); - GET_BLACKLIST_FIELD(input, dev2bl->function, UINT8_MAX, 0); - return (0); -} - static ssize_t eal_parse_blacklist_opt(const char *optarg, size_t idx) { if (idx >= sizeof (eal_dev_blacklist) / sizeof (eal_dev_blacklist[0])) { - RTE_LOG(ERR, EAL, - "%s - too many devices to blacklist...\n", - optarg); + RTE_LOG(ERR, EAL, "%s - too many devices to blacklist...\n", optarg); return (-EINVAL); - } else if (eal_parse_blacklist(optarg, eal_dev_blacklist + idx) != 0) { - RTE_LOG(ERR, EAL, - "%s - invalid device to blacklist...\n", - optarg); + } else if (eal_parse_pci_DomBDF(optarg, eal_dev_blacklist + idx) < 0 && + eal_parse_pci_BDF(optarg, eal_dev_blacklist + idx) < 0) { + RTE_LOG(ERR, EAL, "%s - invalid device to blacklist...\n", optarg); return (-EINVAL); } @@ -538,7 +624,6 @@ eal_parse_blacklist_opt(const char *optarg, size_t idx) return (idx); } - /* Parse the argument given in the command line of the application */ static int eal_parse_args(int argc, char **argv) @@ -547,20 +632,25 @@ eal_parse_args(int argc, char **argv) char **argvopt; int option_index; int coremask_ok = 0; - ssize_t blacklist_index = 0;; + ssize_t blacklist_index = 0; char *prgname = argv[0]; static struct option lgopts[] = { {OPT_NO_HUGE, 0, 0, 0}, {OPT_NO_PCI, 0, 0, 0}, {OPT_NO_HPET, 0, 0, 0}, + {OPT_VMWARE_TSC_MAP, 0, 0, 0}, {OPT_HUGE_DIR, 1, 0, 0}, {OPT_NO_SHCONF, 0, 0, 0}, {OPT_PROC_TYPE, 1, 0, 0}, {OPT_FILE_PREFIX, 1, 0, 0}, {OPT_SOCKET_MEM, 1, 0, 0}, + {OPT_USE_DEVICE, 1, 0, 0}, {OPT_SYSLOG, 1, NULL, 0}, + {OPT_BASE_VIRTADDR, 1, 0, 0}, + {OPT_XEN_DOM0, 0, 0, 0}, {0, 0, 0, 0} }; + struct shared_driver *solib; argvopt = argv; @@ -571,6 +661,7 @@ eal_parse_args(int argc, char **argv) internal_config.hugepage_dir = NULL; internal_config.force_sockets = 0; internal_config.syslog_facility = LOG_DAEMON; + internal_config.xen_dom0_support = 0; #ifdef RTE_LIBEAL_USE_HPET internal_config.no_hpet = 0; #else @@ -582,9 +673,12 @@ eal_parse_args(int argc, char **argv) /* zero out hugedir descriptors */ for (i = 0; i < MAX_HUGEPAGE_SIZES; i++) - internal_config.hugepage_info[i].lock_descriptor = 0; + internal_config.hugepage_info[i].lock_descriptor = -1; + + internal_config.vmware_tsc_map = 0; + internal_config.base_virtaddr = 0; - while ((opt = getopt_long(argc, argvopt, "b:c:m:n:r:v", + while ((opt = getopt_long(argc, argvopt, "b:c:d:m:n:r:v", lgopts, &option_index)) != EOF) { switch (opt) { @@ -605,6 +699,18 @@ eal_parse_args(int argc, char **argv) } coremask_ok = 1; break; + /* 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; /* size of memory */ case 'm': internal_config.memory = atoi(optarg); @@ -643,12 +749,25 @@ eal_parse_args(int argc, char **argv) if (!strcmp(lgopts[option_index].name, OPT_NO_HUGE)) { internal_config.no_hugetlbfs = 1; } + if (!strcmp(lgopts[option_index].name, OPT_XEN_DOM0)) { + #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 + } else if (!strcmp(lgopts[option_index].name, OPT_NO_PCI)) { internal_config.no_pci = 1; } else if (!strcmp(lgopts[option_index].name, OPT_NO_HPET)) { internal_config.no_hpet = 1; } + else if (!strcmp(lgopts[option_index].name, OPT_VMWARE_TSC_MAP)) { + internal_config.vmware_tsc_map = 1; + } else if (!strcmp(lgopts[option_index].name, OPT_NO_SHCONF)) { internal_config.no_shconf = 1; } @@ -669,6 +788,9 @@ eal_parse_args(int argc, char **argv) return -1; } } + else if (!strcmp(lgopts[option_index].name, OPT_USE_DEVICE)) { + eal_dev_whitelist_add_entry(optarg); + } else if (!strcmp(lgopts[option_index].name, OPT_SYSLOG)) { if (eal_parse_syslog(optarg) < 0) { RTE_LOG(ERR, EAL, "invalid parameters for --" @@ -677,6 +799,14 @@ eal_parse_args(int argc, char **argv) return -1; } } + else if (!strcmp(lgopts[option_index].name, OPT_BASE_VIRTADDR)) { + if (eal_parse_base_virtaddr(optarg) < 0) { + RTE_LOG(ERR, EAL, "invalid parameter for --" + OPT_BASE_VIRTADDR "\n"); + eal_usage(prgname); + return -1; + } + } break; default: @@ -725,9 +855,28 @@ eal_parse_args(int argc, char **argv) eal_usage(prgname); return -1; } - - if (blacklist_index > 0) + /* --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 no blacklist, parse a whitelist */ + if (blacklist_index > 0) { + if (eal_dev_whitelist_exists()) { + RTE_LOG(ERR, EAL, "Error: blacklist [-b] and whitelist " + "[--use-device] options cannot be used at the same time\n"); + eal_usage(prgname); + return -1; + } rte_eal_pci_set_blacklist(eal_dev_blacklist, blacklist_index); + } else { + if (eal_dev_whitelist_exists() && eal_dev_whitelist_parse() < 0) { + RTE_LOG(ERR,EAL, "Error parsing whitelist[--use-device] options\n"); + return -1; + } + } if (optind >= 0) argv[optind-1] = prgname; @@ -775,6 +924,15 @@ rte_eal_mcfg_complete(void) rte_config.mem_config->magic = RTE_MAGIC; } +/* + * Request iopl priviledge for all RPL, returns 0 on success + */ +static int +rte_eal_iopl_init(void) +{ + return iopl(HIGHEST_RPL); +} + /* Launch threads, called at application init(). */ int rte_eal_init(int argc, char **argv) @@ -782,14 +940,11 @@ 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); - const char *logid; + struct shared_driver *solib = NULL; if (!rte_atomic32_test_and_set(&run_once)) return -1; - logid = strrchr(argv[0], '/'); - logid = strdup(logid ? logid + 1: argv[0]); - thread_id = pthread_self(); if (rte_eal_log_early_init() < 0) @@ -801,6 +956,7 @@ rte_eal_init(int argc, char **argv) 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"); @@ -811,13 +967,35 @@ rte_eal_init(int argc, char **argv) internal_config.memory = eal_get_hugepage_mem_size(); } + if (internal_config.vmware_tsc_map == 1) { +#ifdef RTE_LIBRTE_EAL_VMWARE_TSC_MAP_SUPPORT + rte_cycles_vmware_tsc_map = 1; + RTE_LOG (DEBUG, EAL, "Using VMWARE TSC MAP, " + "you must have monitor_control.pseudo_perfctr = TRUE\n"); +#else + RTE_LOG (WARNING, EAL, "Ignoring --vmware-tsc-map because " + "RTE_LIBRTE_EAL_VMWARE_TSC_MAP_SUPPORT is not set\n"); +#endif + } + rte_srand(rte_rdtsc()); rte_config_init(); + + if (rte_eal_iopl_init() == 0) + rte_config.flags |= EAL_FLG_HIGH_IOPL; if (rte_eal_cpu_init() < 0) rte_panic("Cannot detect lcores\n"); + if (rte_eal_pci_init() < 0) + rte_panic("Cannot init PCI\n"); + +#ifdef RTE_LIBRTE_IVSHMEM + if (rte_eal_ivshmem_init() < 0) + rte_panic("Cannot init IVSHMEM\n"); +#endif + if (rte_eal_memory_init() < 0) rte_panic("Cannot init memory\n"); @@ -830,7 +1008,12 @@ rte_eal_init(int argc, char **argv) if (rte_eal_tailqs_init() < 0) rte_panic("Cannot init tail queues for objects\n"); - if (rte_eal_log_init(logid, internal_config.syslog_facility) < 0) +#ifdef RTE_LIBRTE_IVSHMEM + if (rte_eal_ivshmem_obj_init() < 0) + rte_panic("Cannot init IVSHMEM objects\n"); +#endif + + if (rte_eal_log_init(argv[0], internal_config.syslog_facility) < 0) rte_panic("Cannot init logs\n"); if (rte_eal_alarm_init() < 0) @@ -839,19 +1022,31 @@ rte_eal_init(int argc, char **argv) if (rte_eal_intr_init() < 0) rte_panic("Cannot init interrupt-handling thread\n"); - if (rte_eal_hpet_init() < 0) - rte_panic("Cannot init HPET\n"); - - if (rte_eal_pci_init() < 0) - rte_panic("Cannot init PCI\n"); - - RTE_LOG(DEBUG, EAL, "Master core %u is ready (tid=%x)\n", - rte_config.master_lcore, (int)thread_id); + if (rte_eal_timer_init() < 0) + rte_panic("Cannot init HPET or TSC timers\n"); eal_check_mem_on_local_socket(); rte_eal_mcfg_complete(); + if (rte_eal_non_pci_ethdev_init() < 0) + rte_panic("Cannot init non-PCI eth_devs\n"); + + TAILQ_FOREACH(solib, &solib_list, next) { + solib->lib_handle = dlopen(solib->name, RTLD_NOW); + if ((solib->lib_handle == NULL) && (solib->name[0] != '/')) { + /* relative path: try again with "./" prefix */ + char sopath[PATH_MAX]; + snprintf(sopath, sizeof(sopath), "./%s", solib->name); + solib->lib_handle = dlopen(sopath, RTLD_NOW); + } + if (solib->lib_handle == NULL) + RTE_LOG(WARNING, EAL, "%s\n", dlerror()); + } + + RTE_LOG(DEBUG, EAL, "Master core %u is ready (tid=%x)\n", + rte_config.master_lcore, (int)thread_id); + RTE_LCORE_FOREACH_SLAVE(i) { /*