/*-
* 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
* * 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
#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_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 RTE_EAL_BLACKLIST_SIZE 0x100
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)
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 */
"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"
+ " -v : Display version information on startup\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 <driver><id>[;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"
+ " --"OPT_PCI_BLACKLIST", -b: add a PCI device in black list.\n"
+ " Prevent EAL from using this PCI device. The argument\n"
+ " format is <domain:bus:devid.func>.\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_VDEV": add a virtual device.\n"
+ " The argument format is <driver><id>[,key=val,...]\n"
+ " (ex: --vdev=eth_pcap0,iface=eth2).\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"
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;
}
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)
{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},
{0, 0, 0, 0}
};
internal_config.vmware_tsc_map = 0;
- while ((opt = getopt_long(argc, argvopt, "b:c:m:n:r:v",
+ while ((opt = getopt_long(argc, argvopt, "b:w:c:m:n:r:v",
lgopts, &option_index)) != EOF) {
switch (opt) {
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) {
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");
+ 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;
}
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;
}
return 0;
}
-inline static void
+inline static void
rte_eal_mcfg_complete(void)
{
/* ALL shared mem_config related INIT DONE */
return !internal_config.no_hugetlbfs;
}
-/* Abstraction for port I/0 privilage */
+/* Abstraction for port I/0 privilege */
static int
rte_eal_iopl_init(void)
{
rte_eal_mcfg_complete();
- if (rte_eal_vdev_init() < 0)
- rte_panic("Cannot init virtual devices\n");
+ if (rte_eal_dev_init() < 0)
+ rte_panic("Cannot init pmd devices\n");
RTE_LCORE_FOREACH_SLAVE(i) {
git.droids-corp.org / dpdk.git / blobdiff