From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id BE388A00C3; Sun, 7 Jun 2020 19:02:36 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id DD5041BFB5; Sun, 7 Jun 2020 19:01:47 +0200 (CEST) Received: from mail-pj1-f68.google.com (mail-pj1-f68.google.com [209.85.216.68]) by dpdk.org (Postfix) with ESMTP id 011221BFAA for ; Sun, 7 Jun 2020 19:01:45 +0200 (CEST) Received: by mail-pj1-f68.google.com with SMTP id m2so4983052pjv.2 for ; Sun, 07 Jun 2020 10:01:45 -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=MkeJT0C8zWxWH+ob945SiVq2y0RujM6jPV0rcb4OkTk=; b=kU+BmUWgo4A6lV6JoRUvDJtj7I65lI9apwuoIAxiWDYDIVWBb8/8nVWbmyof2RAEi2 crCv2ssiTZo8NPLiNIRTeY91aUVpxxkMpYEftEbVSDNyy7S7yewZ9Mpv/gjVSB7KMYPF Utvof+bEE3BsiR4GqPurYt5I4xCtFQsffSfTNXO4PVZ8ZBLLA3hiyCGO14a6LsgFrjfN sGMp7fEmX2puLLMo75TNAMqvGOTkeLJwOgPce4llJEaC/Tnjx7YaV/XZjRD1bKLXHSv4 7wPOqyU30bzAzpI+7Vaib9on8xzkgFd2GMoJVLDJG/sLXm2WFIFx+2NUqHvnNdNdaXmx lMMQ== 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=MkeJT0C8zWxWH+ob945SiVq2y0RujM6jPV0rcb4OkTk=; b=gDKRNjneRZJI27Z9x1E0LhkI1OhB7YfSsdQGeGiJMfOXRZNM4aTva1ba3JTxADp9Tf ZANjSmX9vuXXIPADu3OiBL1W2sFq11VMcA11OKGyRXjWSbMCOoY6GK/kCSg171lrftjC 5CnKAF0DUsMykr6ar4JonJscmMCPDRqGungGArRfbzi8PcNkCFpIW3EsQn2hKZBC0Bn0 Vw1mDWp6v8ukc/+28fCR5s3VL7crBbExVQNPk7yavjbBnpDjp6qrtu/RZ8vTxG+LOboq d45emVTBQZnZrmJ1ZmxAy0rGK48VXsj02gweSH8eifELAjOJ8YgdIz1oQUP6InqK15Ig GB1w== X-Gm-Message-State: AOAM532pHsNa0gn/heYNnyQ1vRbjQ1wsK2UY4FPo2prnITKneYq3deI+ trlvPhnAHxCkACSX6LSxzCnS+4Oh04Y= X-Google-Smtp-Source: ABdhPJwddQJ3QyBSn8XBbJ1asmvYJV4mmuscNE5EoOEWBHLSXuPDIGGA+ZDLIy9wBhLr7XTS8CHM1Q== X-Received: by 2002:a17:902:9882:: with SMTP id s2mr17632962plp.112.1591549304697; Sun, 07 Jun 2020 10:01:44 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id y81sm4933458pfb.33.2020.06.07.10.01.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jun 2020 10:01:43 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Sun, 7 Jun 2020 10:01:24 -0700 Message-Id: <20200607170127.15694-7-stephen@networkplumber.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200607170127.15694-1-stephen@networkplumber.org> References: <20200607170127.15694-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH 6/9] 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Replace pci-whitelist with pci-allowlist and pci-blacklist with pci-blocklist. Allow the old options for now, but make sure help and all tests will use the new options. The short flags are more commonly used and changing them would impact more documentation and applications. The -b flag can be described as "blocklist" rather than "blacklist. The -w flag can be thought of as "with" instead "whitelist". Signed-off-by: Stephen Hemminger --- lib/librte_eal/common/eal_common_options.c | 29 +++++++++++++--------- lib/librte_eal/common/eal_options.h | 8 +++--- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/lib/librte_eal/common/eal_common_options.c b/lib/librte_eal/common/eal_common_options.c index 8f2cbd1c6835..66769249ecae 100644 --- a/lib/librte_eal/common/eal_common_options.c +++ b/lib/librte_eal/common/eal_common_options.c @@ -48,7 +48,7 @@ const char eal_short_options[] = - "b:" /* pci-blacklist */ + "b:" /* pci-blocklist */ "c:" /* coremask */ "s:" /* service coremask */ "d:" /* driver */ @@ -59,7 +59,7 @@ eal_short_options[] = "n:" /* memory channels */ "r:" /* memory ranks */ "v" /* version */ - "w:" /* pci-whitelist */ + "w:" /* pci-allowlist */ ; const struct option @@ -84,8 +84,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_PCI_BLOCKLIST, 1, NULL, OPT_PCI_BLOCKLIST_NUM }, + {OPT_PCI_ALLOWLIST, 1, NULL, OPT_PCI_ALLOWLIST_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 }, @@ -98,6 +98,11 @@ eal_long_options[] = { {OPT_MATCH_ALLOCATIONS, 0, NULL, OPT_MATCH_ALLOCATIONS_NUM}, {OPT_TELEMETRY, 0, NULL, OPT_TELEMETRY_NUM }, {OPT_NO_TELEMETRY, 0, NULL, OPT_NO_TELEMETRY_NUM }, + + /* undocumented compatibility with older versions */ + {"pci-blacklist", 1, NULL, OPT_PCI_BLOCKLIST_NUM }, + {"pci-whitelist" , 1, NULL, OPT_PCI_ALLOWLIST_NUM }, + {0, 0, NULL, 0 } }; @@ -1292,21 +1297,21 @@ eal_parse_common_option(int opt, const char *optarg, static int w_used; switch (opt) { - /* blacklist */ + /* blocklist */ case 'b': if (w_used) goto bw_used; - if (eal_option_device_add(RTE_DEVTYPE_BLACKLISTED_PCI, + if (eal_option_device_add(RTE_DEVTYPE_BLOCKLIST_PCI, optarg) < 0) { return -1; } b_used = 1; break; - /* whitelist */ + /* allowlist */ case 'w': if (b_used) goto bw_used; - if (eal_option_device_add(RTE_DEVTYPE_WHITELISTED_PCI, + if (eal_option_device_add(RTE_DEVTYPE_ALLOWLIST_PCI, optarg) < 0) { return -1; } @@ -1590,7 +1595,7 @@ eal_parse_common_option(int opt, const char *optarg, return 0; bw_used: - RTE_LOG(ERR, EAL, "Options blacklist (-b) and whitelist (-w) " + RTE_LOG(ERR, EAL, "Options blocklist (-b) and allowlist (-w) " "cannot be used at the same time\n"); return -1; } @@ -1796,14 +1801,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" + " -b, --"OPT_PCI_BLOCKLIST" Add a PCI device in block list.\n" " Prevent EAL from using this PCI device. The argument\n" " format is .\n" - " -w, --"OPT_PCI_WHITELIST" Add a PCI device in white list.\n" + " -w, --"OPT_PCI_ALLOWLIST" Add a PCI device in allow 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" + " [NOTE: PCI allowlist cannot be used with -b option]\n" " --"OPT_VDEV" Add a virtual device.\n" " The argument format is [,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 18e6da9ab37b..b7c9079fb2df 100644 --- a/lib/librte_eal/common/eal_options.h +++ b/lib/librte_eal/common/eal_options.h @@ -13,10 +13,10 @@ 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_PCI_WHITELIST "pci-whitelist" - OPT_PCI_WHITELIST_NUM = 'w', +#define OPT_PCI_BLOCKLIST "pci-blocklist" + OPT_PCI_BLOCKLIST_NUM = 'b', +#define OPT_PCI_ALLOWLIST "pci-allowlist" + OPT_PCI_ALLOWLIST_NUM = 'w', /* first long only option value must be >= 256, so that we won't * conflict with short options */ -- 2.26.2