Replace -w / --pci-whitelist with -a / --allow options
and --pci-blacklist with --block.
The -b short option remains unchanged.
Allow the old options for now, but print a nag
warning since old options are deprecated.
Signed-off-by: Stephen Hemminger <step...@networkplumber.org>
Acked-by: Luca Boccassi <bl...@debian.org>
---
lib/librte_eal/common/eal_common_options.c | 66 +++++++++++++---------
lib/librte_eal/common/eal_options.h | 13 ++++-
2 files changed, 49 insertions(+), 30 deletions(-)
diff --git a/lib/librte_eal/common/eal_common_options.c
b/lib/librte_eal/common/eal_common_options.c
index 7b3341683662..46a1ab8f670d 100644
--- a/lib/librte_eal/common/eal_common_options.c
+++ b/lib/librte_eal/common/eal_common_options.c
@@ -52,7 +52,8 @@
const char
eal_short_options[] =
- "b:" /* pci-blacklist */
+ "a:" /* allow */
+ "b:" /* block */
"c:" /* coremask */
"s:" /* service coremask */
"d:" /* driver */
@@ -63,7 +64,7 @@ eal_short_options[] =
"n:" /* memory channels */
"r:" /* memory ranks */
"v" /* version */
- "w:" /* pci-whitelist */
+ "w:" /* pci-whitelist (deprecated) */
;
const struct option
@@ -89,8 +90,8 @@ eal_long_options[] = {
{OPT_NO_PCI, 0, NULL, OPT_NO_PCI_NUM },
{OPT_NO_SHCONF, 0, NULL, OPT_NO_SHCONF_NUM },
{OPT_IN_MEMORY, 0, NULL, OPT_IN_MEMORY_NUM },
- {OPT_PCI_BLACKLIST, 1, NULL, OPT_PCI_BLACKLIST_NUM },
- {OPT_PCI_WHITELIST, 1, NULL, OPT_PCI_WHITELIST_NUM },
+ {OPT_DEV_BLOCK, 1, NULL, OPT_DEV_BLOCK_NUM },
+ {OPT_DEV_ALLOW, 1, NULL, OPT_DEV_ALLOW_NUM },
{OPT_PROC_TYPE, 1, NULL, OPT_PROC_TYPE_NUM },
{OPT_SOCKET_MEM, 1, NULL, OPT_SOCKET_MEM_NUM },
{OPT_SOCKET_LIMIT, 1, NULL, OPT_SOCKET_LIMIT_NUM },
@@ -105,6 +106,11 @@ eal_long_options[] = {
{OPT_TELEMETRY, 0, NULL, OPT_TELEMETRY_NUM },
{OPT_NO_TELEMETRY, 0, NULL, OPT_NO_TELEMETRY_NUM },
{OPT_FORCE_MAX_SIMD_BITWIDTH, 1, NULL, OPT_FORCE_MAX_SIMD_BITWIDTH_NUM},
+
+ /* legacy options that will be removed in next LTS */
+ {OPT_PCI_BLACKLIST, 1, NULL, OPT_PCI_BLACKLIST_NUM },
+ {OPT_PCI_WHITELIST, 1, NULL, OPT_PCI_WHITELIST_NUM },
+
{0, 0, NULL, 0 }
};
@@ -1448,28 +1454,31 @@ eal_parse_common_option(int opt, const char *optarg,
struct internal_config *conf)
{
static int b_used;
- static int w_used;
+ static int a_used;
switch (opt) {
- /* blacklist */
+ case OPT_PCI_BLACKLIST_NUM:
+ fprintf(stderr,
+ "Option --pci-blacklist is deprecated, use -b, --block
instead\n");
+ /* fallthrough */
case 'b':
- if (w_used)
- goto bw_used;
- if (eal_option_device_add(RTE_DEVTYPE_BLACKLISTED_PCI,
- optarg) < 0) {
+ if (a_used)
+ goto ba_conflict;
+ if (eal_option_device_add(RTE_DEVTYPE_BLOCKED, optarg) < 0)
return -1;
- }
b_used = 1;
break;
- /* whitelist */
+
case 'w':
+ fprintf(stderr,
+ "Option -w, --pci-whitelist is deprecated, use -a,
--allow option instead\n");
+ /* fallthrough */
+ case 'a':
if (b_used)
- goto bw_used;
- if (eal_option_device_add(RTE_DEVTYPE_WHITELISTED_PCI,
- optarg) < 0) {
+ goto ba_conflict;
+ if (eal_option_device_add(RTE_DEVTYPE_ALLOWED, optarg) < 0)
return -1;
- }
- w_used = 1;
+ a_used = 1;
break;
/* coremask */
case 'c': {
@@ -1760,9 +1769,10 @@ eal_parse_common_option(int opt, const char *optarg,
}
return 0;
-bw_used:
- RTE_LOG(ERR, EAL, "Options blacklist (-b) and whitelist (-w) "
- "cannot be used at the same time\n");
+
+ba_conflict:
+ RTE_LOG(ERR, EAL,
+ "Options allow (-a) and block (-b) can't be used at the same
time\n");
return -1;
}
@@ -1997,14 +2007,14 @@ eal_common_usage(void)
" -n CHANNELS Number of memory channels\n"
" -m MB Memory to allocate (see also
--"OPT_SOCKET_MEM")\n"
" -r RANKS Force number of memory ranks (don't
detect)\n"
- " -b, --"OPT_PCI_BLACKLIST" 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"
- " -w, --"OPT_PCI_WHITELIST" 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"
+ " -b, --block Add a device to the blocked list.\n"
+ " Prevent EAL from using this device. The
argument\n"
+ " format for PCI devices is
<domain:bus:devid.func>.\n"
+ " -a, --allow Add a device to the allow list.\n"
+ " Only use the specified devices. The
argument format\n"
+ " for PCI devices is
<[domain:]bus:devid.func>.\n"
+ " This option can be present several
times.\n"
+ " [NOTE: " OPT_DEV_ALLOW " cannot be used
with "OPT_DEV_BLOCK" option]\n"
" --"OPT_VDEV" Add a virtual device.\n"
" The argument format is
<driver><id>[,key=val,...]\n"
" (ex: --vdev=net_pcap0,iface=eth2).\n"
diff --git a/lib/librte_eal/common/eal_options.h
b/lib/librte_eal/common/eal_options.h
index aec8a17d722e..d9d26c962590 100644
--- a/lib/librte_eal/common/eal_options.h
+++ b/lib/librte_eal/common/eal_options.h
@@ -13,8 +13,12 @@ enum {
/* long options mapped to a short option */
#define OPT_HELP "help"
OPT_HELP_NUM = 'h',
-#define OPT_PCI_BLACKLIST "pci-blacklist"
- OPT_PCI_BLACKLIST_NUM = 'b',
+#define OPT_DEV_ALLOW "allow"
+ OPT_DEV_ALLOW_NUM = 'a',
+#define OPT_DEV_BLOCK "block"
+ OPT_DEV_BLOCK_NUM = 'b',
+
+ /* legacy option that will be removed in next LTS */
#define OPT_PCI_WHITELIST "pci-whitelist"
OPT_PCI_WHITELIST_NUM = 'w',
@@ -89,6 +93,11 @@ enum {
OPT_NO_TELEMETRY_NUM,
#define OPT_FORCE_MAX_SIMD_BITWIDTH "force-max-simd-bitwidth"
OPT_FORCE_MAX_SIMD_BITWIDTH_NUM,
+
+ /* legacy option that will be removed in next LTS */
+#define OPT_PCI_BLACKLIST "pci-blacklist"
+ OPT_PCI_BLACKLIST_NUM,
+
OPT_LONG_MAX_NUM
};
--
2.27.0
