X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_eal%2Flinuxapp%2Feal%2Feal.c;h=6994303a1eec9afa07e2d5e062a201eb874982a4;hb=629395b063e8278a05ea41908d1152fa68df098c;hp=f5f02e96baf4192f7c2943a96f195684f1bdea1f;hpb=a8b97e3a1db0a9366d58811411b904e4fef8160f;p=dpdk.git diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c index f5f02e96ba..6994303a1e 100644 --- a/lib/librte_eal/linuxapp/eal/eal.c +++ b/lib/librte_eal/linuxapp/eal/eal.c @@ -1,14 +1,14 @@ /*- * 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 @@ -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 @@ -92,10 +92,14 @@ #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_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 @@ -253,7 +257,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) @@ -286,8 +290,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 */ @@ -336,9 +338,6 @@ eal_usage(const char *prgname) " -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 " @@ -349,14 +348,21 @@ eal_usage(const char *prgname) " --"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.\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" + " --"OPT_PCI_BLACKLIST", -b: add a PCI device in black list.\n" + " Prevent EAL from using this PCI device. The argument\n" + " format is .\n" + " --"OPT_PCI_WHITELIST", -w: add a PCI device in white list.\n" + " Only use the specified PCI devices. The argument format\n" + " is <[domain:]bus:devid.func>. This option can be present\n" + " several times (once per 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" + " --"OPT_VDEV": add a virtual device.\n" + " The argument format is [,key=val,...]\n" + " (ex: --vdev=eth_pcap0,iface=eth2).\n" + " --"OPT_VMWARE_TSC_MAP": use VMware TSC map instead of native RDTSC\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" "\nEAL options for DEBUG use only:\n" " --"OPT_NO_HUGE" : use malloc instead of hugetlbfs\n" @@ -393,11 +399,11 @@ rte_set_application_usage_hook( rte_usage_hook_t usage_func ) static int xdigit2val(unsigned char c) { int val; - if(isdigit(c)) + if(isdigit(c)) val = c - '0'; else if(isupper(c)) val = c - 'A' + 10; - else + else val = c - 'a' + 10; return val; } @@ -435,6 +441,11 @@ eal_parse_coremask(const char *coremask) val = xdigit2val(c); for(j = 0; j < BITS_PER_HEX && idx < RTE_MAX_LCORE; j++, idx++) { if((1 << j) & val) { + if (!lcore_config[idx].detected) { + RTE_LOG(ERR, EAL, "lcore %u " + "unavailable\n", idx); + return -1; + } cfg->lcore_role[idx] = ROLE_RTE; if(count == 0) cfg->master_lcore = idx; @@ -570,6 +581,28 @@ eal_parse_base_virtaddr(const char *arg) return 0; } +static int +eal_parse_vfio_intr(const char *mode) +{ + unsigned i; + static struct { + const char *name; + enum rte_intr_mode value; + } map[] = { + { "legacy", RTE_INTR_MODE_LEGACY }, + { "msi", RTE_INTR_MODE_MSI }, + { "msix", RTE_INTR_MODE_MSIX }, + }; + + for (i = 0; i < RTE_DIM(map); i++) { + if (!strcmp(mode, map[i].name)) { + internal_config.vfio_intr_mode = map[i].value; + return 0; + } + } + return -1; +} + static inline size_t eal_get_hugepage_mem_size(void) { @@ -601,33 +634,6 @@ eal_parse_proc_type(const char *arg) 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) @@ -647,8 +653,11 @@ eal_parse_args(int argc, char **argv) {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_PCI_WHITELIST, 1, 0, 0}, + {OPT_PCI_BLACKLIST, 1, 0, 0}, + {OPT_VDEV, 1, 0, 0}, {OPT_SYSLOG, 1, NULL, 0}, + {OPT_VFIO_INTR, 1, NULL, 0}, {OPT_BASE_VIRTADDR, 1, 0, 0}, {OPT_XEN_DOM0, 0, 0, 0}, {OPT_CREATE_UIO_DEV, 1, NULL, 0}, @@ -666,6 +675,8 @@ eal_parse_args(int argc, char **argv) internal_config.force_sockets = 0; internal_config.syslog_facility = LOG_DAEMON; 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 @@ -682,7 +693,7 @@ eal_parse_args(int argc, char **argv) internal_config.vmware_tsc_map = 0; internal_config.base_virtaddr = 0; - while ((opt = getopt_long(argc, argvopt, "b:c:d:m:n:r:v", + while ((opt = getopt_long(argc, argvopt, "b:w:c:d:m:n:r:v", lgopts, &option_index)) != EOF) { switch (opt) { @@ -694,6 +705,14 @@ eal_parse_args(int argc, char **argv) return (-1); } break; + /* whitelist */ + case 'w': + if (rte_eal_devargs_add(RTE_DEVTYPE_WHITELISTED_PCI, + optarg) < 0) { + eal_usage(prgname); + return -1; + } + break; /* coremask */ case 'c': if (eal_parse_coremask(optarg) < 0) { @@ -761,7 +780,7 @@ eal_parse_args(int argc, char **argv) "running on Dom0, please configure" " RTE_LIBRTE_XEN_DOM0=y\n"); return -1; - #endif + #endif } else if (!strcmp(lgopts[option_index].name, OPT_NO_PCI)) { internal_config.no_pci = 1; @@ -793,9 +812,28 @@ eal_parse_args(int argc, char **argv) } } 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"); + 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) { + eal_usage(prgname); + return -1; + } + } + else if (!strcmp(lgopts[option_index].name, OPT_PCI_WHITELIST)) { + if (rte_eal_devargs_add(RTE_DEVTYPE_WHITELISTED_PCI, + optarg) < 0) { + eal_usage(prgname); + return -1; + } + } + else if (!strcmp(lgopts[option_index].name, OPT_VDEV)) { + if (rte_eal_devargs_add(RTE_DEVTYPE_VIRTUAL, + optarg) < 0) { eal_usage(prgname); return -1; } @@ -816,6 +854,14 @@ eal_parse_args(int argc, char **argv) return -1; } } + else if (!strcmp(lgopts[option_index].name, OPT_VFIO_INTR)) { + if (eal_parse_vfio_intr(optarg) < 0) { + RTE_LOG(ERR, EAL, "invalid parameters for --" + OPT_VFIO_INTR "\n"); + eal_usage(prgname); + return -1; + } + } else if (!strcmp(lgopts[option_index].name, OPT_CREATE_UIO_DEV)) { internal_config.create_uio_dev = 1; } @@ -878,7 +924,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; } @@ -921,7 +967,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 */ @@ -930,7 +976,7 @@ rte_eal_mcfg_complete(void) } /* - * Request iopl priviledge for all RPL, returns 0 on success + * Request iopl privilege for all RPL, returns 0 on success */ static int rte_eal_iopl_init(void) @@ -996,7 +1042,7 @@ rte_eal_init(int argc, char **argv) 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"); @@ -1010,7 +1056,7 @@ rte_eal_init(int argc, char **argv) /* the directories are locked during eal_hugepage_info_init */ eal_hugedirs_unlock(); - + if (rte_eal_memzone_init() < 0) rte_panic("Cannot init memzone\n"); @@ -1038,24 +1084,21 @@ rte_eal_init(int argc, char **argv) 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) { + RTE_LOG(INFO, EAL, "open shared lib %s\n", solib->name); 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()); } + 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); + if (rte_eal_dev_init() < 0) + rte_panic("Cannot init pmd devices\n"); + RTE_LCORE_FOREACH_SLAVE(i) { /* @@ -1076,8 +1119,6 @@ rte_eal_init(int argc, char **argv) rte_panic("Cannot create thread\n"); } - eal_thread_init_master(rte_config.master_lcore); - /* * Launch a dummy function on all slave lcores, so that master lcore * knows they are all ready when this function returns.