Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/71495/?format=api
{ "id": 71495, "url": "http://patches.dpdk.org/api/patches/71495/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200613000055.7909-6-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": "<20200613000055.7909-6-stephen@networkplumber.org>", "list_archive_url": "https://inbox.dpdk.org/dev/20200613000055.7909-6-stephen@networkplumber.org", "date": "2020-06-13T00:00:50", "name": "[v3,05/10] drivers: replace references to blacklist", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "f1eae663d2d47180c4fcdaf73e23b984722f07ac", "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/20200613000055.7909-6-stephen@networkplumber.org/mbox/", "series": [ { "id": 10448, "url": "http://patches.dpdk.org/api/series/10448/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=10448", "date": "2020-06-13T00:00:45", "name": "rename blacklist/whitelist to block/allow", "version": 3, "mbox": "http://patches.dpdk.org/series/10448/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/71495/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/71495/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 7466EA00BE;\n\tSat, 13 Jun 2020 02:01:54 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 17E0E1BFF9;\n\tSat, 13 Jun 2020 02:01:16 +0200 (CEST)", "from mail-pj1-f66.google.com (mail-pj1-f66.google.com\n [209.85.216.66]) by dpdk.org (Postfix) with ESMTP id 0C1C71BFC1\n for <dev@dpdk.org>; Sat, 13 Jun 2020 02:01:12 +0200 (CEST)", "by mail-pj1-f66.google.com with SMTP id s88so4519525pjb.5\n for <dev@dpdk.org>; Fri, 12 Jun 2020 17:01:11 -0700 (PDT)", "from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127])\n by smtp.gmail.com with ESMTPSA id 6sm7205921pfi.170.2020.06.12.17.01.08\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Fri, 12 Jun 2020 17:01:09 -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=AsVgqQj0Slsi0ptCJdHsK4rWIZ6aI/WwBtc/m1KI8rs=;\n b=1/aQeW2ox2VGxGc4tocyacspNgoE7hQhCCB+hnpIAJs5pJi2NuXgu/lggQ5EbGoS13\n 58UORGJTk436whehzixFIzL66NHHjOtUFM2DE+Gtsn/1yJ3XhpnaDalL1xyghYWOJv5l\n oIMaeGCK7zRgzN/X1SwJwq36S80yVUs0aTxXIgYJf6YWJdvReobp17sudofOeD04TDsR\n dgCgeeh6nJjv3IhgKchAt6ADI8Txuf5cCAZ1Qkq08UvuyeOyGQFb/fqyKN/3t+YQ0AeQ\n hBjse4R7k7GpCquXDHOKKEFmPb/BaCH/D01bpYabFMZzjMyHGDbdP2VHWaBQ0n4YIgtf\n Qe2g==", "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=AsVgqQj0Slsi0ptCJdHsK4rWIZ6aI/WwBtc/m1KI8rs=;\n b=ESsIpFR9M1vCZLZOisLTKEA/Wnep8g3L7D6a4kSqheSKfwOWHSju86Se/YAyEICfkF\n JdD+CvZx3KNFosz+4z3UBkd1SGUuY2+qtgHDdskNKdy7yLxS1yrNbT+67J0XsgZuFpsC\n uT5QvceqIUvedm95tdiEmkbjh3BbqGc9MH4pyeuBNcyz/aQifAKJQ5qQd1V4DW9i/tJ7\n cAPQKxPpJaK/IRkXiIA64LDBh4tWus+YXlYw/u0qZTrhyGaRLkD7x6sUhLPXXK+7YR5c\n 7U144R6dEL3T6VTy3X4GHyUteUBfeScsKNjVxriEbyQdwaUUkM6b1YguAe3RyoTX7dFp\n Cslw==", "X-Gm-Message-State": "AOAM530UUXBZgHU8rl6vzjLB7wEQn96D8USlQLQwsTdG3oaWOoqNaLwK\n OS+Q8uvB/z2KnbH6xlPCpgNuWTIzsHA=", "X-Google-Smtp-Source": "\n ABdhPJwb8jEyClhGrzOLDqp23m19KeOmtIMxozEp2zn4m6EMduzRrWaUycavOzFBPr0KaXJB/L95TQ==", "X-Received": "by 2002:a17:90a:4a6:: with SMTP id\n g35mr1250785pjg.155.1592006470253;\n Fri, 12 Jun 2020 17:01:10 -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": "Fri, 12 Jun 2020 17:00:50 -0700", "Message-Id": "<20200613000055.7909-6-stephen@networkplumber.org>", "X-Mailer": "git-send-email 2.26.2", "In-Reply-To": "<20200613000055.7909-1-stephen@networkplumber.org>", "References": "<20200613000055.7909-1-stephen@networkplumber.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v3 05/10] drivers: replace references to blacklist", "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": "Use the new terminology blocked to describe when devices\nare excluded from being used.\n\nSigned-off-by: Stephen Hemminger <stephen@networkplumber.org>\nAcked-by: Luca Boccassi <bluca@debian.org>\n---\n drivers/bus/dpaa/dpaa_bus.c | 7 +++----\n drivers/bus/fslmc/fslmc_bus.c | 9 ++++-----\n drivers/bus/fslmc/fslmc_vfio.c | 8 ++++----\n drivers/bus/pci/pci_common.c | 24 ++++++++++--------------\n drivers/bus/vmbus/vmbus_common.c | 4 ++--\n drivers/crypto/virtio/virtio_pci.c | 2 +-\n drivers/net/fm10k/fm10k_ethdev.c | 2 +-\n drivers/net/virtio/virtio_pci.c | 2 +-\n 8 files changed, 26 insertions(+), 32 deletions(-)", "diff": "diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c\nindex d53fe6083a79..ac326d96f00d 100644\n--- a/drivers/bus/dpaa/dpaa_bus.c\n+++ b/drivers/bus/dpaa/dpaa_bus.c\n@@ -556,7 +556,7 @@ rte_dpaa_bus_probe(void)\n \tstruct rte_dpaa_driver *drv;\n \tFILE *svr_file = NULL;\n \tunsigned int svr_ver;\n-\tint probe_all = rte_dpaa_bus.bus.conf.scan_mode != RTE_BUS_SCAN_WHITELIST;\n+\tint probe_all = rte_dpaa_bus.bus.conf.scan_mode != RTE_BUS_SCAN_ALLOWLIST;\n \tstatic int process_once;\n \n \t/* If DPAA bus is not present nothing needs to be done */\n@@ -610,13 +610,12 @@ rte_dpaa_bus_probe(void)\n \n \t\t\tif (!drv->probe ||\n \t\t\t (dev->device.devargs &&\n-\t\t\t dev->device.devargs->policy == RTE_DEV_BLACKLISTED))\n+\t\t\t dev->device.devargs->policy == RTE_DEV_BLOCKED))\n \t\t\t\tcontinue;\n \n \t\t\tif (probe_all ||\n \t\t\t (dev->device.devargs &&\n-\t\t\t dev->device.devargs->policy ==\n-\t\t\t RTE_DEV_WHITELISTED)) {\n+\t\t\t dev->device.devargs->policy == RTE_DEV_ALLOWED)) {\n \t\t\t\tret = drv->probe(drv, dev);\n \t\t\t\tif (ret) {\n \t\t\t\t\tDPAA_BUS_ERR(\"unable to probe:%s\",\ndiff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c\nindex afbd82e8dbfb..49125729202e 100644\n--- a/drivers/bus/fslmc/fslmc_bus.c\n+++ b/drivers/bus/fslmc/fslmc_bus.c\n@@ -407,7 +407,7 @@ rte_fslmc_probe(void)\n \t\treturn 0;\n \t}\n \n-\tprobe_all = rte_fslmc_bus.bus.conf.scan_mode != RTE_BUS_SCAN_WHITELIST;\n+\tprobe_all = rte_fslmc_bus.bus.conf.scan_mode != RTE_BUS_SCAN_ALLOWLIST;\n \n \t/* In case of PA, the FD addresses returned by qbman APIs are physical\n \t * addresses, which need conversion into equivalent VA address for\n@@ -438,16 +438,15 @@ rte_fslmc_probe(void)\n \t\t\t\tcontinue;\n \n \t\t\tif (dev->device.devargs &&\n-\t\t\t dev->device.devargs->policy == RTE_DEV_BLACKLISTED) {\n-\t\t\t\tDPAA2_BUS_LOG(DEBUG, \"%s Blacklisted, skipping\",\n+\t\t\t dev->device.devargs->policy == RTE_DEV_BLOCKED) {\n+\t\t\t\tDPAA2_BUS_LOG(DEBUG, \"%s Blocklisted, skipping\",\n \t\t\t\t\t dev->device.name);\n \t\t\t\tcontinue;\n \t\t\t}\n \n \t\t\tif (probe_all ||\n \t\t\t (dev->device.devargs &&\n-\t\t\t dev->device.devargs->policy ==\n-\t\t\t RTE_DEV_WHITELISTED)) {\n+\t\t\t dev->device.devargs->policy == RTE_DEV_ALLOWED)) {\n \t\t\t\tret = drv->probe(drv, dev);\n \t\t\t\tif (ret) {\n \t\t\t\t\tDPAA2_BUS_ERR(\"Unable to probe\");\ndiff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c\nindex efe2c43d372a..3634db3f65a2 100644\n--- a/drivers/bus/fslmc/fslmc_vfio.c\n+++ b/drivers/bus/fslmc/fslmc_vfio.c\n@@ -819,8 +819,8 @@ fslmc_vfio_process_group(void)\n \tTAILQ_FOREACH_SAFE(dev, &rte_fslmc_bus.device_list, next, dev_temp) {\n \t\tif (dev->dev_type == DPAA2_MPORTAL) {\n \t\t\tif (dev->device.devargs &&\n-\t\t\t dev->device.devargs->policy == RTE_DEV_BLACKLISTED) {\n-\t\t\t\tDPAA2_BUS_LOG(DEBUG, \"%s Blacklisted, skipping\",\n+\t\t\t dev->device.devargs->policy == RTE_DEV_BLOCKED) {\n+\t\t\t\tDPAA2_BUS_LOG(DEBUG, \"%s Blocklisted, skipping\",\n \t\t\t\t\t dev->device.name);\n \t\t\t\tTAILQ_REMOVE(&rte_fslmc_bus.device_list,\n \t\t\t\t\t\tdev, next);\n@@ -852,8 +852,8 @@ fslmc_vfio_process_group(void)\n \n \tTAILQ_FOREACH_SAFE(dev, &rte_fslmc_bus.device_list, next, dev_temp) {\n \t\tif (dev->device.devargs &&\n-\t\t dev->device.devargs->policy == RTE_DEV_BLACKLISTED) {\n-\t\t\tDPAA2_BUS_LOG(DEBUG, \"%s Blacklisted, skipping\",\n+\t\t dev->device.devargs->policy == RTE_DEV_BLOCKED) {\n+\t\t\tDPAA2_BUS_LOG(DEBUG, \"%s Blocklisted, skipping\",\n \t\t\t\t dev->device.name);\n \t\t\tTAILQ_REMOVE(&rte_fslmc_bus.device_list, dev, next);\n \t\t\tcontinue;\ndiff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c\nindex 245d94f59c6e..c0d8522e6edb 100644\n--- a/drivers/bus/pci/pci_common.c\n+++ b/drivers/bus/pci/pci_common.c\n@@ -66,9 +66,8 @@ pci_name_set(struct rte_pci_device *dev)\n \t\t\tdev->name, sizeof(dev->name));\n \tdevargs = pci_devargs_lookup(&dev->addr);\n \tdev->device.devargs = devargs;\n-\t/* In blacklist mode, if the device is not blacklisted, no\n-\t * rte_devargs exists for it.\n-\t */\n+\n+\t/* If the device is blocked, no rte_devargs exists for it. */\n \tif (devargs != NULL)\n \t\t/* If an rte_devargs exists, the generic rte_device uses the\n \t\t * given name as its name.\n@@ -132,7 +131,7 @@ rte_pci_probe_one_driver(struct rte_pci_driver *dr,\n \n \tloc = &dev->addr;\n \n-\t/* The device is not blacklisted; Check if driver supports it */\n+\t/* The device is not blocked; Check if driver supports it */\n \tif (!rte_pci_match(dr, dev))\n \t\t/* Match of device and driver failed */\n \t\treturn 1;\n@@ -141,12 +140,10 @@ rte_pci_probe_one_driver(struct rte_pci_driver *dr,\n \t\t\tloc->domain, loc->bus, loc->devid, loc->function,\n \t\t\tdev->device.numa_node);\n \n-\t/* no initialization when blacklisted, return without error */\n+\t/* no initialization when marked as blocked, return without error */\n \tif (dev->device.devargs != NULL &&\n-\t\tdev->device.devargs->policy ==\n-\t\t\tRTE_DEV_BLACKLISTED) {\n-\t\tRTE_LOG(INFO, EAL, \" Device is blacklisted, not\"\n-\t\t\t\" initializing\\n\");\n+\t\tdev->device.devargs->policy == RTE_DEV_BLOCKED) {\n+\t\tRTE_LOG(INFO, EAL, \" Device is blocked, not initializing\\n\");\n \t\treturn 1;\n \t}\n \n@@ -589,14 +586,13 @@ rte_pci_ignore_device(const struct rte_pci_addr *pci_addr)\n \tstruct rte_devargs *devargs = pci_devargs_lookup(pci_addr);\n \n \tswitch (rte_pci_bus.bus.conf.scan_mode) {\n-\tcase RTE_BUS_SCAN_WHITELIST:\n-\t\tif (devargs && devargs->policy == RTE_DEV_WHITELISTED)\n+\tcase RTE_BUS_SCAN_ALLOWLIST:\n+\t\tif (devargs && devargs->policy == RTE_DEV_ALLOWED)\n \t\t\treturn false;\n \t\tbreak;\n \tcase RTE_BUS_SCAN_UNDEFINED:\n-\tcase RTE_BUS_SCAN_BLACKLIST:\n-\t\tif (devargs == NULL ||\n-\t\t devargs->policy != RTE_DEV_BLACKLISTED)\n+\tcase RTE_BUS_SCAN_BLOCKLIST:\n+\t\tif (devargs == NULL || devargs->policy != RTE_DEV_BLOCKED)\n \t\t\treturn false;\n \t\tbreak;\n \t}\ndiff --git a/drivers/bus/vmbus/vmbus_common.c b/drivers/bus/vmbus/vmbus_common.c\nindex 3adef01c95de..622f2a618414 100644\n--- a/drivers/bus/vmbus/vmbus_common.c\n+++ b/drivers/bus/vmbus/vmbus_common.c\n@@ -102,7 +102,7 @@ vmbus_probe_one_driver(struct rte_vmbus_driver *dr,\n \tVMBUS_LOG(INFO, \"VMBUS device %s on NUMA socket %i\",\n \t\t guid, dev->device.numa_node);\n \n-\t/* TODO add blacklisted */\n+\t/* TODO add block/allow logic */\n \n \t/* map resources for device */\n \tret = rte_vmbus_map_device(dev);\n@@ -178,7 +178,7 @@ rte_vmbus_probe(void)\n \n \t\trte_uuid_unparse(dev->device_id, ubuf, sizeof(ubuf));\n \n-\t\t/* TODO: add whitelist/blacklist */\n+\t\t/* TODO: add allowlist/blocklist */\n \n \t\tif (vmbus_probe_all_drivers(dev) < 0) {\n \t\t\tVMBUS_LOG(NOTICE,\ndiff --git a/drivers/crypto/virtio/virtio_pci.c b/drivers/crypto/virtio/virtio_pci.c\nindex f490f6e28960..ae069794a683 100644\n--- a/drivers/crypto/virtio/virtio_pci.c\n+++ b/drivers/crypto/virtio/virtio_pci.c\n@@ -438,7 +438,7 @@ virtio_read_caps(struct rte_pci_device *dev, struct virtio_crypto_hw *hw)\n * Return -1:\n * if there is error mapping with VFIO/UIO.\n * if port map error when driver type is KDRV_NONE.\n- * if whitelisted but driver type is KDRV_UNKNOWN.\n+ * if marked as allowed but driver type is KDRV_UNKNOWN.\n * Return 1 if kernel driver is managing the device.\n * Return 0 on success.\n */\ndiff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c\nindex f537ab286289..dae20aafe61d 100644\n--- a/drivers/net/fm10k/fm10k_ethdev.c\n+++ b/drivers/net/fm10k/fm10k_ethdev.c\n@@ -3115,7 +3115,7 @@ eth_fm10k_dev_init(struct rte_eth_dev *dev)\n \thw->hw_addr = (void *)pdev->mem_resource[0].addr;\n \tif (hw->hw_addr == NULL) {\n \t\tPMD_INIT_LOG(ERR, \"Bad mem resource.\"\n-\t\t\t\" Try to blacklist unused devices.\");\n+\t\t\t\" Try to blocklist unused devices.\");\n \t\treturn -EIO;\n \t}\n \ndiff --git a/drivers/net/virtio/virtio_pci.c b/drivers/net/virtio/virtio_pci.c\nindex 29a354bf76df..5bec1fb6aa27 100644\n--- a/drivers/net/virtio/virtio_pci.c\n+++ b/drivers/net/virtio/virtio_pci.c\n@@ -682,7 +682,7 @@ virtio_read_caps(struct rte_pci_device *dev, struct virtio_hw *hw)\n * Return -1:\n * if there is error mapping with VFIO/UIO.\n * if port map error when driver type is KDRV_NONE.\n- * if whitelisted but driver type is KDRV_UNKNOWN.\n+ * if marked as allowed but driver type is KDRV_UNKNOWN.\n * Return 1 if kernel driver is managing the device.\n * Return 0 on success.\n */\n", "prefixes": [ "v3", "05/10" ] }