From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id C56B0A04DE;
Thu, 22 Oct 2020 22:41:25 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id D6C7572E2;
Thu, 22 Oct 2020 22:40:22 +0200 (CEST)
Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com
[209.85.214.169]) by dpdk.org (Postfix) with ESMTP id 4BBC06CB1
for <dev@dpdk.org>; Thu, 22 Oct 2020 22:40:17 +0200 (CEST)
Received: by mail-pl1-f169.google.com with SMTP id t18so1600243plo.1
for <dev@dpdk.org>; Thu, 22 Oct 2020 13:40:17 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=networkplumber-org.20150623.gappssmtp.com; s=20150623;
h=from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding;
bh=NOTeE5zk5wuD3EOl/55XFKZzm8DAdp63HbwR3Xxd0XU=;
b=vmWfYHzxUvs1hJb6fQJsyZBNTq1kym11kWRIdtaFuyBRumDlOPpyfW21iCHddt8NSl
YYF0ZW/ese0SbygiIgCrTygcN6eXKmbv5rnHeCWl+jJdbHTDDXnAMrMeDqdNisZ9QH/3
8F3J+dj9guRND91NDaV65DrAWUSOS6ZwAOrOn/FDQDLPAOdWFvxh96gzpo3c88NOVyCi
eMnMNcKqnmB8T0Rqh5NJE781oRNIpS4jtNVwyOIwSGCOgkZqZ46E1bCsPpjMVvYDe+xP
POPrcfLC1L0hPYZIdS02aoBOPyCVPQkzIlzp30U+Erf7AvSuEo/bioq1293Eq4QHBQY8
nv9A==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=NOTeE5zk5wuD3EOl/55XFKZzm8DAdp63HbwR3Xxd0XU=;
b=TiynwrWt5Emzjvtx107RBzg7IaHWVZ4JBEU6yWIoxdxgmrcu6zUSSqDNCZZ3RIXl+y
+PYRfQa8Z8zy3GECQa6A7DlE4p1H97BGKExmN95DkfXIsbXju7cl0THWxH/dwco3+gWl
moUGT9idOt2D9QwfnUR2U/5rhPwAhaJRUl82Df9zyNk131a0Ytlh7I0QcQ/88Z+SkZUi
3Sj/Ru+2SV8Q2tmDn5ttsYaVox0h7fCS/96bQjnzGIFp1dGLx+pRB2y657IId/UGDKgQ
KOGqMHsRE6nHaaR0cnDWPDDyD6Zx+9ZtKFdMS06GQ6HNoyR0MQtRVtBZEJEZwmMZZvel
8EgQ==
X-Gm-Message-State: AOAM533iOQOYOv/Q2DyNck2jgsi+/32xibrvod053mwv6oGlgNHWNVbQ
SzRNgu3uYrOUuX0vaU6Z6JKjC8lwc8gkQEhD
X-Google-Smtp-Source: ABdhPJxzZHx0jwU2K0nbJt9B/ESiuMXSxHyV+k22UMOP9bPkWgNfJmiyh2snCBLrQwcR8rz0dm2gEw==
X-Received: by 2002:a17:902:6505:b029:d5:f870:4d20 with SMTP id
b5-20020a1709026505b02900d5f8704d20mr4278331plk.34.1603399215945;
Thu, 22 Oct 2020 13:40:15 -0700 (PDT)
Received: from hermes.corp.microsoft.com (204-195-22-127.wavecable.com.
[204.195.22.127])
by smtp.gmail.com with ESMTPSA id n16sm3365727pfo.150.2020.10.22.13.40.13
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 22 Oct 2020 13:40:14 -0700 (PDT)
From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Cc: Stephen Hemminger <stephen@networkplumber.org>,
Luca Boccassi <bluca@debian.org>
Date: Thu, 22 Oct 2020 13:40:00 -0700
Message-Id: <20201022204002.30876-4-stephen@networkplumber.org>
X-Mailer: git-send-email 2.27.0
In-Reply-To: <20201022204002.30876-1-stephen@networkplumber.org>
References: <20200922143202.8755-1-stephen@networkplumber.org>
<20201022204002.30876-1-stephen@networkplumber.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-dev] [PATCH v4 3/5] eal: replace pci-whitelist/pci-blacklist
options
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
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 <stephen@networkplumber.org>
Acked-by: Luca Boccassi <bluca@debian.org>
---
lib/librte_eal/common/eal_common_options.c | 70 +++++++++++++---------
lib/librte_eal/common/eal_options.h | 9 ++-
2 files changed, 51 insertions(+), 28 deletions(-)
diff --git a/lib/librte_eal/common/eal_common_options.c b/lib/librte_eal/common/eal_common_options.c
index 7b3341683662..cf6c3770730a 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,8 @@ eal_short_options[] =
"n:" /* memory channels */
"r:" /* memory ranks */
"v" /* version */
- "w:" /* pci-whitelist */
+ "w:" /* whitelist (deprecated) */
+ "B:" /* blacklist (deprecated) */
;
const struct option
@@ -89,8 +91,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 +107,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 }
};
@@ -1447,29 +1454,37 @@ int
eal_parse_common_option(int opt, const char *optarg,
struct internal_config *conf)
{
- static int b_used;
- static int w_used;
+ static bool x_used, i_used;
switch (opt) {
- /* blacklist */
+ case 'B':
+ 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,
+ /* excluded list */
+ if (i_used)
+ goto include_exclude;
+ if (eal_option_device_add(RTE_DEVTYPE_BLOCKED,
optarg) < 0) {
return -1;
}
- b_used = 1;
+ x_used = true;
break;
- /* whitelist */
+
case 'w':
- if (b_used)
- goto bw_used;
- if (eal_option_device_add(RTE_DEVTYPE_WHITELISTED_PCI,
+ fprintf(stderr,
+ "Option -w, --pci-whitelist is deprecated, use -a, --allow option instead\n");
+ /* fallthrough */
+ case 'i':
+ /* include device list */
+ if (x_used)
+ goto include_exclude;
+ if (eal_option_device_add(RTE_DEVTYPE_ALLOWED,
optarg) < 0) {
return -1;
}
- w_used = 1;
+ i_used = true;
break;
/* coremask */
case 'c': {
@@ -1760,9 +1775,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");
+
+include_exclude:
+ RTE_LOG(ERR, EAL,
+ "Options include (-i) and exclude (-x) can't be used at the same time\n");
return -1;
}
@@ -1997,14 +2013,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, --"OPT_DEV_BLOCK" Add a device to the excluded list.\n"
+ " Prevent EAL from using this device. The argument\n"
+ " format for PCI devices is <domain:bus:devid.func>.\n"
+ " -a, --"OPT_DEV_ALLOW" Add a device to the included 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..e621c26098c3 100644
--- a/lib/librte_eal/common/eal_options.h
+++ b/lib/librte_eal/common/eal_options.h
@@ -13,8 +13,15 @@ enum {
/* long options mapped to a short option */
#define OPT_HELP "help"
OPT_HELP_NUM = 'h',
+#define OPT_DEV_ALLOW "allow"
+ OPT_DEV_ALLOW_NUM = 'a',
+#define OPT_DEV_BLOCK "block"
+ OPT_DEV_BLOCK_NUM = 'b',
+
+ /* legacy options that will be removed in next LTS */
#define OPT_PCI_BLACKLIST "pci-blacklist"
- OPT_PCI_BLACKLIST_NUM = 'b',
+ OPT_PCI_BLACKLIST_NUM = 'B',
+
#define OPT_PCI_WHITELIST "pci-whitelist"
OPT_PCI_WHITELIST_NUM = 'w',
--
2.27.0