X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_eal%2Fbsdapp%2Feal%2Feal.c;h=58f00fd665d793ef23dd24ef0353fe0490d31178;hb=489a9d6c9f77;hp=adb9e6e23d0e690334aa1ee9e76a745d8f20146f;hpb=c431df41bce3f9d73febea83964b351060f17887;p=dpdk.git diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c index adb9e6e23d..58f00fd665 100644 --- a/lib/librte_eal/bsdapp/eal/eal.c +++ b/lib/librte_eal/bsdapp/eal/eal.c @@ -1,14 +1,14 @@ /*- * BSD LICENSE - * + * * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. * Copyright(c) 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 @@ -18,7 +18,7 @@ * * 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 @@ -66,6 +66,7 @@ #include #include #include +#include #include #include #include @@ -78,41 +79,10 @@ #include "eal_internal_cfg.h" #include "eal_filesystem.h" #include "eal_hugepages.h" - -#define OPT_HUGE_DIR "huge-dir" -#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 RTE_EAL_BLACKLIST_SIZE 0x100 +#include "eal_options.h" #define MEMSIZE_IF_NO_HUGE_PAGE (64ULL * 1024ULL * 1024ULL) -#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; \ - char *end; \ - errno = 0; \ - val = strtoul((in), &end, 16); \ - if (errno != 0 || end[0] != (dlm) || val > (lim)) \ - return (-EINVAL); \ - (fd) = (typeof (fd))val; \ - (in) = end + 1; \ -} - /* Allow the application to print its usage message too if set */ static rte_usage_hook_t rte_application_usage_hook = NULL; /* early configuration structure, when memory config is not mmapped */ @@ -244,7 +214,7 @@ rte_eal_config_attach(void) rte_panic("Cannot open '%s' for rte_mem_config\n", pathname); } - rte_mem_cfg_addr = mmap(NULL, sizeof(*rte_config.mem_config), + rte_mem_cfg_addr = mmap(NULL, sizeof(*rte_config.mem_config), PROT_READ | PROT_WRITE, MAP_SHARED, mem_cfg_fd, 0); close(mem_cfg_fd); if (rte_mem_cfg_addr == MAP_FAILED) @@ -277,8 +247,6 @@ eal_proc_type_detect(void) static void rte_config_init(void) { - /* set the magic in configuration structure */ - rte_config.magic = RTE_MAGIC; 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 */ @@ -301,29 +269,8 @@ rte_config_init(void) static void eal_usage(const char *prgname) { - printf("\nUsage: %s -c COREMASK -n NUM [-m NB] [-r NUM] [-b ]" - "[--proc-type primary|secondary|auto] \n\n" - "EAL options:\n" - " -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" - " (multiple -b options are allowed)\n" - " -m MB : memory to allocate\n" - " -r NUM : force number of memory ranks (don't detect)\n" - " --"OPT_PROC_TYPE" : type of this process\n" - " --"OPT_USE_DEVICE": use the specified ethernet device(s) only.\n" - " The argument format is <[domain:]bus:devid.func> to add\n" - " a PCI device to the white list or [;key=val;...]\n" - " to add a virtual device.\n" - " [NOTE: PCI whitelist cannot be used with -b option]\n" - " --"OPT_VMWARE_TSC_MAP": use VMware TSC map instead of " - "native RDTSC\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_SHCONF": no shared config (mmap'd files)\n" - "\n", - prgname); + printf("\nUsage: %s ", prgname); + eal_common_usage(); /* Allow the application to print its usage message too if hook is set */ if ( rte_application_usage_hook ) { printf("===== Application Usage =====\n\n"); @@ -344,114 +291,6 @@ rte_set_application_usage_hook( rte_usage_hook_t usage_func ) return old_func; } -/* - * Parse the coremask given as argument (hexadecimal string) and fill - * 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(); - int i, j, idx = 0 ; - unsigned count = 0; - char c; - int val; - - 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, sysconf(_SC_ARG_MAX)); - while ((i > 0) && isblank(coremask[i - 1])) - i--; - if (i == 0) - return -1; - - for (i = i - 1; i >= 0 && idx < RTE_MAX_LCORE; i--) { - c = coremask[i]; - if (isxdigit(c) == 0) { - /* invalid characters */ - return (-1); - } - 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; -} - -static int -eal_parse_syslog(const char *facility) -{ - int i; - static struct { - const char *name; - int value; - } map[] = { - { "auth", LOG_AUTH }, - { "cron", LOG_CRON }, - { "daemon", LOG_DAEMON }, - { "ftp", LOG_FTP }, - { "kern", LOG_KERN }, - { "lpr", LOG_LPR }, - { "mail", LOG_MAIL }, - { "news", LOG_NEWS }, - { "syslog", LOG_SYSLOG }, - { "user", LOG_USER }, - { "uucp", LOG_UUCP }, - { "local0", LOG_LOCAL0 }, - { "local1", LOG_LOCAL1 }, - { "local2", LOG_LOCAL2 }, - { "local3", LOG_LOCAL3 }, - { "local4", LOG_LOCAL4 }, - { "local5", LOG_LOCAL5 }, - { "local6", LOG_LOCAL6 }, - { "local7", LOG_LOCAL7 }, - { NULL, 0 } - }; - - for (i = 0; map[i].name; i++) { - if (!strcmp(facility, map[i].name)) { - internal_config.syslog_facility = map[i].value; - return 0; - } - } - return -1; -} - static inline size_t eal_get_hugepage_mem_size(void) { @@ -470,46 +309,6 @@ eal_get_hugepage_mem_size(void) return (size < SIZE_MAX) ? (size_t)(size) : SIZE_MAX; } -static enum rte_proc_type_t -eal_parse_proc_type(const char *arg) -{ - if (strncasecmp(arg, "primary", sizeof("primary")) == 0) - return RTE_PROC_PRIMARY; - if (strncasecmp(arg, "secondary", sizeof("secondary")) == 0) - return RTE_PROC_SECONDARY; - if (strncasecmp(arg, "auto", sizeof("auto")) == 0) - return RTE_PROC_AUTO; - - return RTE_PROC_INVALID; -} - -static int -eal_parse_use_device(const char *optarg) -{ - struct rte_pci_addr addr; - char *dup, *sep; - - dup = strdup(optarg); - if (dup == NULL) - return -1; - - /* remove arguments in 'dup' string */ - sep = strchr(dup, ','); - if (sep != NULL) - *sep = '\0'; - - /* if argument is a PCI address, it's a whitelisted device */ - if (eal_parse_pci_DomBDF(dup, &addr) == 0 || - eal_parse_pci_BDF(dup, &addr) == 0) { - rte_eal_devargs_add(RTE_DEVTYPE_WHITELISTED_PCI, optarg); - } else { - rte_eal_devargs_add(RTE_DEVTYPE_VIRTUAL, optarg); - } - - free(dup); - return 0; -} - /* Parse the argument given in the command line of the application */ static int eal_parse_args(int argc, char **argv) @@ -519,20 +318,6 @@ eal_parse_args(int argc, char **argv) int option_index; int coremask_ok = 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}, - {0, 0, 0, 0} - }; argvopt = argv; @@ -543,6 +328,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; #ifdef RTE_LIBEAL_USE_HPET internal_config.no_hpet = 0; #else @@ -558,114 +345,51 @@ eal_parse_args(int argc, char **argv) internal_config.vmware_tsc_map = 0; - while ((opt = getopt_long(argc, argvopt, "b:c:m:n:r:v", - lgopts, &option_index)) != EOF) { + while ((opt = getopt_long(argc, argvopt, eal_short_options, + eal_long_options, &option_index)) != EOF) { - switch (opt) { - /* blacklist */ - case 'b': - if (rte_eal_devargs_add(RTE_DEVTYPE_BLACKLISTED_PCI, - optarg) < 0) { - eal_usage(prgname); - return (-1); - } - break; - /* coremask */ - case 'c': - if (eal_parse_coremask(optarg) < 0) { - RTE_LOG(ERR, EAL, "invalid coremask\n"); - eal_usage(prgname); - return -1; - } - coremask_ok = 1; - break; - /* size of memory */ - case 'm': - internal_config.memory = atoi(optarg); - internal_config.memory *= 1024ULL; - internal_config.memory *= 1024ULL; - break; - /* force number of channels */ - case 'n': - internal_config.force_nchannel = atoi(optarg); - if (internal_config.force_nchannel == 0 || - internal_config.force_nchannel > 4) { - RTE_LOG(ERR, EAL, "invalid channel number\n"); - eal_usage(prgname); - return -1; - } - break; - /* force number of ranks */ - case 'r': - internal_config.force_nrank = atoi(optarg); - if (internal_config.force_nrank == 0 || - internal_config.force_nrank > 16) { - RTE_LOG(ERR, EAL, "invalid rank number\n"); - eal_usage(prgname); - return -1; - } - break; - case 'v': - /* since message is explicitly requested by user, we - * write message at highest log level so it can always be seen - * even if info or warning messages are disabled */ - RTE_LOG(CRIT, EAL, "RTE Version: '%s'\n", rte_version()); - break; + int ret; + /* getopt is not happy, stop right now */ + if (opt == '?') + return -1; + + ret = eal_parse_common_option(opt, optarg, option_index, + &internal_config); + /* common parser is not happy */ + if (ret < 0) { + eal_usage(prgname); + return -1; + } + /* 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; + continue; + } + + switch (opt) { /* long options */ case 0: - if (!strcmp(lgopts[option_index].name, OPT_NO_HUGE)) { - internal_config.no_hugetlbfs = 1; - } - 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; - } - else if (!strcmp(lgopts[option_index].name, OPT_HUGE_DIR)) { - RTE_LOG(ERR, EAL, "Option "OPT_HUGE_DIR" is not supported on" - "FreeBSD\n"); - return -1; - } - else if (!strcmp(lgopts[option_index].name, OPT_PROC_TYPE)) { - internal_config.process_type = eal_parse_proc_type(optarg); - } - else if (!strcmp(lgopts[option_index].name, OPT_FILE_PREFIX)) { - RTE_LOG(ERR, EAL, "Option "OPT_FILE_PREFIX" is not supported on" - "FreeBSD\n"); - return -1; - } - else if (!strcmp(lgopts[option_index].name, OPT_SOCKET_MEM)) { - RTE_LOG(ERR, EAL, "Option "OPT_SOCKET_MEM" is not supported on" - "FreeBSD\n"); + { + RTE_LOG(ERR, EAL, "Option %s is not supported " + "on FreeBSD\n", + eal_long_options[option_index].name); + eal_usage(prgname); return -1; } - else if (!strcmp(lgopts[option_index].name, OPT_USE_DEVICE)) { - if (eal_parse_use_device(optarg) < 0) { - RTE_LOG(ERR, EAL, "invalid parameters for --" - OPT_USE_DEVICE "\n"); - eal_usage(prgname); - return -1; - } - } - else if (!strcmp(lgopts[option_index].name, OPT_SYSLOG)) { - if (eal_parse_syslog(optarg) < 0) { - RTE_LOG(ERR, EAL, "invalid parameters for --" - OPT_SYSLOG "\n"); - eal_usage(prgname); - return -1; - } - } break; default: + if (isprint(opt)) { + RTE_LOG(ERR, EAL, "Option %c is not supported " + "on FreeBSD\n", opt); + } else { + RTE_LOG(ERR, EAL, "Option %d is not supported " + "on FreeBSD\n", opt); + } eal_usage(prgname); return -1; } @@ -715,7 +439,7 @@ eal_parse_args(int argc, char **argv) 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 " - "[--use-device] options cannot be used at the same time\n"); + "[-w] options cannot be used at the same time\n"); eal_usage(prgname); return -1; } @@ -758,7 +482,7 @@ sync_func(__attribute__((unused)) void *arg) return 0; } -inline static void +inline static void rte_eal_mcfg_complete(void) { /* ALL shared mem_config related INIT DONE */ @@ -772,7 +496,7 @@ int rte_eal_has_hugepages(void) return !internal_config.no_hugetlbfs; } -/* Abstraction for port I/0 privilage */ +/* Abstraction for port I/0 privilege */ static int rte_eal_iopl_init(void) { @@ -803,6 +527,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 && eal_hugepage_info_init() < 0) @@ -867,8 +594,8 @@ rte_eal_init(int argc, char **argv) rte_eal_mcfg_complete(); - if (rte_eal_vdev_init() < 0) - rte_panic("Cannot init virtual devices\n"); + if (rte_eal_dev_init(PMD_INIT_PRE_PCI_PROBE) < 0) + rte_panic("Cannot init pmd devices\n"); RTE_LCORE_FOREACH_SLAVE(i) { @@ -899,6 +626,14 @@ 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 any outstanding devices */ + if (rte_eal_dev_init(PMD_INIT_POST_PCI_PROBE) < 0) + rte_panic("Cannot init pmd devices\n"); + return fctret; }