From patchwork Wed Jul 15 23:02:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 74147 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 AEC6CA0540; Thu, 16 Jul 2020 01:03:44 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4CFE61BEA7; Thu, 16 Jul 2020 01:03:15 +0200 (CEST) Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by dpdk.org (Postfix) with ESMTP id 918D81BE85 for ; Thu, 16 Jul 2020 01:03:12 +0200 (CEST) Received: by mail-pg1-f193.google.com with SMTP id n5so3843810pgf.7 for ; Wed, 15 Jul 2020 16:03:12 -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=brJe2RmTsdCFo6L8aNHagQ86BszW7TrS2qKEOFNAugg=; b=I0/ayCQwOHbwvAHWILRpcNqv5dNLa6f/95pJ1uiDYigrPjZ0hs8a0mRqhlFMxaxc67 e6RJg8j1u7jlyzWv25RMZN4NhRQtKs43QprJa6VJHhOYCRU7AEcyepcmlgXzgt3KrA8x NibnZNwvREbXsaZDbkV+4I+MJ0AwOdkQgyJiq5s+qAWM8Iy4M/2j9+5WO3tBsWa5cjhw f6M9xHroi02UAnblYcIjHoJPQWn9Li3bjCz9OdZOHcIECxzJ1hVC8MO17vnV0NXAfsaM HU8vaaPksFqYqDCdMrEqRY4Jkzu3RvHsrDMvQ6mg/SOKHN3LC7L4i30OQa7qATGzstmr Pc3w== 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=brJe2RmTsdCFo6L8aNHagQ86BszW7TrS2qKEOFNAugg=; b=sp/I6FpScbfS64HTxHWBIE4rpjPnCgtqXL8zMihjCV65PNgOakJlhyou7lQ8xlJR5u 5Y0mCrHabT/y80hsoe1dJx/ABI6zWtsj9qQuRg/3OVFEkRhXtbXDNJ3GDT6m0V0c7qK8 75O6qe2CegazZGbqNx3HXtzPKWQUr96s//3wFovfZoYi2pCVjgpzya75s24VAfLIBkkq 7JF6J1/Q11HYGSiiy+/N67bGzJY1LicjBw5v2wpTBDcGguyn9mvC7PWqJMoTwb7qLTqV NlVNtkxbyGHnBoEhu6PNN69CqS22sCO3hjw4nOmRi1TAzZrXe28UQoRZlhfl8Ba4wKyq eCxQ== X-Gm-Message-State: AOAM530OCHB+53NzsBLtGujoxX+fw++Mh5j81GWnQI3Imbek3fr0btxj d2uswqbrse/0SYNX1Z3023+GcOWabnJdNw== X-Google-Smtp-Source: ABdhPJz0WGSF44tyUCHwDkhp/+/7UcdNrMo0G2WvPWMUEvyaJr8dpQiJsGyYz7h1WLvKjur/53oS+g== X-Received: by 2002:a05:6a00:2292:: with SMTP id f18mr1313051pfe.192.1594854191285; Wed, 15 Jul 2020 16:03:11 -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.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2020 16:03:10 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Luca Boccassi , Gaetan Rivet Date: Wed, 15 Jul 2020 16:02:52 -0700 Message-Id: <20200715230257.30810-5-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 4/9] eal: replace usage of blacklist/whitelist in enum 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" The terms blacklist and whitelist are often seen as reminders of the divisions in society. Instead, use more exact terms for handling of which devices are used in DPDK. This patch renames the enum values in the EAL include files. As a backward compatible temporary migration tool, define a replacement mapping for old values. The old names relating to blacklist and whitelist are replaced by blocked and allow, but applications may be using the older compatibility macros. To help with conversion to new names cause a message when the compatibility names are used. The suffix PCI_ is also dropped because these arguments can be used with other bus types (dpaa, vmbus, etc). Signed-off-by: Stephen Hemminger Acked-by: Luca Boccassi Acked-by: Gaetan Rivet --- lib/librte_eal/common/eal_common_devargs.c | 14 +++++++------- lib/librte_eal/include/rte_bus.h | 8 ++++++-- lib/librte_eal/include/rte_dev.h | 8 ++++++-- lib/librte_eal/include/rte_devargs.h | 8 ++++++-- 4 files changed, 25 insertions(+), 13 deletions(-) diff --git a/lib/librte_eal/common/eal_common_devargs.c b/lib/librte_eal/common/eal_common_devargs.c index 2123773ef840..d07e5802cc9e 100644 --- a/lib/librte_eal/common/eal_common_devargs.c +++ b/lib/librte_eal/common/eal_common_devargs.c @@ -296,7 +296,7 @@ rte_devargs_insert(struct rte_devargs **da) return 0; } -/* store a whitelist parameter for later parsing */ +/* store an allowlist parameter for later parsing */ int rte_devargs_add(enum rte_devtype devtype, const char *devargs_str) { @@ -313,13 +313,13 @@ rte_devargs_add(enum rte_devtype devtype, const char *devargs_str) goto fail; devargs->type = devtype; bus = devargs->bus; - if (devargs->type == RTE_DEVTYPE_BLACKLISTED_PCI) - devargs->policy = RTE_DEV_BLACKLISTED; + if (devargs->type == RTE_DEVTYPE_BLOCKED) + devargs->policy = RTE_DEV_BLOCKED; if (bus->conf.scan_mode == RTE_BUS_SCAN_UNDEFINED) { - if (devargs->policy == RTE_DEV_WHITELISTED) - bus->conf.scan_mode = RTE_BUS_SCAN_WHITELIST; - else if (devargs->policy == RTE_DEV_BLACKLISTED) - bus->conf.scan_mode = RTE_BUS_SCAN_BLACKLIST; + if (devargs->policy == RTE_DEV_ALLOWED) + bus->conf.scan_mode = RTE_BUS_SCAN_ALLOWLIST; + else if (devargs->policy == RTE_DEV_BLOCKED) + bus->conf.scan_mode = RTE_BUS_SCAN_BLOCKLIST; } TAILQ_INSERT_TAIL(&devargs_list, devargs, next); return 0; diff --git a/lib/librte_eal/include/rte_bus.h b/lib/librte_eal/include/rte_bus.h index d3034d0edf77..19309ad2ddd7 100644 --- a/lib/librte_eal/include/rte_bus.h +++ b/lib/librte_eal/include/rte_bus.h @@ -215,10 +215,14 @@ typedef int (*rte_bus_sigbus_handler_t)(const void *failure_addr); */ enum rte_bus_scan_mode { RTE_BUS_SCAN_UNDEFINED, - RTE_BUS_SCAN_WHITELIST, - RTE_BUS_SCAN_BLACKLIST, + RTE_BUS_SCAN_ALLOWLIST, + RTE_BUS_SCAN_BLOCKLIST, }; +/* Backwards compatibility will be deprecated */ +#define RTE_BUS_SCAN_WHITELIST RTE_BUS_SCAN_ALLOWLIST +#define RTE_BUS_SCAN_BLACKLIST RTE_BUS_SCAN_BLOCKLIST + /** * A structure used to configure bus operations. */ diff --git a/lib/librte_eal/include/rte_dev.h b/lib/librte_eal/include/rte_dev.h index c8d985fb5cf9..1208b1e99b05 100644 --- a/lib/librte_eal/include/rte_dev.h +++ b/lib/librte_eal/include/rte_dev.h @@ -70,10 +70,14 @@ enum rte_kernel_driver { * Device policies. */ enum rte_dev_policy { - RTE_DEV_WHITELISTED, - RTE_DEV_BLACKLISTED, + RTE_DEV_ALLOWED, + RTE_DEV_BLOCKED, }; +/* Backwards compatiablity will be deprecated */ +#define RTE_DEV_WHITELISTED RTE_DEV_ALLOWED +#define RTE_DEV_BLACKLISTED RTE_DEV_BLOCKED + /** * A generic memory resource representation. */ diff --git a/lib/librte_eal/include/rte_devargs.h b/lib/librte_eal/include/rte_devargs.h index 898efa0d667b..407816343ef0 100644 --- a/lib/librte_eal/include/rte_devargs.h +++ b/lib/librte_eal/include/rte_devargs.h @@ -29,11 +29,15 @@ extern "C" { * Type of generic device */ enum rte_devtype { - RTE_DEVTYPE_WHITELISTED_PCI, - RTE_DEVTYPE_BLACKLISTED_PCI, + RTE_DEVTYPE_ALLOWED, + RTE_DEVTYPE_BLOCKED, RTE_DEVTYPE_VIRTUAL, }; +/* Backwards compatibility will be removed later */ +#define RTE_DEVTYPE_WHITELISTED_PCI RTE_DEVTYPE_ALLOWED +#define RTE_DEVTYPE_BLACKLISTED_PCI RTE_DEVTYPE_BLOCKED + /** * Structure that stores a device given by the user with its arguments *