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 53D22A00BE; Fri, 12 Jun 2020 02:21:40 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D046137A2; Fri, 12 Jun 2020 02:21:01 +0200 (CEST) Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by dpdk.org (Postfix) with ESMTP id ECFDE2C36 for ; Fri, 12 Jun 2020 02:20:56 +0200 (CEST) Received: by mail-pf1-f195.google.com with SMTP id d66so3437286pfd.6 for ; Thu, 11 Jun 2020 17:20:56 -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=rOEvT3CdA/wpqU7NYDPJ/goljbuaCXxjYqXqdYSdGSk=; b=vRpOMMFlrzSR1REa6PQ7h6lY4zgEJcBxKvEvXuprHEWN1PhYXE4kluiFVKosKJ5gBp yYQu4htHtpH4HnADUbYapJ9zgz70enR0JJcnftfKo++vfLLOofZwsoGeYZpUwZGDVjCu IM+msi5cUSPaRZo7FIeLJaa5CKnTlu/msZVY5+OErVCKm0w/TRw0GNutfL38G7G8/EIF hJDp3JBgHR0JoQWCSzqR7IjgFyPpVFo351IfUXeYNBYIm2yOShzUgtd8iIqheXBKvmak jdoKTkFa//4WFaFx7FqAgll0QFH4KQDSIo/0EVc8mwrRKn3X3VkOJ24hRDds16UGYx2o IH6w== 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=rOEvT3CdA/wpqU7NYDPJ/goljbuaCXxjYqXqdYSdGSk=; b=ftST9LoT9Z2tBeDRCUrY95qm1vI9G52ZGpOQztXxYu9FIatipyHlkDeSWeQwHbc83f FrCAW7yFptc4K5cEI2y3E20wnF/1EEtGy8/vjlj3BGgQpvnaENqYuwLYVk/e92IW19a3 w9ffTedrsPfKusJY5LzKK9ar/c9Q5WH1G6eITEi48j2hk/IbW7/TTy+q32zCYCRDlNwz jzeW9kldfX740JGb2C09YTIsUz071PTec4NgY0P9vn98xpN/DX7XlhQHs4SSOUYMZHAH O6LXohk1BVS7L+34tmXkoBzQqqmgm5pXjnk/hkMjTwbMOSip8cor9NChgnjSofQwZ53x ZJYQ== X-Gm-Message-State: AOAM532+j3USr8SGOlcdfqS031yV5mvsvKXn0I8SqHspH/L+n6Xb0RVh PlUuiJMu6+ZDW7laOWg574jevtl1H2Q= X-Google-Smtp-Source: ABdhPJyg0jIaBGtJBavxy7NH5Oh4f0K/m/+1TjWn9UQ4LkYRQNH+oEVe5KmoTbEgUsh2fDVLnxWizw== X-Received: by 2002:a63:4b0a:: with SMTP id y10mr8815367pga.57.1591921255669; Thu, 11 Jun 2020 17:20:55 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id l63sm4395273pfd.122.2020.06.11.17.20.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jun 2020 17:20:54 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Thu, 11 Jun 2020 17:20:35 -0700 Message-Id: <20200612002039.17450-7-stephen@networkplumber.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200612002039.17450-1-stephen@networkplumber.org> References: <20200612002039.17450-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-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..116a40169612 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