Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/73982/?format=api
http://patches.dpdk.org/api/patches/73982/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200714053919.5609-7-stephen@networkplumber.org/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20200714053919.5609-7-stephen@networkplumber.org>", "list_archive_url": "https://inbox.dpdk.org/dev/20200714053919.5609-7-stephen@networkplumber.org", "date": "2020-07-14T05:39:14", "name": "[v4,06/11] eal: replace pci-whitelist/pci-blacklist options", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "2bceabfaf9e29666c64bd8eee845adac4f1285b3", "submitter": { "id": 27, "url": "http://patches.dpdk.org/api/people/27/?format=api", "name": "Stephen Hemminger", "email": "stephen@networkplumber.org" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20200714053919.5609-7-stephen@networkplumber.org/mbox/", "series": [ { "id": 11009, "url": "http://patches.dpdk.org/api/series/11009/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=11009", "date": "2020-07-14T05:39:08", "name": "rename blacklist/whitelist to exclude/include", "version": 4, "mbox": "http://patches.dpdk.org/series/11009/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/73982/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/73982/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id F1BD2A0540;\n\tTue, 14 Jul 2020 07:40:32 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 743FA1D506;\n\tTue, 14 Jul 2020 07:39:44 +0200 (CEST)", "from mail-pf1-f176.google.com (mail-pf1-f176.google.com\n [209.85.210.176]) by dpdk.org (Postfix) with ESMTP id 9D4641D404\n for <dev@dpdk.org>; Tue, 14 Jul 2020 07:39:38 +0200 (CEST)", "by mail-pf1-f176.google.com with SMTP id q17so7088592pfu.8\n for <dev@dpdk.org>; Mon, 13 Jul 2020 22:39:38 -0700 (PDT)", "from hermes.corp.microsoft.com (204-195-22-127.wavecable.com.\n [204.195.22.127])\n by smtp.gmail.com with ESMTPSA id h9sm15810259pfk.155.2020.07.13.22.39.35\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Mon, 13 Jul 2020 22:39:36 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=networkplumber-org.20150623.gappssmtp.com; s=20150623;\n h=from:to:cc:subject:date:message-id:in-reply-to:references\n :mime-version:content-transfer-encoding;\n bh=MJPioZAEHJnZHb//gK35HcjwxEmcttOTS8/d+Zxiuz0=;\n b=ZAZyWRUavM9nLsq8Nd702dg0WA4a60AoRRMJJjUUHQ9Ga03YS8Lpylx0n6Bs5UjAEG\n y5UCMAEykfT1/DjvwVhbBd8j64CkcTSrDkHda0EJmkizFNAybnLDdp4oMyzFBaBVGd0d\n G3CAZA0NJmoSCTRBVIU8EfWV2t05+sQFK568DjN8xfjP22DP8AOMdEC9xPkVoQd9mcFo\n R36SLZOgoALRBBKf9XjOfIVw38CH/4l5laiAaq8+ki0RMQRzfdmZ8fROPaLsOSHOJqow\n E9GHiYySVop1kIPqqoNxzUJ7VYUCgZahzUwpIS04oxrUgAxtm0SrYVWncW8pTVdxL6eR\n kKsQ==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20161025;\n h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n :references:mime-version:content-transfer-encoding;\n bh=MJPioZAEHJnZHb//gK35HcjwxEmcttOTS8/d+Zxiuz0=;\n b=V2be8PxApg61/v6jQZv9TncsEa2sgmg8eUjxec084NkCfqcCodTeof104UnAL2hUhJ\n G1OFhxVUePYfJK7txK1zqHpfuSI2K+f/jC1FUNhZwrhnv/HTYTiSeHdRbQW+Zq6ShMi8\n aVRM0q+keVa0SfB2PVW8UB8u3y/CtdHqT3avRc8YTJ8Sm9yK/S2g3TUU/9RQDNRnOlvZ\n HMDjNKwB1PWqSGI0ZoGjD8XlWrtOxqQxFYEtpKrrN3g+vOEGdWEbmWp82ohWJBclmsK0\n mdFPfVhxQCQEu0tPItiWesMMmvgFLiFsddayPMSvbdZT7IzbYf3JtRzy/Hx8GX7VsxoY\n kOFQ==", "X-Gm-Message-State": "AOAM530Hhtdm/KK/FUFZUhITr3ujzBmG2+ZybMga3VBEiE8PZgOv0bjr\n uA7D60NpnzbfOsvYVsYH+EclKZ2lX1b/Yg==", "X-Google-Smtp-Source": "\n ABdhPJwXLB1gzqu07MfpvF38RMdge4Ye0TZW2hd/U//robaHdNocEv86tgF63IvPvD/jSdTGwzf7AA==", "X-Received": "by 2002:aa7:91d3:: with SMTP id z19mr2814457pfa.119.1594705177330;\n Mon, 13 Jul 2020 22:39:37 -0700 (PDT)", "From": "Stephen Hemminger <stephen@networkplumber.org>", "To": "dev@dpdk.org", "Cc": "Stephen Hemminger <stephen@networkplumber.org>,\n Luca Boccassi <bluca@debian.org>", "Date": "Mon, 13 Jul 2020 22:39:14 -0700", "Message-Id": "<20200714053919.5609-7-stephen@networkplumber.org>", "X-Mailer": "git-send-email 2.26.2", "In-Reply-To": "<20200714053919.5609-1-stephen@networkplumber.org>", "References": "<20200613000055.7909-1-stephen@networkplumber.org>\n <20200714053919.5609-1-stephen@networkplumber.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v4 06/11] eal: replace\n\tpci-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>,\n <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>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Replace pci-whitelist with pci-include and pci-blacklist with\npci-exclude. Allow the old options for now, but print a nag\nwarning since old options are deprecated.\n\nThe old -b and -w options will be removed in later release.\n\nSigned-off-by: Stephen Hemminger <stephen@networkplumber.org>\nAcked-by: Luca Boccassi <bluca@debian.org>\n---\n lib/librte_eal/common/eal_common_options.c | 59 ++++++++++++++--------\n lib/librte_eal/common/eal_options.h | 8 ++-\n 2 files changed, 44 insertions(+), 23 deletions(-)", "diff": "diff --git a/lib/librte_eal/common/eal_common_options.c b/lib/librte_eal/common/eal_common_options.c\nindex a5426e12346a..5b2e85aa5f08 100644\n--- a/lib/librte_eal/common/eal_common_options.c\n+++ b/lib/librte_eal/common/eal_common_options.c\n@@ -51,18 +51,20 @@\n \n const char\n eal_short_options[] =\n-\t\"b:\" /* pci-blacklist */\n+\t\"b:\" /* deprecated */\n \t\"c:\" /* coremask */\n \t\"s:\" /* service coremask */\n \t\"d:\" /* driver */\n \t\"h\" /* help */\n+\t\"i:\" /* pci-include */\n \t\"l:\" /* corelist */\n \t\"S:\" /* service corelist */\n \t\"m:\" /* memory size */\n \t\"n:\" /* memory channels */\n \t\"r:\" /* memory ranks */\n \t\"v\" /* version */\n-\t\"w:\" /* pci-whitelist */\n+\t\"x:\" /* pci-exclude */\n+\t\"w:\" /* deprecated */\n \t;\n \n const struct option\n@@ -87,8 +89,8 @@ eal_long_options[] = {\n \t{OPT_NO_PCI, 0, NULL, OPT_NO_PCI_NUM },\n \t{OPT_NO_SHCONF, 0, NULL, OPT_NO_SHCONF_NUM },\n \t{OPT_IN_MEMORY, 0, NULL, OPT_IN_MEMORY_NUM },\n-\t{OPT_PCI_BLACKLIST, 1, NULL, OPT_PCI_BLACKLIST_NUM },\n-\t{OPT_PCI_WHITELIST, 1, NULL, OPT_PCI_WHITELIST_NUM },\n+\t{OPT_PCI_EXCLUDE, \t1, NULL, OPT_PCI_EXCLUDE_NUM\t },\n+\t{OPT_PCI_INCLUDE,\t1, NULL, OPT_PCI_INCLUDE_NUM\t },\n \t{OPT_PROC_TYPE, 1, NULL, OPT_PROC_TYPE_NUM },\n \t{OPT_SOCKET_MEM, 1, NULL, OPT_SOCKET_MEM_NUM },\n \t{OPT_SOCKET_LIMIT, 1, NULL, OPT_SOCKET_LIMIT_NUM },\n@@ -102,6 +104,11 @@ eal_long_options[] = {\n \t{OPT_MATCH_ALLOCATIONS, 0, NULL, OPT_MATCH_ALLOCATIONS_NUM},\n \t{OPT_TELEMETRY, 0, NULL, OPT_TELEMETRY_NUM },\n \t{OPT_NO_TELEMETRY, 0, NULL, OPT_NO_TELEMETRY_NUM },\n+\n+\t/* legacy options that will be removed in next LTS */\n+\t{OPT_PCI_BLACKLIST, 1, NULL, OPT_PCI_BLACKLIST_NUM },\n+\t{OPT_PCI_WHITELIST, 1, NULL, OPT_PCI_WHITELIST_NUM },\n+\n \t{0, 0, NULL, 0 }\n };\n \n@@ -1414,29 +1421,36 @@ int\n eal_parse_common_option(int opt, const char *optarg,\n \t\t\tstruct internal_config *conf)\n {\n-\tstatic int b_used;\n-\tstatic int w_used;\n+\tstatic bool x_used, i_used;\n \n \tswitch (opt) {\n-\t/* blacklist */\n+\t/* deprecated option */\n \tcase 'b':\n-\t\tif (w_used)\n-\t\t\tgoto bw_used;\n-\t\tif (eal_option_device_add(RTE_DEVTYPE_BLACKLISTED_PCI,\n+\t\tfprintf(stderr, \"Option -b, --blacklist is deprecated, use -x, --pci-exclude option instead\\n\");\n+\t\t/* fallthrough */\n+\tcase 'x':\n+\t\t/* excluded list */\n+\t\tif (i_used)\n+\t\t\tgoto include_exclude;\n+\t\tif (eal_option_device_add(RTE_DEVTYPE_BLOCKED_PCI,\n \t\t\t\toptarg) < 0) {\n \t\t\treturn -1;\n \t\t}\n-\t\tb_used = 1;\n+\t\tx_used = true;\n \t\tbreak;\n-\t/* whitelist */\n+\n \tcase 'w':\n-\t\tif (b_used)\n-\t\t\tgoto bw_used;\n-\t\tif (eal_option_device_add(RTE_DEVTYPE_WHITELISTED_PCI,\n+\t\tfprintf(stderr, \"Option -w, --whitelist is deprecated, use -i, --pci-include option instead\\n\");\n+\t\t/* fallthrough */\n+\tcase 'i':\n+\t\t/* include device list */\n+\t\tif (x_used)\n+\t\t\tgoto include_exclude;\n+\t\tif (eal_option_device_add(RTE_DEVTYPE_ALLOWED_PCI,\n \t\t\t\toptarg) < 0) {\n \t\t\treturn -1;\n \t\t}\n-\t\tw_used = 1;\n+\t\ti_used = true;\n \t\tbreak;\n \t/* coremask */\n \tcase 'c': {\n@@ -1715,9 +1729,10 @@ eal_parse_common_option(int opt, const char *optarg,\n \t}\n \n \treturn 0;\n-bw_used:\n-\tRTE_LOG(ERR, EAL, \"Options blacklist (-b) and whitelist (-w) \"\n-\t\t\"cannot be used at the same time\\n\");\n+\n+include_exclude:\n+\tRTE_LOG(ERR, EAL,\n+\t\t\"Options include (-i) and exclude (-x) can't be used at the same time\\n\");\n \treturn -1;\n }\n \n@@ -1926,14 +1941,14 @@ eal_common_usage(void)\n \t \" -n CHANNELS Number of memory channels\\n\"\n \t \" -m MB Memory to allocate (see also --\"OPT_SOCKET_MEM\")\\n\"\n \t \" -r RANKS Force number of memory ranks (don't detect)\\n\"\n-\t \" -b, --\"OPT_PCI_BLACKLIST\" Add a PCI device in black list.\\n\"\n+\t \" -x, --\"OPT_PCI_EXCLUDE\" Add a PCI device in excluded list.\\n\"\n \t \" Prevent EAL from using this PCI device. The argument\\n\"\n \t \" format is <domain:bus:devid.func>.\\n\"\n-\t \" -w, --\"OPT_PCI_WHITELIST\" Add a PCI device in white list.\\n\"\n+\t \" -i, --\"OPT_PCI_INCLUDE\" Add a PCI device in included list.\\n\"\n \t \" Only use the specified PCI devices. The argument format\\n\"\n \t \" is <[domain:]bus:devid.func>. This option can be present\\n\"\n \t \" several times (once per device).\\n\"\n-\t \" [NOTE: PCI whitelist cannot be used with -b option]\\n\"\n+\t \" [NOTE: \" OPT_PCI_INCLUDE \" cannot be used with \"OPT_PCI_EXCLUDE\" option]\\n\"\n \t \" --\"OPT_VDEV\" Add a virtual device.\\n\"\n \t \" The argument format is <driver><id>[,key=val,...]\\n\"\n \t \" (ex: --vdev=net_pcap0,iface=eth2).\\n\"\ndiff --git a/lib/librte_eal/common/eal_options.h b/lib/librte_eal/common/eal_options.h\nindex 89769d48b487..c3c4d874122c 100644\n--- a/lib/librte_eal/common/eal_options.h\n+++ b/lib/librte_eal/common/eal_options.h\n@@ -13,11 +13,17 @@ enum {\n \t/* long options mapped to a short option */\n #define OPT_HELP \"help\"\n \tOPT_HELP_NUM = 'h',\n+#define OPT_PCI_INCLUDE \"pci-include\"\n+\tOPT_PCI_INCLUDE_NUM = 'i',\n+#define OPT_PCI_EXCLUDE \"pci-exclude\"\n+\tOPT_PCI_EXCLUDE_NUM = 'x',\n+\n+\t/* legacy options that will be removed in next LTS */\n #define OPT_PCI_BLACKLIST \"pci-blacklist\"\n \tOPT_PCI_BLACKLIST_NUM = 'b',\n #define OPT_PCI_WHITELIST \"pci-whitelist\"\n \tOPT_PCI_WHITELIST_NUM = 'w',\n-\n+\t\n \t/* first long only option value must be >= 256, so that we won't\n \t * conflict with short options */\n \tOPT_LONG_MIN_NUM = 256,\n", "prefixes": [ "v4", "06/11" ] }{ "id": 73982, "url": "