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 766ABA0540; Tue, 14 Jul 2020 07:40:10 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 54BAF1D404; Tue, 14 Jul 2020 07:39:39 +0200 (CEST) Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by dpdk.org (Postfix) with ESMTP id A80061D154 for ; Tue, 14 Jul 2020 07:39:35 +0200 (CEST) Received: by mail-pl1-f194.google.com with SMTP id q17so6549508pls.9 for ; Mon, 13 Jul 2020 22:39:35 -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=FQBMd78c12cOo2xDuErCrmDo7p14HJg2vlqZ1TAFvV0=; b=o8CEAiJKz28K9ruoVk9Fb7mjVeEDhA6rgTrMVE5oKCj994wvhTnwCgFTPwLS3Srmqz CIu0hdPYes7FYSX0Kg9wnJvqWYaqMhTOu4POt3xHh+fO1QDCNytZK6tQMK1W1ZSTz7YZ olr0zVPGNOcE6GWCskqPqvZ7iLtE2vKBWKA48gM0zx3eoj0F+F/I6WufOwz9ttKZRLgc W+nfByvjpK5SQHBNH5mMhRbxb+apXOIqJg6i5I5pU/Wn/XBXzKgoFmbz7HxwLGLGsIQu 0ISCAbZjD5WcC+xC/umhCbfcv80FJ8lUrzAquAcbXpsRJLsgbIPZZyCZ8hp+T+kNgGQ3 zbBw== 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=FQBMd78c12cOo2xDuErCrmDo7p14HJg2vlqZ1TAFvV0=; b=r6ZD9+z2sYz5Hi3Fahpy4HY5e0ZAP/PdsxelJY7/r8HNm4RV8xjP7PYtVHuh6zaQ+R uA2esg18LdSqsEazWTOKwV7fcFqeS4qXaP/aTlqmRHTPsfnp0P3a+D0JCakvOUBCE5DU +yeZtkN6NRVvzj9AZCO88zbGTtu6F9vBbripKig9uuN/AifPMLbnp92U12hSE84GAuRr J5N8oe61d7o8NgEcCVybBr1vBBkE3li0YH1KpyJaSK8St0Pg5ZPnoE26iAY08m6oGRSN 056Ee4QwUe6zFdSEZhuHGiF6Op7EFKhmZ7YTs52yGZrH84c4A44c5Xw4HfwhOQ7Hvp6x s9vA== X-Gm-Message-State: AOAM532DfZvdA+kB8CB0Ojm4QoChy4Vu5ee+XXhlsZ6jvwpLk+bBat48 8NkYc4iQJcMzfoYexNow/ZGMUuhpTkargg== X-Google-Smtp-Source: ABdhPJx23wobrQQKn2B+WFeL03NjvXGR0mfd5+6X4eLNB86VBx161o7RKpYtfm8jXySa4ORj1ymQEw== X-Received: by 2002:a17:90a:2367:: with SMTP id f94mr3003987pje.20.1594705174376; Mon, 13 Jul 2020 22:39:34 -0700 (PDT) Received: from hermes.corp.microsoft.com (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id h9sm15810259pfk.155.2020.07.13.22.39.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 22:39:33 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Luca Boccassi , Gaetan Rivet Date: Mon, 13 Jul 2020 22:39:12 -0700 Message-Id: <20200714053919.5609-5-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> <20200714053919.5609-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v4 04/11] 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 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 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..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..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..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