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 08B80A04F2; Mon, 8 Jun 2020 21:26:48 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2098F1BC24; Mon, 8 Jun 2020 21:26:10 +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 52D3D5F2F for ; Mon, 8 Jun 2020 21:26:07 +0200 (CEST) Received: by mail-pj1-f68.google.com with SMTP id d6so258446pjs.3 for ; Mon, 08 Jun 2020 12:26:07 -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=HEoQuMmEI+6Ezg27Fi19v9kWg3x6DeIhu6gOwNsO1oU=; b=qzDGgOJ/pBjd0nG/yCELW31T//0X0DC8MLbZ3x2ewoduE6B4uCyQm6Zn69Cw18VQzA 3lVTlMgDQbVHYYQVvPTW1YlqvcnWPJjgsaKv0tryojo/pHdJC9ogH9mr7Cx3OuGstrho ZDX2U16SpWnZarAF1ujc1wXbAsbHNelcWbQsnMh/psNvkUc6J+jALV8xwQ2UxdwPXLdO KLv5c/PeEnbPfhoYLb/7PngehiWFFny7Zub2I8GNJEWe1ZjOMgl/FXG59yPTi8isJzYW 9sdBsNoQnZKEGgVE4uT6tFyTjMK1QKvOw0aXctqjrjX177gTjmCrfehH7Zj8XggC1mt9 bttQ== 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=HEoQuMmEI+6Ezg27Fi19v9kWg3x6DeIhu6gOwNsO1oU=; b=VWJkiJEe8ThdbSdRnfllWlfqI/PAVDyfAq0W486tyAq0dmbWgnrWspcEGQT72R0cyv eIawMNxCtKYsj90Q89dPmIF5mc689MSBw/ZVgSnIT6mhHNM2zZ28N1VJS2bMEIjtsDCZ 72tCbRZsdK0pVLTdWAwZkMw/q2EBAVO/+uMECaE4QsQ+tXjK/+Akhzf9m5EfRngWrEuw u4TzxrBop/5FyDcikm2Js2INhrWeTNo3P8nRwCRmENKFMGX45SJy7dwI911bCkxrm0Cp +1Sp70kOqkNQeNTUcLXKZQ0j7rin3YiVf9cBC25ryUVFArlu1ciVqAagNF9Htmg3ffw+ YkEA== X-Gm-Message-State: AOAM532LLimXbWrfZ57/7tvBd7sX17n5McDPi9CfNv20S4hRYhz9838E 87garMdeY27fXwBJccZT5u1WXK0ypVU= X-Google-Smtp-Source: ABdhPJzHU5GYxQVbCi3t/ve8EUPvW9ITtnt7S2IxXUWxXSYUeIAHRfLRURdzUVfzpqepdPpIgw1wzA== X-Received: by 2002:a17:90a:64cb:: with SMTP id i11mr783689pjm.193.1591644366047; Mon, 08 Jun 2020 12:26:06 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id z140sm8114529pfc.135.2020.06.08.12.26.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jun 2020 12:26:04 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Mon, 8 Jun 2020 12:25:42 -0700 Message-Id: <20200608192546.7160-7-stephen@networkplumber.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200608192546.7160-1-stephen@networkplumber.org> References: <20200607170127.15694-1-stephen@networkplumber.org> <20200608192546.7160-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v2 06/10] 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-only-list and pci-blacklist with pci-skip-probe. Allow the old options for now, but make sure help and all tests will use the new options. Leave the short flags are more commonly used and changing them would impact more documentation and applications. 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..52d01856c5fd 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-skip-probe */ "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-only-probe */ ; 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_SKIP_PROBE, 1, NULL, OPT_PCI_SKIP_PROBE_NUM }, + {OPT_PCI_ONLY_PROBE, 1, NULL, OPT_PCI_ONLY_PROBE_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_SKIP_PROBE_NUM }, + {"pci-whitelist" , 1, NULL, OPT_PCI_ONLY_PROBE_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_BLOCKED_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_ALLOWED_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_SKIP_PROBE" 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_ONLY_PROBE" 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..4f2525dc987f 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_SKIP_PROBE "pci-skip-probe" + OPT_PCI_SKIP_PROBE_NUM = 'b', +#define OPT_PCI_ONLY_PROBE "pci-only-probe" + OPT_PCI_ONLY_PROBE_NUM = 'w', /* first long only option value must be >= 256, so that we won't * conflict with short options */ -- 2.26.2