From 4bf3fe634a4d9dfce90c4167f3a47d0e2ddf1e64 Mon Sep 17 00:00:00 2001 From: Olivier Matz Date: Fri, 25 Apr 2014 13:59:43 +0200 Subject: [PATCH] devargs: replace --use-device option by --pci-whitelist and --vdev for bsd The bsdapp part was missing in commit cac6d08c8bde2fdb57806c49038187cdb54219a8. This commit splits the "--use-device" option in two new options: - "--pci-whitelist or -w": add a PCI device in the white list - "--vdev": instanciate a new virtual device Signed-off-by: Olivier Matz Acked-by: Neil Horman --- lib/librte_eal/bsdapp/eal/eal.c | 89 ++++++++++++++++++--------------- 1 file changed, 50 insertions(+), 39 deletions(-) diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c index adb9e6e23d..3b2b47f73b 100644 --- a/lib/librte_eal/bsdapp/eal/eal.c +++ b/lib/librte_eal/bsdapp/eal/eal.c @@ -88,7 +88,10 @@ #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 @@ -311,11 +314,17 @@ eal_usage(const char *prgname) " -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_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_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" "\nEAL options for DEBUG use only:\n" @@ -483,33 +492,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) @@ -529,7 +511,9 @@ 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} }; @@ -558,7 +542,7 @@ 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", + while ((opt = getopt_long(argc, argvopt, "b:w:c:m:n:r:v", lgopts, &option_index)) != EOF) { switch (opt) { @@ -570,6 +554,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) { @@ -648,9 +640,28 @@ eal_parse_args(int argc, char **argv) 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; } @@ -715,7 +726,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; } -- 2.20.1