From patchwork Wed Jul 15 23:02:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 74149 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id B0C04A0540; Thu, 16 Jul 2020 01:04:03 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7E0F41BED1; Thu, 16 Jul 2020 01:03:19 +0200 (CEST) Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by dpdk.org (Postfix) with ESMTP id 8C03E1BEAA for ; Thu, 16 Jul 2020 01:03:15 +0200 (CEST) Received: by mail-pj1-f49.google.com with SMTP id md7so3734414pjb.1 for ; Wed, 15 Jul 2020 16:03:15 -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=tFZ9WMgaDDqwFFICPHCGzaNVQ/KIwwKmLH2wbJs4cuA=; b=P8BOl0PrWxoCp+U2Gh+J4tbe9Ilz+Lc3doHz4ggKYQIYcHxiBXUAfFtTKUkjLZ/33U GnhnPeysH/4fITwBxoMHifCz4guMRbOUBtgUeya9hSE4tRlmLmEtytw9RMJq15Rb2gP7 9v9qo82kGeXNqIOB4SbzeezOLQsltTNn3jgfeHfiwR8okkXk7f1IlCIyQMX4W/1Rdhv2 ZxTOsbeHaYVkVbIlS+HPnAiagKeGMgJNDqsA8RAczvsXOjcTWiZ0itiFRM/aK4c8f3fc 5aBYMoYeQ4HtwcrQFcdCBi7tQYFcCDAOHSHTEpGvj+wj/0L/IljnH8d7+7/vo0CeivdU n81w== 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=tFZ9WMgaDDqwFFICPHCGzaNVQ/KIwwKmLH2wbJs4cuA=; b=IepnB0NjbCCNAzRELwQsSvUP051r6wKjw1zOyhS1JDaVijHQgrknJqhIQoIhsFB8hb shqBBu9Ld8ve7JG/ha2xGeJELeAErjZf+N7+JonbxaTxA3YwocF/CfJQla+uQfPeOhAy XMLBV8p5RjnTJNeTO4qL7xASc4nyzyExvWwL3LTNVtoSM/iZsPCmI0u4nSP68ibs9vWI a6l3o0Ry3UJffNVJ1gtcR+uiOCmrlLYNL3jC6caYP+ysr6MoNjYJQN6CXrCtt3HY3Y6z NKfAqcjKBxexgQu29Rn5J53RA4SMDL1i0vOnY3tgSuPAakwH+rw1xV+UXmzi+IkHVVHZ 29oA== X-Gm-Message-State: AOAM530O04bEgIrhRJiTj0qJQrSbzWcIpuV3c55enjuIpg2W9S2XNGzH 6otU5c5U0lsiVZNRNwQI4PejqgvmAQ0+bw== X-Google-Smtp-Source: ABdhPJzsbZL5yA5NZZ5g45NzTKEnSw8PhFsEDdKc9lJNsZhORJNdkhmzhggcJghl61KPSuzTFb0mKg== X-Received: by 2002:a17:90a:d912:: with SMTP id c18mr1957251pjv.184.1594854194263; Wed, 15 Jul 2020 16:03:14 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id ji2sm2980888pjb.1.2020.07.15.16.03.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2020 16:03:13 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Luca Boccassi Date: Wed, 15 Jul 2020 16:02:54 -0700 Message-Id: <20200715230257.30810-7-stephen@networkplumber.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200715230257.30810-1-stephen@networkplumber.org> References: <20200607170127.15694-1-stephen@networkplumber.org> <20200715230257.30810-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v5 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 "include" and "pci-blacklist" with pci-exclude. Allow the old options for now, but print a nag warning since old options are deprecated. Signed-off-by: Stephen Hemminger Acked-by: Luca Boccassi --- lib/librte_eal/common/eal_common_options.c | 71 ++++++++++++++-------- lib/librte_eal/common/eal_options.h | 6 ++ 2 files changed, 50 insertions(+), 27 deletions(-) diff --git a/lib/librte_eal/common/eal_common_options.c b/lib/librte_eal/common/eal_common_options.c index a5426e12346a..a1590ce799ff 100644 --- a/lib/librte_eal/common/eal_common_options.c +++ b/lib/librte_eal/common/eal_common_options.c @@ -51,18 +51,20 @@ const char eal_short_options[] = - "b:" /* pci-blacklist */ + "b:" /* deprecated */ "c:" /* coremask */ "s:" /* service coremask */ "d:" /* driver */ "h" /* help */ + "i:" /* include */ "l:" /* corelist */ "S:" /* service corelist */ "m:" /* memory size */ "n:" /* memory channels */ "r:" /* memory ranks */ "v" /* version */ - "w:" /* pci-whitelist */ + "x:" /* exclude */ + "w:" /* deprecated */ ; const struct option @@ -87,8 +89,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_EXCLUDE, 1, NULL, OPT_DEV_EXCLUDE_NUM }, + {OPT_DEV_INCLUDE, 1, NULL, OPT_DEV_INCLUDE_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 }, @@ -102,6 +104,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 }, + + /* 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 } }; @@ -1414,29 +1421,38 @@ 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 */ + /* deprecated option */ case 'b': - if (w_used) - goto bw_used; - if (eal_option_device_add(RTE_DEVTYPE_BLACKLISTED_PCI, + fprintf(stderr, + "Option -b, --blacklist is deprecated, use -x, --exclude option instead\n"); + /* fallthrough */ + case 'x': + /* 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, --whitelist is deprecated, use -i, --include 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': { @@ -1715,9 +1731,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; } @@ -1926,14 +1943,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 .\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" + " -x, --"OPT_DEV_EXCLUDE" Add a device to the excluded list.\n" + " Prevent EAL from using this device. The argument\n" + " format for PCI devices is .\n" + " -i, --"OPT_DEV_INCLUDE" 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_INCLUDE " cannot be used with "OPT_DEV_EXCLUDE" 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 89769d48b487..b8e306f834b7 100644 --- a/lib/librte_eal/common/eal_options.h +++ b/lib/librte_eal/common/eal_options.h @@ -13,6 +13,12 @@ enum { /* long options mapped to a short option */ #define OPT_HELP "help" OPT_HELP_NUM = 'h', +#define OPT_DEV_INCLUDE "include" + OPT_DEV_INCLUDE_NUM = 'i', +#define OPT_DEV_EXCLUDE "exclude" + OPT_DEV_EXCLUDE_NUM = 'x', + + /* legacy options that will be removed in next LTS */ #define OPT_PCI_BLACKLIST "pci-blacklist" OPT_PCI_BLACKLIST_NUM = 'b', #define OPT_PCI_WHITELIST "pci-whitelist"