DPDK patches and discussions
 help / color / mirror / Atom feed
From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Cc: Stephen Hemminger <stephen@networkplumber.org>,
	Luca Boccassi <bluca@debian.org>, Gaetan Rivet <grive@u256.net>
Subject: [dpdk-dev] [PATCH 2/8] eal: replace usage of blacklist/whitelist in enum
Date: Tue, 22 Sep 2020 07:31:56 -0700
Message-ID: <20200922143202.8755-3-stephen@networkplumber.org> (raw)
In-Reply-To: <20200922143202.8755-1-stephen@networkplumber.org>

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 block list and allow list, 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.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Luca Boccassi <bluca@debian.org>
Acked-by: Gaetan Rivet <grive@u256.net>
---
 lib/librte_eal/common/eal_common_devargs.c | 14 +++++++-------
 lib/librte_eal/include/rte_bus.h           | 10 ++++++++--
 lib/librte_eal/include/rte_dev.h           | 10 ++++++++--
 lib/librte_eal/include/rte_devargs.h       | 10 ++++++++--
 4 files changed, 31 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..fcf3d9a3ccb2 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 in allowed list 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..80b154fb982c 100644
--- a/lib/librte_eal/include/rte_bus.h
+++ b/lib/librte_eal/include/rte_bus.h
@@ -215,10 +215,16 @@ 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 removed */
+#define RTE_BUS_SCAN_WHITELIST \
+	RTE_DEPRECATED(RTE_BUS_SCAN_WHITELIST) RTE_BUS_SCAN_ALLOWLIST
+#define RTE_BUS_SCAN_BLACKLIST \
+	RTE_DEPRECATED(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 81905b3ae35f..02abf92c30a6 100644
--- a/lib/librte_eal/include/rte_dev.h
+++ b/lib/librte_eal/include/rte_dev.h
@@ -52,10 +52,16 @@ typedef void (*rte_dev_event_cb_fn)(const char *device_name,
  * Device policies.
  */
 enum rte_dev_policy {
-	RTE_DEV_WHITELISTED,
-	RTE_DEV_BLACKLISTED,
+	RTE_DEV_ALLOWED,
+	RTE_DEV_BLOCKED,
 };
 
+/* Backwards compatiablity will be removed */
+#define RTE_DEV_WHITELISTED \
+	RTE_DEPRECATED(RTE_DEV_WHITELISTED) RTE_DEV_ALLOWED
+#define RTE_DEV_BLACKLISTED \
+	RTE_DEPRECATED(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..494e70b584f7 100644
--- a/lib/librte_eal/include/rte_devargs.h
+++ b/lib/librte_eal/include/rte_devargs.h
@@ -29,11 +29,17 @@ 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 compatiablity will be removed later */
+#define RTE_DEVTYPE_WHITELISTED_PCI \
+	RTE_DEPRECATED(RTE_DEVTYPE_WHITELISTED_PCI) RTE_DEVTYPE_ALLOWED
+#define RTE_DEVTYPE_BLACKLISTED_PCI \
+	RTE_DEPRECATED(RTE_DEVTYPE_BLACKLISTED_PCI) RTE_DEVTYPE_BLOCKED
+
 /**
  * Structure that stores a device given by the user with its arguments
  *
-- 
2.27.0


  parent reply	other threads:[~2020-09-22 14:32 UTC|newest]

Thread overview: 117+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-22 14:31 [dpdk-dev] [PATCH 0/8] replace blacklist/whitelist with block/allow Stephen Hemminger
2020-09-22 14:31 ` [dpdk-dev] [PATCH 1/8] eal: add macro to mark macros as deprecated Stephen Hemminger
2020-09-23  9:18   ` Burakov, Anatoly
2020-09-23 17:01     ` Stephen Hemminger
2020-09-22 14:31 ` Stephen Hemminger [this message]
2020-09-22 14:31 ` [dpdk-dev] [PATCH 3/8] drivers: replace references to blacklist Stephen Hemminger
2020-09-22 14:31 ` [dpdk-dev] [PATCH 4/8] eal: replace pci-whitelist/pci-blacklist options Stephen Hemminger
2020-10-14 16:07   ` David Marchand
2020-10-20 12:43     ` Thomas Monjalon
2020-10-20 14:56       ` Stephen Hemminger
2020-09-22 14:31 ` [dpdk-dev] [PATCH 5/8] app/test: use new allowlist and blocklist Stephen Hemminger
2020-09-22 14:32 ` [dpdk-dev] [PATCH 6/8] doc: replace references to blacklist/whitelist Stephen Hemminger
2020-09-22 14:32 ` [dpdk-dev] [PATCH 7/8] doc: change reference to allowlist relative to MAC filtering Stephen Hemminger
2020-09-22 14:32 ` [dpdk-dev] [PATCH 8/8] doc: replace -w with -a in the documentation Stephen Hemminger
2020-10-20 16:20 ` [dpdk-dev] [PATCH v2 0/5] replace blacklist/whitelist with block/allow Stephen Hemminger
2020-10-20 16:20   ` [dpdk-dev] [PATCH v2 1/5] eal: replace usage of blacklist/whitelist in enum Stephen Hemminger
2020-10-20 16:20   ` [dpdk-dev] [PATCH v2 2/5] drivers: replace references to blacklist Stephen Hemminger
2020-10-20 16:20   ` [dpdk-dev] [PATCH v2 3/5] eal: replace pci-whitelist/pci-blacklist options Stephen Hemminger
2020-10-20 16:20   ` [dpdk-dev] [PATCH v2 4/5] app/test: use new allowlist and blocklist Stephen Hemminger
2020-10-20 16:20   ` [dpdk-dev] [PATCH v2 5/5] doc: change references to blacklist and whitelist Stephen Hemminger
2020-10-22 14:39 ` [dpdk-dev] [PATCH v3 0/5] replace blacklist/whitelist with block/allow Stephen Hemminger
2020-10-22 14:39   ` [dpdk-dev] [PATCH v3 1/5] eal: replace usage of blacklist/whitelist in enum Stephen Hemminger
2020-10-22 14:39   ` [dpdk-dev] [PATCH v3 2/5] drivers: replace references to blacklist Stephen Hemminger
2020-10-22 14:39   ` [dpdk-dev] [PATCH v3 3/5] eal: replace pci-whitelist/pci-blacklist options Stephen Hemminger
2020-10-22 14:39   ` [dpdk-dev] [PATCH v3 4/5] app/test: use new allowlist and blocklist Stephen Hemminger
2020-10-22 14:39   ` [dpdk-dev] [PATCH v3 5/5] doc: change references to blacklist and whitelist Stephen Hemminger
2020-10-22 15:18     ` Wang, Haiyue
2020-10-22 20:39 ` [dpdk-dev] [PATCH v4 0/5] replace blacklist/whitelist with block/allow Stephen Hemminger
2020-10-22 20:39   ` [dpdk-dev] [PATCH v4 1/5] eal: replace usage of blacklist/whitelist in enum Stephen Hemminger
2020-10-22 20:39   ` [dpdk-dev] [PATCH v4 2/5] drivers: replace references to blacklist Stephen Hemminger
2020-10-22 20:40   ` [dpdk-dev] [PATCH v4 3/5] eal: replace pci-whitelist/pci-blacklist options Stephen Hemminger
2020-10-22 20:40   ` [dpdk-dev] [PATCH v4 4/5] app/test: use new allowlist and blocklist Stephen Hemminger
2020-10-22 20:40   ` [dpdk-dev] [PATCH v4 5/5] doc: change references to blacklist and whitelist Stephen Hemminger
2020-10-24  1:01 ` [dpdk-dev] [PATCH v5 0/5] replace blacklist/whitelist with block/allow Stephen Hemminger
2020-10-24  1:01   ` [dpdk-dev] [PATCH v5 1/5] eal: replace usage of blacklist/whitelist in enum Stephen Hemminger
2020-10-24  1:01   ` [dpdk-dev] [PATCH v5 2/5] drivers: replace references to blacklist Stephen Hemminger
2020-10-24  1:01   ` [dpdk-dev] [PATCH v5 3/5] eal: replace pci-whitelist/pci-blacklist options Stephen Hemminger
2020-10-24 16:43     ` Stephen Hemminger
2020-10-24  1:01   ` [dpdk-dev] [PATCH v5 4/5] app/test: use new allowlist and blocklist Stephen Hemminger
2020-10-24  1:01   ` [dpdk-dev] [PATCH v5 5/5] doc: change references to blacklist and whitelist Stephen Hemminger
2020-11-05  8:27   ` [dpdk-dev] [PATCH v5 0/5] replace blacklist/whitelist with block/allow David Marchand
2020-11-05 17:02     ` Stephen Hemminger
2020-10-25 16:57 ` [dpdk-dev] [PATCH v6 0/5] replace blacklist/whitelist with allow/block Stephen Hemminger
2020-10-25 16:57   ` [dpdk-dev] [PATCH v6 1/5] eal: replace usage of blacklist/whitelist in enum Stephen Hemminger
2020-10-25 16:57   ` [dpdk-dev] [PATCH v6 2/5] drivers: replace references to blacklist Stephen Hemminger
2020-10-25 16:57   ` [dpdk-dev] [PATCH v6 3/5] eal: replace pci-whitelist/pci-blacklist options Stephen Hemminger
2020-10-25 16:57   ` [dpdk-dev] [PATCH v6 4/5] app/test: use new allowlist and blocklist Stephen Hemminger
2020-10-25 18:47     ` David Marchand
2020-10-25 21:25       ` Stephen Hemminger
2020-10-25 16:57   ` [dpdk-dev] [PATCH v6 5/5] doc: change references to blacklist and whitelist Stephen Hemminger
2020-10-25 20:57 ` [dpdk-dev] [PATCH v7 0/5] replace blacklist/whitelist with allow/block Stephen Hemminger
2020-10-25 20:57   ` [dpdk-dev] [PATCH v7 1/5] eal: replace usage of blacklist/whitelist in enum Stephen Hemminger
2020-10-25 20:57   ` [dpdk-dev] [PATCH v7 2/5] drivers: replace references to blacklist Stephen Hemminger
2020-10-25 20:57   ` [dpdk-dev] [PATCH v7 3/5] eal: replace pci-whitelist/pci-blacklist options Stephen Hemminger
2020-10-25 20:57   ` [dpdk-dev] [PATCH v7 4/5] doc: change references to blacklist and whitelist Stephen Hemminger
2020-10-25 20:57   ` [dpdk-dev] [PATCH v7 5/5] app/test: use new allowlist and blocklist Stephen Hemminger
2020-10-25 21:15 ` [dpdk-dev] [PATCH v8 0/5] replace blacklist/whitelist with allow/block Stephen Hemminger
2020-10-25 21:15   ` [dpdk-dev] [PATCH v8 1/5] eal: replace usage of blacklist/whitelist in enum Stephen Hemminger
2020-10-25 21:15   ` [dpdk-dev] [PATCH v8 2/5] drivers: replace references to blacklist Stephen Hemminger
2020-10-25 21:15   ` [dpdk-dev] [PATCH v8 3/5] eal: replace pci-whitelist/pci-blacklist options Stephen Hemminger
2020-10-25 21:15   ` [dpdk-dev] [PATCH v8 4/5] doc: change references to blacklist and whitelist Stephen Hemminger
2020-10-25 21:15   ` [dpdk-dev] [PATCH v8 5/5] app/test: use new allowlist and blocklist Stephen Hemminger
2020-10-29 15:31   ` [dpdk-dev] [PATCH v8 0/5] replace blacklist/whitelist with allow/block Stephen Hemminger
2020-11-05 22:35 ` [dpdk-dev] [PATCH v9 0/6] " Stephen Hemminger
2020-11-05 22:35   ` [dpdk-dev] [PATCH v9 1/6] eal: replace usage of blacklist/whitelist in enum Stephen Hemminger
2020-11-09 13:49     ` Bruce Richardson
2020-11-09 15:54       ` Stephen Hemminger
2020-11-09 16:03         ` David Marchand
2020-11-09 16:05           ` Bruce Richardson
2020-11-09 16:07             ` David Marchand
2020-11-09 16:10               ` Bruce Richardson
2020-11-09 16:20                 ` Stephen Hemminger
2020-11-09 16:03         ` Bruce Richardson
2020-11-10 12:33     ` Luca Boccassi
2020-11-10 16:40       ` Stephen Hemminger
2020-11-10 16:46         ` Luca Boccassi
2020-11-05 22:35   ` [dpdk-dev] [PATCH v9 2/6] drivers: replace references to blacklist Stephen Hemminger
2020-11-05 22:35   ` [dpdk-dev] [PATCH v9 3/6] eal: replace pci-whitelist/pci-blacklist options Stephen Hemminger
2020-11-05 22:36   ` [dpdk-dev] [PATCH v9 4/6] app/test: use new allowlist and blocklist Stephen Hemminger
2020-11-05 22:36   ` [dpdk-dev] [PATCH v9 5/6] doc: change references to blacklist and whitelist Stephen Hemminger
2020-11-10 12:59     ` Luca Boccassi
2020-11-10 16:09     ` Bruce Richardson
2020-11-05 22:36   ` [dpdk-dev] [PATCH v9 6/6] doc: update release notes now for block allow changes Stephen Hemminger
2020-11-10 16:10     ` Bruce Richardson
2020-11-10 22:57       ` Stephen Hemminger
2020-11-10 13:56   ` [dpdk-dev] [PATCH v9 0/6] replace blacklist/whitelist with allow/block Luca Boccassi
2020-11-10 16:14     ` Bruce Richardson
2020-11-10 22:55 ` [dpdk-dev] [PATCH v10 0/7] " Stephen Hemminger
2020-11-10 22:55   ` [dpdk-dev] [PATCH v10 1/7] eal: replace usage of blacklist/whitelist in enum Stephen Hemminger
2020-11-11 10:43     ` Luca Boccassi
2020-11-10 22:55   ` [dpdk-dev] [PATCH v10 2/7] drivers: replace references to blacklist Stephen Hemminger
2020-11-11 10:45     ` Luca Boccassi
2020-11-10 22:55   ` [dpdk-dev] [PATCH v10 3/7] eal: replace pci-whitelist/pci-blacklist options Stephen Hemminger
2020-11-11 10:45     ` Luca Boccassi
2020-11-15 18:54     ` Thomas Monjalon
2020-11-15 20:02     ` Thomas Monjalon
2020-11-10 22:55   ` [dpdk-dev] [PATCH v10 4/7] doc: update documentation to reflect new options Stephen Hemminger
2020-11-11 10:46     ` Luca Boccassi
2020-11-15 19:58       ` Thomas Monjalon
2020-11-15 20:00         ` Thomas Monjalon
2020-11-15 21:38           ` Thomas Monjalon
2020-11-15 21:44             ` Thomas Monjalon
2020-11-15 19:50     ` Thomas Monjalon
2020-11-15 21:56     ` Thomas Monjalon
2020-11-15 21:59     ` Thomas Monjalon
2020-11-15 22:27     ` Thomas Monjalon
2020-11-10 22:55   ` [dpdk-dev] [PATCH v10 5/7] app/test: use new allowlist and blocklist Stephen Hemminger
2020-11-11 10:46     ` Luca Boccassi
2020-11-10 22:55   ` [dpdk-dev] [PATCH v10 6/7] auto test comment fix Stephen Hemminger
2020-11-11 10:47     ` Luca Boccassi
2020-11-10 22:55   ` [dpdk-dev] [PATCH v10 7/7] eal: mark old definitions as deprecated Stephen Hemminger
2020-11-11 10:47     ` Luca Boccassi
2020-11-15 22:53 ` [dpdk-dev] [PATCH v11 0/4] replace blacklist/whitelist with block/allow Thomas Monjalon
2020-11-15 22:53   ` [dpdk-dev] [PATCH v11 1/4] eal: replace usage of blacklist/whitelist in enums Thomas Monjalon
2020-11-15 22:53   ` [dpdk-dev] [PATCH v11 2/4] eal: replace blacklist/whitelist options Thomas Monjalon
2020-11-15 22:53   ` [dpdk-dev] [PATCH v11 3/4] test: rename blacklist/whitelist in autotest scripts Thomas Monjalon
2020-11-15 22:53   ` [dpdk-dev] [PATCH v11 4/4] doc: replace usage of blacklist/whitelist Thomas Monjalon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200922143202.8755-3-stephen@networkplumber.org \
    --to=stephen@networkplumber.org \
    --cc=bluca@debian.org \
    --cc=dev@dpdk.org \
    --cc=grive@u256.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

DPDK patches and discussions

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.dpdk.org/dev/0 dev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 dev dev/ https://inbox.dpdk.org/dev \
		dev@dpdk.org
	public-inbox-index dev

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.dev


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git