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 99122A00BE; Fri, 12 Jun 2020 02:21:20 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C40EC2C39; Fri, 12 Jun 2020 02:20:57 +0200 (CEST) Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by dpdk.org (Postfix) with ESMTP id F393F2BE9 for ; Fri, 12 Jun 2020 02:20:53 +0200 (CEST) Received: by mail-pg1-f194.google.com with SMTP id e9so3274280pgo.9 for ; Thu, 11 Jun 2020 17:20:53 -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=b5zhHshOACUGXYRYXm40ysZGOzwsq70eKIc149t1IKA=; b=ZdcWJfAMmdqrhancR038yXGhahikCvOMReM0KdzsXCL+XuYDvN+Os/2KLcgf1NN6wq bb9PGTCUv50NJ3J07w4uLiozgRFnp6kijJa90sUTQ2odHO1FqE5Krxm69GrZKtQ/Y6Xz 20hDIGgexVPtVUYbLcqLEuff+j5ICvReVZhsw6llZBiZzLvRKviRKaPVcCeR53y+QoDu jxnHY0FflB3Brwlc6ClhyADwOhUSCVrjOBP+HZyp8RLm0x9x7gCmv1GLo1OStmC1sEOT +3cV8rrycCSBKj90swhHiHsiTfQxKHCfgC2FDkDzcbv3XTCz9NBGKU2DFEiJOBXZV8CG QEag== 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=b5zhHshOACUGXYRYXm40ysZGOzwsq70eKIc149t1IKA=; b=RqHHnu4NlxEDB0AIHvR3qWWRyjfYz582jgberSC6YnwMjDF8Wsm1LdRjXORU4gYs2m D/JcXi6Gv2FxipBXVXrsbv5CHHTNSVZiUNhWHJvtUf/nmUZIPlAeGwUWanc9NrOf+GKS tcOjnH05MubK3YzbTWr20LkPqCHPsboR/+olWcNIhgEzhvXD951kmEPSrJUaA/UCK2LH BVXKFg2OyD3nCXEWrjFdTmrr5FHy/VK4mT3bfFIf38eqFBo6BgBytjEMMhSEeexwcAWp SyjPYXVs7ZG5ryNRM+vgrI2aue72W3MgE6rIftYVlzbAlBwUrxJQQ3DMx6ji9Lfcq3zO qAcw== X-Gm-Message-State: AOAM530roXKgXSe97Z4HAFegPQu+yZz/3SnV6+s+VtQIzsgmd0tDg42z 1TbS88747imUxS7UOZ72D2mwU33V358= X-Google-Smtp-Source: ABdhPJwuo8r6MpRkiUva3ThUWIOyptH1GiwGDnAnKJQAhZpOXbwUy0OpazMZaMrZ0YaeU2aSUSBs0g== X-Received: by 2002:a63:ea4a:: with SMTP id l10mr3354768pgk.222.1591921252621; Thu, 11 Jun 2020 17:20:52 -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.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jun 2020 17:20:51 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Thu, 11 Jun 2020 17:20:33 -0700 Message-Id: <20200612002039.17450-5-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 04/10] 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 compatiable temporary migration tool, define a replacement mapping for old values. The old names relating to blacklist and whitelist are replaced by blocklist and allowlist, but applications may be using the older compatiablity macros. To help with conversion to new names cause a message when the compatabilty names are used. This will be upgraded to a warning in the future. Signed-off-by: Stephen Hemminger --- 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..d0d58358fee1 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_PCI) + 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..463f0224ff2b 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 compatiablity 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..e1a4277ff167 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_PCI, + RTE_DEVTYPE_BLOCKED_PCI, RTE_DEVTYPE_VIRTUAL, }; +/* Backwards compatiablity will be removed later */ +#define RTE_DEVTYPE_WHITELISTED_PCI RTE_DEVTYPE_ALLOWED_PCI +#define RTE_DEVTYPE_BLACKLISTED_PCI RTE_DEVTYPE_BLOCKED_PCI + /** * Structure that stores a device given by the user with its arguments * -- 2.26.2