From patchwork Sat Jun 13 00:00:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 71491 X-Patchwork-Delegate: thomas@monjalon.net 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 44BA1A00BE; Sat, 13 Jun 2020 02:01:18 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5501E1BFA1; Sat, 13 Jun 2020 02:01:08 +0200 (CEST) Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by dpdk.org (Postfix) with ESMTP id 915271BF91 for ; Sat, 13 Jun 2020 02:01:05 +0200 (CEST) Received: by mail-pl1-f193.google.com with SMTP id t16so4380001plo.7 for ; Fri, 12 Jun 2020 17:01:05 -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=zguNOvJCgIjIn2X8Inx/ogRrY1mp8GQJP0MVg7whO+E=; b=GKAzTstymOCunjn0s+WFIn/mNYo8AZF1O//5YHW0XUpL/yjtTYwomZ5dSgqf+jWp3c cvSa0qGOS5ylqcM+OcfdszBrmtfPj1Zmm0pURgs7u9yr8f4u7VqByvgyH7f/wObg7+Za vM5DzIVm4COS4GHsx6luJgPPPP/njRyz6EV4j65f39C6+ITlnCpqCO6udI+lfeno3qOL DXzHdA2NRYrerrG86rrxOH7G2DgEbdHksQwELjNaOOwvN/WpQjEW8haiI8nsTHfblKCz IvHb75hySWU6zF1KVU2hXX4UlnW1DC9IEelj6zXYbsuVAODEfDa5MxFCazSSIraWirg7 U7wg== 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=zguNOvJCgIjIn2X8Inx/ogRrY1mp8GQJP0MVg7whO+E=; b=fESHw8/Vr0fKY+KyQeWn5gtsta0BFh85YpF6KzxaIizQCA03YgF32JkMi4lF7+uFLY /urfuuZSudK/p1g9u/fcWbOj1s1qR6vEO+zq65zMUf/ZdGLh8KkferfU+TCHGCyYM1VO T5x3LkS6m7hoR4UxuXovgwg0Zwr25nVRVP+gxzunD9LzcAYe9YfSURRm+LLTtFk9hoHL Kfs8zIKCUcLGoE7ddUcTL2atLQlNDGwpEUEBt650WEovg56/6YwpNWSs4SifLqweqhmS RsUjxH3SzmO6TTnr4hIQlWQNhXVWyjWA/aY/RHXN3OMj5baRo1bTRtEzs2Fsvuhk/dx8 bHsw== X-Gm-Message-State: AOAM530GwYoj6VJ3hnqTIxlb5bZIh+YcfHLx/b/+9bo3zY6yEmc21efc KM/n+aEgmaeT7BEuBxRDxJEoE1s1pUM= X-Google-Smtp-Source: ABdhPJyLqJ8uOPJVik2VLOtQckuIh0ggK6gvR/3QoI7EH4fLsB2wVKftC5BYFTOqCeIDGuMw6m7EWg== X-Received: by 2002:a17:902:a704:: with SMTP id w4mr13219078plq.208.1592006464317; Fri, 12 Jun 2020 17:01:04 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id 6sm7205921pfi.170.2020.06.12.17.01.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jun 2020 17:01:03 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Luca Boccassi Date: Fri, 12 Jun 2020 17:00:46 -0700 Message-Id: <20200613000055.7909-2-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 Subject: [dpdk-dev] [PATCH v3 01/10] rte_ethdev: change comment to rte_dev_eth_mac_addr_add 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 comment used the term whitelist and was awkardly written. Replace it with simpler direct description of adding a new address. No code or API changes for this. Signed-off-by: Stephen Hemminger Acked-by: Luca Boccassi --- lib/librte_ethdev/rte_ethdev.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/librte_ethdev/rte_ethdev.h b/lib/librte_ethdev/rte_ethdev.h index a49242bcd286..8d19d7e36721 100644 --- a/lib/librte_ethdev/rte_ethdev.h +++ b/lib/librte_ethdev/rte_ethdev.h @@ -3274,8 +3274,7 @@ int rte_eth_dev_priority_flow_ctrl_set(uint16_t port_id, struct rte_eth_pfc_conf *pfc_conf); /** - * Add a MAC address to an internal array of addresses used to enable whitelist - * filtering to accept packets only if the destination MAC address matches. + * Add a MAC address to the set of addresses used for accepting incoming packets. * * @param port_id * The port identifier of the Ethernet device. From patchwork Sat Jun 13 00:00:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 71492 X-Patchwork-Delegate: thomas@monjalon.net 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 B7588A00BE; Sat, 13 Jun 2020 02:01:26 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0E9B11BFB7; Sat, 13 Jun 2020 02:01:11 +0200 (CEST) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by dpdk.org (Postfix) with ESMTP id 4CB831BF9D for ; Sat, 13 Jun 2020 02:01:07 +0200 (CEST) Received: by mail-pl1-f169.google.com with SMTP id n9so4399440plk.1 for ; Fri, 12 Jun 2020 17:01:07 -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=q/I+LwQ6rkQw/uQL8m9YhIHh12R4tQKeNjZTHBqqDYI=; b=OInKO/0C91nkxDr7M3l2OecYzirEA+4aNen7THXzs0kf8F3Tz6XzLChxF0NUeNuxtY gJyyFm9SPXrONH9BWN8DM/ob0knLWTeAgOfnsFTSlNo22stjVy7OUI1/RySKFGbruDNr dEyAc31ijZGcjFNHnbv0syLRksavfx8uk6MiCZgYYE4G1bv0Nsn4/LqJVepDcUZlEiFB FAI1PJmLZaYT6YjPmquAzOcxnbF4GPZRTNk0+id9ezezm+1tuICi2jot60+pZPiXg3R1 RntWJ8zCmb4/Ymf9MuEbdOJ4izNkCfzExLO14/GkgDtk7n1lVkPUNUYik/BW6NoX8VVg NQAQ== 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=q/I+LwQ6rkQw/uQL8m9YhIHh12R4tQKeNjZTHBqqDYI=; b=Dap6o+U8ZgR7rAl20tz6lZVRzG7Ouamw4z72DMaPPkGWYCTcsQcrI7HWL5OvXkOhGj PO+xAh70CssTd1kNUh/UNPk6YO4xTqonAETJsmtokitbZu5iJVjG/LSRm55XBg3Rqdxn 2cDH6Rhk9Mit0rTxYnrrq7nQRLclHWrZNzABqYvXY+ZHD/1XRv8IGqrmsY4b8ZR2Lb7x Ca2G8sYLadv303DeGEYifwuEYbkgWuWXUQI7IXbxfIfjHaoEXk0qC25aYrXb+8Yg/nwE GRkyAmKCSOU7VlcmonS5oaunN1MSFhQMCPxNVazlSvyLtvZlC/k6VRyjPIvMNG1na2gw tJJw== X-Gm-Message-State: AOAM531t2J1iD+cBZ0IOmfUC1vVNW5++GhM/+j5AD6CJA3pFzTVN/nXD yRnDhqz59RxJgi28iZffc7YSuAN9NBU= X-Google-Smtp-Source: ABdhPJzePLPJRkhgHWyKNJP8GeJeqAC+Y6Gq0kifsldWMfIn6sJzM0Jg3XLdFKrj0BV97rnxpy/HWA== X-Received: by 2002:a17:902:ea82:: with SMTP id x2mr13700921plb.88.1592006465922; Fri, 12 Jun 2020 17:01:05 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id 6sm7205921pfi.170.2020.06.12.17.01.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jun 2020 17:01:04 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Luca Boccassi Date: Fri, 12 Jun 2020 17:00:47 -0700 Message-Id: <20200613000055.7909-3-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 Subject: [dpdk-dev] [PATCH v3 02/10] mk: replace reference to blacklist/whitelist 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" Use BLOCKLIST and ALLOWLIST in the make variable names. Signed-off-by: Stephen Hemminger Acked-by: Luca Boccassi --- mk/rte.sdktest.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mk/rte.sdktest.mk b/mk/rte.sdktest.mk index 803018ba3a70..6777e0c0f603 100644 --- a/mk/rte.sdktest.mk +++ b/mk/rte.sdktest.mk @@ -39,11 +39,11 @@ STRIPPED_PERFLIST=$(subst $(SPACESTR),,$(PERFLIST)) STRIPPED_DRIVERSLIST=$(subst $(SPACESTR),,$(DRIVERSLIST)) STRIPPED_DUMPLIST=$(subst $(SPACESTR),,$(DUMPLIST)) -coverage: BLACKLIST=-$(STRIPPED_PERFLIST) -test-fast: BLACKLIST=-$(STRIPPED_PERFLIST),$(STRIPPED_DRIVERSLIST),$(STRIPPED_DUMPLIST) -test-perf: WHITELIST=$(STRIPPED_PERFLIST) -test-drivers: WHITELIST=$(STRIPPED_DRIVERSLIST) -test-dump: WHITELIST=$(STRIPPED_DUMPLIST) +coverage: BLOCKLIST=-$(STRIPPED_PERFLIST) +test-fast: BLOCKLIST=-$(STRIPPED_PERFLIST),$(STRIPPED_DRIVERSLIST),$(STRIPPED_DUMPLIST) +test-perf: ALLOWLIST=$(STRIPPED_PERFLIST) +test-drivers: ALLOWLIST=$(STRIPPED_DRIVERSLIST) +test-dump: ALLOWLIST=$(STRIPPED_DUMPLIST) test test-fast test-perf test-drivers test-dump: @mkdir -p $(AUTOTEST_DIR) ; \ @@ -52,7 +52,7 @@ test test-fast test-perf test-drivers test-dump: python $(RTE_SDK)/app/test/autotest.py \ $(RTE_OUTPUT)/app/test \ $(RTE_TARGET) \ - $(BLACKLIST) $(WHITELIST); \ + $(BLOCKLIST) $(ALLOWLIST); \ else \ echo "No test found, please do a 'make' first, or specify O=" ; \ fi @@ -69,7 +69,7 @@ coverage: python $(RTE_SDK)/app/test/autotest.py \ $(RTE_OUTPUT)/app/test \ $(RTE_TARGET) \ - $(BLACKLIST) $(WHITELIST) ; \ + $(BLOCKLIST) $(ALLOWLIST) ; \ $(RTE_OUTPUT)/app/dpdk-procinfo --file-prefix=ring_perf -- -m; \ else \ echo "No test found, please do a 'make' first, or specify O=" ;\ From patchwork Sat Jun 13 00:00:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 71493 X-Patchwork-Delegate: thomas@monjalon.net 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 1DCA7A00BE; Sat, 13 Jun 2020 02:01:34 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5289E1BFCC; Sat, 13 Jun 2020 02:01:13 +0200 (CEST) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by dpdk.org (Postfix) with ESMTP id 78CBD1BFA9 for ; Sat, 13 Jun 2020 02:01:08 +0200 (CEST) Received: by mail-pj1-f48.google.com with SMTP id m2so4531792pjv.2 for ; Fri, 12 Jun 2020 17:01:08 -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=L8oycZeXGB62X/tHpidPzoU4908YAKhJJC8lQDyUxC0=; b=V1ZGmx1nnENv0+r0eaKU28lFvdiDo7Ia2dY7kdp+Jw3jAAd/bwC0Isyje1ldZWPyIh vCfWP0rn7+0hpgYDO/ACSc0nuXXj9oDqLO5R2bXsQFGCCyFYffX0vw6yrQsOTcmom0AB uUp9+An/c6fykHKsMrt646eDA56ufgNqYq/Vq8KCzAlSm08hfcC952YpjyG9/JsnbAA5 ArQ/CBgFoBk0DklSamLW8wcChbvQ0hwusiQ8yu9JC/zIgxScDiSTA4e25uIwlMWIp8N2 w4IJcYMRc2En67qJulUeRB0KTj2aHmk5k8sXjGTEKU1AZPaOdMWZP2d/db2X5qZdWFiu a7Lw== 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=L8oycZeXGB62X/tHpidPzoU4908YAKhJJC8lQDyUxC0=; b=VLiwnMWwsJHFB9NX/zhh0vIbJpyXweCRbJCrh6IwKbg67KRJexk8cN+MHL3Mk553Mz Bpn70w/widwnciIh1MdQi0NHyW6YTsVZBpd5QlCosJqmZQBHEnSDkCFrrIYViCbnGEUI LDQqvFtSnJQ8BTGcq9lhkBbvYsCJCnbvMC6GDT9WD+5ZMDUA2BMIDF5zuktdt9XTDHpL GcoPE+FWVG5ommFenwB7rD0snbgPP64uzGt3ar9gPC2eHD6xLjx0jABJKsdVy46JDElj OuhsdXLmagcevm8GTtP3xvT6OGF12ZGjlFskkGeBUr5Pd3squo4e0pUYPeKBnvKFVs7y 6sHA== X-Gm-Message-State: AOAM530MEhRQZuZS2XnbdItVQKXoK9l6dIrH8ejknMzgI6Mleiy6vI18 Ew+3A8waCUegzCKIMB0CizgXUFq9paA= X-Google-Smtp-Source: ABdhPJxfkewVBf4l7PZS6I8KKYHQ6zMjTQ282rz5oBn4ekOxYf3QxOIRTg3EHB128qcqkfmAt7HEtg== X-Received: by 2002:a17:902:d889:: with SMTP id b9mr12602206plz.206.1592006467218; Fri, 12 Jun 2020 17:01:07 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id 6sm7205921pfi.170.2020.06.12.17.01.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jun 2020 17:01:06 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Luca Boccassi Date: Fri, 12 Jun 2020 17:00:48 -0700 Message-Id: <20200613000055.7909-4-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 Subject: [dpdk-dev] [PATCH v3 03/10] check_maintainers: change variable names 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" Use blocklist where blacklist was used and allowlist where whitelist was used. Signed-off-by: Stephen Hemminger Acked-by: Luca Boccassi --- devtools/check-maintainers.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/devtools/check-maintainers.sh b/devtools/check-maintainers.sh index 85a300f0a029..edb452b55833 100755 --- a/devtools/check-maintainers.sh +++ b/devtools/check-maintainers.sh @@ -42,10 +42,10 @@ parse_fx () # for line in $( (sed '/^-\+$/d' $1 ; echo) | sed 's,^$,§,') ; do if echo "$line" | grep -q '^§$' ; then # empty line delimit end of section - whitelist=$(files $flines) - blacklist=$(files $xlines) - match=$(aminusb "$whitelist" "$blacklist") - if [ -n "$whitelist" ] ; then + allowlist=$(files $flines) + blocklist=$(files $xlines) + match=$(aminusb "$allowlist" "$blocklist") + if [ -n "$allowlist" ] ; then printf "# $title " maintainers=$(echo "$maintainers" | sed -r 's,.*<(.*)>.*,\1,') maintainers=$(printf "$maintainers" | sed -e 's,^,<,' -e 's,$,>,') From patchwork Sat Jun 13 00:00:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 71494 X-Patchwork-Delegate: thomas@monjalon.net 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 1820DA00BE; Sat, 13 Jun 2020 02:01:43 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E65481BFE8; Sat, 13 Jun 2020 02:01:14 +0200 (CEST) Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by dpdk.org (Postfix) with ESMTP id 240901BFB1 for ; Sat, 13 Jun 2020 02:01:10 +0200 (CEST) Received: by mail-pl1-f196.google.com with SMTP id g12so4377692pll.10 for ; Fri, 12 Jun 2020 17:01:09 -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=VcQgf8LoJH+mKzvU2T4GC/bjMaBCsG8L3YYQ+G1DdYA=; b=zpia78K1tLoqTA8b1iNS9whgybQrK/T2krHEEhdzEzEmHPiaNjIx6jPS/DBZ35e9Zm Kt8bVBgwl2Y56kBqJlVZtwXLiiLRiuw4+8U2VHaBJqLfFlBJK5FlsF0VH05C2ZAo3eq1 Awnp79Q81e4wqYLeVzbL3Nne+NfN6jGqxOOoOtHY6y3ALtePo9c6e0j2ktDIyRt1TSz4 w64Cm3lQHe0CM1Xqk6UObaIDFs5BszS/9yrhB2Lc2zeGU0G+yLXZYMW65AHESVeyFkGH FSHJDfs5O14Gf3cKit75lnQoDKLXff+2d+PpZIao0EyNSZ/09gCUvbie6xpHCfNo9jXz U6ag== 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=VcQgf8LoJH+mKzvU2T4GC/bjMaBCsG8L3YYQ+G1DdYA=; b=Tt2NUkf7/2qmJMMMo6B+U4C4LIp6knLE0BBMhqv/21zeyIGEu44aM0dRBYbIQ2pMMJ xEc1i7I+/tWXbxbdqwsMZk8iBBWrGMl89smZRzyL+n8ZvNcw5ElWAw0AHrf9k48s/4wq /QNrqy9keKF7YedIL032i9RwMODNIuDVlYRqfoe7uJ578fNWP2R0NiVu9O5p7/Aa//ui 8c0VWjHhJXVE5xa5KPzw/eGhlqqdMzR/SVV02hXW53DcjGUKH4i4KqqYtaDnI6/Cc/+G c6OsEQbDvLFJQCgB7KnY5LEqmYxyRGORwdKKtGuxSkahnFH7odr9+bU7oYvXQ9IrKj8l 0Ybw== X-Gm-Message-State: AOAM530HIL2qjsy8gKP1RS0ldHZRApVmx2vwqZZG5ie9wwkfT7TDF9xe CIOto6QJ4rgWW01vLjWk3xTC2j2GOq4= X-Google-Smtp-Source: ABdhPJwmJRgopla7JwwTRcYdX982eUpwCyvyr0lN50gdw5YmJWsd1myqLZ04H4XYHb3+09YqzS9ekA== X-Received: by 2002:a17:90a:7643:: with SMTP id s3mr1283175pjl.183.1592006468655; Fri, 12 Jun 2020 17:01:08 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id 6sm7205921pfi.170.2020.06.12.17.01.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jun 2020 17:01:07 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Luca Boccassi , Gaetan Rivet Date: Fri, 12 Jun 2020 17:00:49 -0700 Message-Id: <20200613000055.7909-5-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 Subject: [dpdk-dev] [PATCH v3 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" 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 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_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 * From patchwork Sat Jun 13 00:00:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 71495 X-Patchwork-Delegate: thomas@monjalon.net 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 7466EA00BE; Sat, 13 Jun 2020 02:01:54 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 17E0E1BFF9; Sat, 13 Jun 2020 02:01:16 +0200 (CEST) Received: from mail-pj1-f66.google.com (mail-pj1-f66.google.com [209.85.216.66]) by dpdk.org (Postfix) with ESMTP id 0C1C71BFC1 for ; Sat, 13 Jun 2020 02:01:12 +0200 (CEST) Received: by mail-pj1-f66.google.com with SMTP id s88so4519525pjb.5 for ; Fri, 12 Jun 2020 17:01:11 -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=AsVgqQj0Slsi0ptCJdHsK4rWIZ6aI/WwBtc/m1KI8rs=; b=1/aQeW2ox2VGxGc4tocyacspNgoE7hQhCCB+hnpIAJs5pJi2NuXgu/lggQ5EbGoS13 58UORGJTk436whehzixFIzL66NHHjOtUFM2DE+Gtsn/1yJ3XhpnaDalL1xyghYWOJv5l oIMaeGCK7zRgzN/X1SwJwq36S80yVUs0aTxXIgYJf6YWJdvReobp17sudofOeD04TDsR dgCgeeh6nJjv3IhgKchAt6ADI8Txuf5cCAZ1Qkq08UvuyeOyGQFb/fqyKN/3t+YQ0AeQ hBjse4R7k7GpCquXDHOKKEFmPb/BaCH/D01bpYabFMZzjMyHGDbdP2VHWaBQ0n4YIgtf Qe2g== 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=AsVgqQj0Slsi0ptCJdHsK4rWIZ6aI/WwBtc/m1KI8rs=; b=ESsIpFR9M1vCZLZOisLTKEA/Wnep8g3L7D6a4kSqheSKfwOWHSju86Se/YAyEICfkF JdD+CvZx3KNFosz+4z3UBkd1SGUuY2+qtgHDdskNKdy7yLxS1yrNbT+67J0XsgZuFpsC uT5QvceqIUvedm95tdiEmkbjh3BbqGc9MH4pyeuBNcyz/aQifAKJQ5qQd1V4DW9i/tJ7 cAPQKxPpJaK/IRkXiIA64LDBh4tWus+YXlYw/u0qZTrhyGaRLkD7x6sUhLPXXK+7YR5c 7U144R6dEL3T6VTy3X4GHyUteUBfeScsKNjVxriEbyQdwaUUkM6b1YguAe3RyoTX7dFp Cslw== X-Gm-Message-State: AOAM530UUXBZgHU8rl6vzjLB7wEQn96D8USlQLQwsTdG3oaWOoqNaLwK OS+Q8uvB/z2KnbH6xlPCpgNuWTIzsHA= X-Google-Smtp-Source: ABdhPJwb8jEyClhGrzOLDqp23m19KeOmtIMxozEp2zn4m6EMduzRrWaUycavOzFBPr0KaXJB/L95TQ== X-Received: by 2002:a17:90a:4a6:: with SMTP id g35mr1250785pjg.155.1592006470253; Fri, 12 Jun 2020 17:01:10 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id 6sm7205921pfi.170.2020.06.12.17.01.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jun 2020 17:01:09 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Luca Boccassi 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 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Use the new terminology blocked to describe when devices are excluded from being used. Signed-off-by: Stephen Hemminger Acked-by: Luca Boccassi Acked-by: Hemant Agrawal --- drivers/bus/dpaa/dpaa_bus.c | 7 +++---- drivers/bus/fslmc/fslmc_bus.c | 9 ++++----- drivers/bus/fslmc/fslmc_vfio.c | 8 ++++---- drivers/bus/pci/pci_common.c | 24 ++++++++++-------------- drivers/bus/vmbus/vmbus_common.c | 4 ++-- drivers/crypto/virtio/virtio_pci.c | 2 +- drivers/net/fm10k/fm10k_ethdev.c | 2 +- drivers/net/virtio/virtio_pci.c | 2 +- 8 files changed, 26 insertions(+), 32 deletions(-) diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c index d53fe6083a79..ac326d96f00d 100644 --- a/drivers/bus/dpaa/dpaa_bus.c +++ b/drivers/bus/dpaa/dpaa_bus.c @@ -556,7 +556,7 @@ rte_dpaa_bus_probe(void) struct rte_dpaa_driver *drv; FILE *svr_file = NULL; unsigned int svr_ver; - int probe_all = rte_dpaa_bus.bus.conf.scan_mode != RTE_BUS_SCAN_WHITELIST; + int probe_all = rte_dpaa_bus.bus.conf.scan_mode != RTE_BUS_SCAN_ALLOWLIST; static int process_once; /* If DPAA bus is not present nothing needs to be done */ @@ -610,13 +610,12 @@ rte_dpaa_bus_probe(void) if (!drv->probe || (dev->device.devargs && - dev->device.devargs->policy == RTE_DEV_BLACKLISTED)) + dev->device.devargs->policy == RTE_DEV_BLOCKED)) continue; if (probe_all || (dev->device.devargs && - dev->device.devargs->policy == - RTE_DEV_WHITELISTED)) { + dev->device.devargs->policy == RTE_DEV_ALLOWED)) { ret = drv->probe(drv, dev); if (ret) { DPAA_BUS_ERR("unable to probe:%s", diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c index afbd82e8dbfb..49125729202e 100644 --- a/drivers/bus/fslmc/fslmc_bus.c +++ b/drivers/bus/fslmc/fslmc_bus.c @@ -407,7 +407,7 @@ rte_fslmc_probe(void) return 0; } - probe_all = rte_fslmc_bus.bus.conf.scan_mode != RTE_BUS_SCAN_WHITELIST; + probe_all = rte_fslmc_bus.bus.conf.scan_mode != RTE_BUS_SCAN_ALLOWLIST; /* In case of PA, the FD addresses returned by qbman APIs are physical * addresses, which need conversion into equivalent VA address for @@ -438,16 +438,15 @@ rte_fslmc_probe(void) continue; if (dev->device.devargs && - dev->device.devargs->policy == RTE_DEV_BLACKLISTED) { - DPAA2_BUS_LOG(DEBUG, "%s Blacklisted, skipping", + dev->device.devargs->policy == RTE_DEV_BLOCKED) { + DPAA2_BUS_LOG(DEBUG, "%s Blocklisted, skipping", dev->device.name); continue; } if (probe_all || (dev->device.devargs && - dev->device.devargs->policy == - RTE_DEV_WHITELISTED)) { + dev->device.devargs->policy == RTE_DEV_ALLOWED)) { ret = drv->probe(drv, dev); if (ret) { DPAA2_BUS_ERR("Unable to probe"); diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c index efe2c43d372a..3634db3f65a2 100644 --- a/drivers/bus/fslmc/fslmc_vfio.c +++ b/drivers/bus/fslmc/fslmc_vfio.c @@ -819,8 +819,8 @@ fslmc_vfio_process_group(void) TAILQ_FOREACH_SAFE(dev, &rte_fslmc_bus.device_list, next, dev_temp) { if (dev->dev_type == DPAA2_MPORTAL) { if (dev->device.devargs && - dev->device.devargs->policy == RTE_DEV_BLACKLISTED) { - DPAA2_BUS_LOG(DEBUG, "%s Blacklisted, skipping", + dev->device.devargs->policy == RTE_DEV_BLOCKED) { + DPAA2_BUS_LOG(DEBUG, "%s Blocklisted, skipping", dev->device.name); TAILQ_REMOVE(&rte_fslmc_bus.device_list, dev, next); @@ -852,8 +852,8 @@ fslmc_vfio_process_group(void) TAILQ_FOREACH_SAFE(dev, &rte_fslmc_bus.device_list, next, dev_temp) { if (dev->device.devargs && - dev->device.devargs->policy == RTE_DEV_BLACKLISTED) { - DPAA2_BUS_LOG(DEBUG, "%s Blacklisted, skipping", + dev->device.devargs->policy == RTE_DEV_BLOCKED) { + DPAA2_BUS_LOG(DEBUG, "%s Blocklisted, skipping", dev->device.name); TAILQ_REMOVE(&rte_fslmc_bus.device_list, dev, next); continue; diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c index 245d94f59c6e..c0d8522e6edb 100644 --- a/drivers/bus/pci/pci_common.c +++ b/drivers/bus/pci/pci_common.c @@ -66,9 +66,8 @@ pci_name_set(struct rte_pci_device *dev) dev->name, sizeof(dev->name)); devargs = pci_devargs_lookup(&dev->addr); dev->device.devargs = devargs; - /* In blacklist mode, if the device is not blacklisted, no - * rte_devargs exists for it. - */ + + /* If the device is blocked, no rte_devargs exists for it. */ if (devargs != NULL) /* If an rte_devargs exists, the generic rte_device uses the * given name as its name. @@ -132,7 +131,7 @@ rte_pci_probe_one_driver(struct rte_pci_driver *dr, loc = &dev->addr; - /* The device is not blacklisted; Check if driver supports it */ + /* The device is not blocked; Check if driver supports it */ if (!rte_pci_match(dr, dev)) /* Match of device and driver failed */ return 1; @@ -141,12 +140,10 @@ rte_pci_probe_one_driver(struct rte_pci_driver *dr, loc->domain, loc->bus, loc->devid, loc->function, dev->device.numa_node); - /* no initialization when blacklisted, return without error */ + /* no initialization when marked as blocked, return without error */ if (dev->device.devargs != NULL && - dev->device.devargs->policy == - RTE_DEV_BLACKLISTED) { - RTE_LOG(INFO, EAL, " Device is blacklisted, not" - " initializing\n"); + dev->device.devargs->policy == RTE_DEV_BLOCKED) { + RTE_LOG(INFO, EAL, " Device is blocked, not initializing\n"); return 1; } @@ -589,14 +586,13 @@ rte_pci_ignore_device(const struct rte_pci_addr *pci_addr) struct rte_devargs *devargs = pci_devargs_lookup(pci_addr); switch (rte_pci_bus.bus.conf.scan_mode) { - case RTE_BUS_SCAN_WHITELIST: - if (devargs && devargs->policy == RTE_DEV_WHITELISTED) + case RTE_BUS_SCAN_ALLOWLIST: + if (devargs && devargs->policy == RTE_DEV_ALLOWED) return false; break; case RTE_BUS_SCAN_UNDEFINED: - case RTE_BUS_SCAN_BLACKLIST: - if (devargs == NULL || - devargs->policy != RTE_DEV_BLACKLISTED) + case RTE_BUS_SCAN_BLOCKLIST: + if (devargs == NULL || devargs->policy != RTE_DEV_BLOCKED) return false; break; } diff --git a/drivers/bus/vmbus/vmbus_common.c b/drivers/bus/vmbus/vmbus_common.c index 3adef01c95de..622f2a618414 100644 --- a/drivers/bus/vmbus/vmbus_common.c +++ b/drivers/bus/vmbus/vmbus_common.c @@ -102,7 +102,7 @@ vmbus_probe_one_driver(struct rte_vmbus_driver *dr, VMBUS_LOG(INFO, "VMBUS device %s on NUMA socket %i", guid, dev->device.numa_node); - /* TODO add blacklisted */ + /* TODO add block/allow logic */ /* map resources for device */ ret = rte_vmbus_map_device(dev); @@ -178,7 +178,7 @@ rte_vmbus_probe(void) rte_uuid_unparse(dev->device_id, ubuf, sizeof(ubuf)); - /* TODO: add whitelist/blacklist */ + /* TODO: add allowlist/blocklist */ if (vmbus_probe_all_drivers(dev) < 0) { VMBUS_LOG(NOTICE, diff --git a/drivers/crypto/virtio/virtio_pci.c b/drivers/crypto/virtio/virtio_pci.c index f490f6e28960..ae069794a683 100644 --- a/drivers/crypto/virtio/virtio_pci.c +++ b/drivers/crypto/virtio/virtio_pci.c @@ -438,7 +438,7 @@ virtio_read_caps(struct rte_pci_device *dev, struct virtio_crypto_hw *hw) * Return -1: * if there is error mapping with VFIO/UIO. * if port map error when driver type is KDRV_NONE. - * if whitelisted but driver type is KDRV_UNKNOWN. + * if marked as allowed but driver type is KDRV_UNKNOWN. * Return 1 if kernel driver is managing the device. * Return 0 on success. */ diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c index f537ab286289..dae20aafe61d 100644 --- a/drivers/net/fm10k/fm10k_ethdev.c +++ b/drivers/net/fm10k/fm10k_ethdev.c @@ -3115,7 +3115,7 @@ eth_fm10k_dev_init(struct rte_eth_dev *dev) hw->hw_addr = (void *)pdev->mem_resource[0].addr; if (hw->hw_addr == NULL) { PMD_INIT_LOG(ERR, "Bad mem resource." - " Try to blacklist unused devices."); + " Try to blocklist unused devices."); return -EIO; } diff --git a/drivers/net/virtio/virtio_pci.c b/drivers/net/virtio/virtio_pci.c index 29a354bf76df..5bec1fb6aa27 100644 --- a/drivers/net/virtio/virtio_pci.c +++ b/drivers/net/virtio/virtio_pci.c @@ -682,7 +682,7 @@ virtio_read_caps(struct rte_pci_device *dev, struct virtio_hw *hw) * Return -1: * if there is error mapping with VFIO/UIO. * if port map error when driver type is KDRV_NONE. - * if whitelisted but driver type is KDRV_UNKNOWN. + * if marked as allowed but driver type is KDRV_UNKNOWN. * Return 1 if kernel driver is managing the device. * Return 0 on success. */ From patchwork Sat Jun 13 00:00:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 71496 X-Patchwork-Delegate: thomas@monjalon.net 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 5D1BAA00BE; Sat, 13 Jun 2020 02:02:07 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 913131C038; Sat, 13 Jun 2020 02:01:17 +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 9B7DD1BFCF for ; Sat, 13 Jun 2020 02:01:13 +0200 (CEST) Received: by mail-pl1-f194.google.com with SMTP id n2so4367746pld.13 for ; Fri, 12 Jun 2020 17:01:13 -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=o4+VJo0FVJb7DOCFvVF/fH1PKrsP0SCGgGpPLkptWh4=; b=XJvjmyH6141XYaKjzae91XUj1OsIazTyMmCXEtAdDOn+tB4dKqIMyNRloEo/2n51GG m58TxU7XbwQLD9eSKh7CNShJFcmIqJjYNoJByv3pNxJDqkmR7Q5FQOqmV2DEb1IPA2Ic pmNicVoMydROGz5Ght4C0t33wNNdQRrrnksAilIrb9do1Pfu9ByvFoiKfXMGTmXWEjit eTVcej5GgGpo1iuZJtB3q3byJNtk65vKPrqhm6OX7rsMfT6xB9I5T4K+7JG692du2Etq j+Ix5zH9nDcyfVPI4tp1al4wNqrC75W6oBjYFCwBbx2nCxeL1D0IvEj7Sudh0V0Dw3O4 BvVw== 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=o4+VJo0FVJb7DOCFvVF/fH1PKrsP0SCGgGpPLkptWh4=; b=YtWI8l2pc1AQQI6q/Utdr+LXNiH3SoEHvb3J+4qzZ7fUgUJ9HF1aqbvOVSmtmckiKk Q9DB4Yzjg3oCu4Hk6LLx+YuZ0Ltgv2YK8w8x+KtjIWx8jO/+uhSjLBSnzTC/ljg+mObf t89VZKnM4sYtJqFU3870fKd0QsEXogaMp8bjisPtBn+TX+G5GGxm10jodCr8yMczE+hn 4QFqDWEt4P681EM7Uvj3wLfqgR6r88E6aJj74VGO7XpbshSiqhgpYLsG3/gzVeKcZpIl sgnXTAzYAriQ/DjlqNUAxAXbY4HCft0JBr461fHBm+54WjS1ghYa+PP1G3WNe8jtEsF2 k7yw== X-Gm-Message-State: AOAM5323sgK9x7DI/iNue5XcBxcmjT7UgCvz+Ea7wlW9ppnDDAb5KJKp N0UlDgn3r+9Ud9JTPYXQ2oXzVrPHc14= X-Google-Smtp-Source: ABdhPJz8q4lpmVmSpM2zdZ4DTy2afGvtWoSydKqT8F83KIvfAR79oD9tZrVRqpG6PEPp44248dYoEw== X-Received: by 2002:a17:902:7802:: with SMTP id p2mr13691063pll.38.1592006472214; Fri, 12 Jun 2020 17:01:12 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id 6sm7205921pfi.170.2020.06.12.17.01.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jun 2020 17:01:10 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Luca Boccassi Date: Fri, 12 Jun 2020 17:00:51 -0700 Message-Id: <20200613000055.7909-7-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 Subject: [dpdk-dev] [PATCH v3 06/10] eal: replace pci-whitelist/pci-blacklist options 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" Replace pci-whitelist with pci-allowlist and pci-blacklist with pci-blocklist. Allow the old options for now, but make sure help and all tests will use the new options. The short flags are more commonly used and changing them would impact more documentation and applications. The -b flag can be described as "blocklist" rather than "blacklist. The -w flag can be thought of as "with" instead "whitelist". Signed-off-by: Stephen Hemminger Acked-by: Luca Boccassi --- lib/librte_eal/common/eal_common_options.c | 29 +++++++++++++--------- lib/librte_eal/common/eal_options.h | 8 +++--- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/lib/librte_eal/common/eal_common_options.c b/lib/librte_eal/common/eal_common_options.c index 8f2cbd1c6835..116a40169612 100644 --- a/lib/librte_eal/common/eal_common_options.c +++ b/lib/librte_eal/common/eal_common_options.c @@ -48,7 +48,7 @@ const char eal_short_options[] = - "b:" /* pci-blacklist */ + "b:" /* pci-skip-probe */ "c:" /* coremask */ "s:" /* service coremask */ "d:" /* driver */ @@ -59,7 +59,7 @@ eal_short_options[] = "n:" /* memory channels */ "r:" /* memory ranks */ "v" /* version */ - "w:" /* pci-whitelist */ + "w:" /* pci-only-probe */ ; const struct option @@ -84,8 +84,8 @@ eal_long_options[] = { {OPT_NO_PCI, 0, NULL, OPT_NO_PCI_NUM }, {OPT_NO_SHCONF, 0, NULL, OPT_NO_SHCONF_NUM }, {OPT_IN_MEMORY, 0, NULL, OPT_IN_MEMORY_NUM }, - {OPT_PCI_BLACKLIST, 1, NULL, OPT_PCI_BLACKLIST_NUM }, - {OPT_PCI_WHITELIST, 1, NULL, OPT_PCI_WHITELIST_NUM }, + {OPT_PCI_SKIP_PROBE, 1, NULL, OPT_PCI_SKIP_PROBE_NUM }, + {OPT_PCI_ONLY_PROBE, 1, NULL, OPT_PCI_ONLY_PROBE_NUM }, {OPT_PROC_TYPE, 1, NULL, OPT_PROC_TYPE_NUM }, {OPT_SOCKET_MEM, 1, NULL, OPT_SOCKET_MEM_NUM }, {OPT_SOCKET_LIMIT, 1, NULL, OPT_SOCKET_LIMIT_NUM }, @@ -98,6 +98,11 @@ eal_long_options[] = { {OPT_MATCH_ALLOCATIONS, 0, NULL, OPT_MATCH_ALLOCATIONS_NUM}, {OPT_TELEMETRY, 0, NULL, OPT_TELEMETRY_NUM }, {OPT_NO_TELEMETRY, 0, NULL, OPT_NO_TELEMETRY_NUM }, + + /* undocumented compatibility with older versions */ + {"pci-blacklist", 1, NULL, OPT_PCI_SKIP_PROBE_NUM }, + {"pci-whitelist", 1, NULL, OPT_PCI_ONLY_PROBE_NUM }, + {0, 0, NULL, 0 } }; @@ -1292,21 +1297,21 @@ eal_parse_common_option(int opt, const char *optarg, static int w_used; switch (opt) { - /* blacklist */ + /* blocklist */ case 'b': if (w_used) goto bw_used; - if (eal_option_device_add(RTE_DEVTYPE_BLACKLISTED_PCI, + if (eal_option_device_add(RTE_DEVTYPE_BLOCKED_PCI, optarg) < 0) { return -1; } b_used = 1; break; - /* whitelist */ + /* allowlist */ case 'w': if (b_used) goto bw_used; - if (eal_option_device_add(RTE_DEVTYPE_WHITELISTED_PCI, + if (eal_option_device_add(RTE_DEVTYPE_ALLOWED_PCI, optarg) < 0) { return -1; } @@ -1590,7 +1595,7 @@ eal_parse_common_option(int opt, const char *optarg, return 0; bw_used: - RTE_LOG(ERR, EAL, "Options blacklist (-b) and whitelist (-w) " + RTE_LOG(ERR, EAL, "Options blocklist (-b) and allowlist (-w) " "cannot be used at the same time\n"); return -1; } @@ -1796,14 +1801,14 @@ eal_common_usage(void) " -n CHANNELS Number of memory channels\n" " -m MB Memory to allocate (see also --"OPT_SOCKET_MEM")\n" " -r RANKS Force number of memory ranks (don't detect)\n" - " -b, --"OPT_PCI_BLACKLIST" Add a PCI device in black list.\n" + " -b, --"OPT_PCI_SKIP_PROBE" Add a PCI device in block list.\n" " Prevent EAL from using this PCI device. The argument\n" " format is .\n" - " -w, --"OPT_PCI_WHITELIST" Add a PCI device in white list.\n" + " -w, --"OPT_PCI_ONLY_PROBE" Add a PCI device in allow list.\n" " Only use the specified PCI devices. The argument format\n" " is <[domain:]bus:devid.func>. This option can be present\n" " several times (once per device).\n" - " [NOTE: PCI whitelist cannot be used with -b option]\n" + " [NOTE: PCI allowlist cannot be used with -b option]\n" " --"OPT_VDEV" Add a virtual device.\n" " The argument format is [,key=val,...]\n" " (ex: --vdev=net_pcap0,iface=eth2).\n" diff --git a/lib/librte_eal/common/eal_options.h b/lib/librte_eal/common/eal_options.h index 18e6da9ab37b..4f2525dc987f 100644 --- a/lib/librte_eal/common/eal_options.h +++ b/lib/librte_eal/common/eal_options.h @@ -13,10 +13,10 @@ enum { /* long options mapped to a short option */ #define OPT_HELP "help" OPT_HELP_NUM = 'h', -#define OPT_PCI_BLACKLIST "pci-blacklist" - OPT_PCI_BLACKLIST_NUM = 'b', -#define OPT_PCI_WHITELIST "pci-whitelist" - OPT_PCI_WHITELIST_NUM = 'w', +#define OPT_PCI_SKIP_PROBE "pci-skip-probe" + OPT_PCI_SKIP_PROBE_NUM = 'b', +#define OPT_PCI_ONLY_PROBE "pci-only-probe" + OPT_PCI_ONLY_PROBE_NUM = 'w', /* first long only option value must be >= 256, so that we won't * conflict with short options */ From patchwork Sat Jun 13 00:00: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: 71497 X-Patchwork-Delegate: thomas@monjalon.net 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 0F524A00BE; Sat, 13 Jun 2020 02:02:15 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CAB911C0B0; Sat, 13 Jun 2020 02:01:18 +0200 (CEST) Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by dpdk.org (Postfix) with ESMTP id 8B7AC1C00D for ; Sat, 13 Jun 2020 02:01:15 +0200 (CEST) Received: by mail-pj1-f43.google.com with SMTP id i4so4533908pjd.0 for ; Fri, 12 Jun 2020 17:01:15 -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=kZIQeAD11O6q9E7Dm9Z4x6U6ePq3LlufFjv03jtBLRQ=; b=M7X9XDhZdAp3dZgfmUbcskwO9yGBkSYkoSwLX3e8Cnst1/7bPFD2VgIxqAUrPuDucr KyCRZ0V/963dD/AbgRYo1590NDGhXwBmEns4B+kTU+aBUoW4RwrxdIE6TM/rYk7Vx7IX vzDRqdPwmT5pvMwW6+nncQ0gVQ6KMMSmmghDVC7XkVKpK4hbYeXFxdM5ybJq+6D+5MDz PfCBPZEB8+w58BexqFuNzO79GNZ5F5E9AQZM2kAIAYP+eXdgF6LVNEvJYZbtyIJK7KGE B7JeHF4Pkec7UmTXElDwTbquQo/1rYsV3yZG4ev8OClddwgNUnDzSl5ZpFBeH9gbIWkD tIdA== 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=kZIQeAD11O6q9E7Dm9Z4x6U6ePq3LlufFjv03jtBLRQ=; b=fxuZqaHnOU0XNfTKdTcJicO7io1xVJGPiBBHNxglQfEakyZB4K+YmI5WEPMhv1fUrq kmAiQZMvkmit57D1kvn9ZFd73Gm4/mUkf0DC8LNmcvAo1LwNOVDoLFf4YJiAgNWMNkQO ntHZJsk0A3Fg9YjWSWB6XJ9ZfIBuOMxGm/CT+WMKxrKOaYV0sHncZ1OWDDjLGAEvIkLi 31H1TqXita0M2TvKCRbBsrFIvxikkBxdJ5uHJ+TEjCwGmoEtDXCPRAO/31gXdknfEkmR XHTZz6Fpuj5axJoiy5RhoQXXOLWdROpPiNLLlmDT/UuG4QY3EmE/fflUy0Dun6iEKRJb xOSQ== X-Gm-Message-State: AOAM530f6wLWpRWHmIp33PqRaKXPxQjT/EZJ2sy57vGXwdsnqLEIS4iU w+8RMXIFyreo713uIKW6m0QKuGB92eY= X-Google-Smtp-Source: ABdhPJyZu3CPVEfiSwNb1QykfmwCus3mX16I9tuydPLi4VT8AO4rR5Tyh9Ik3F6nfhoHX66v9UfLAg== X-Received: by 2002:a17:90a:f87:: with SMTP id 7mr1261959pjz.3.1592006473762; Fri, 12 Jun 2020 17:01:13 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id 6sm7205921pfi.170.2020.06.12.17.01.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jun 2020 17:01:12 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Luca Boccassi Date: Fri, 12 Jun 2020 17:00:52 -0700 Message-Id: <20200613000055.7909-8-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 Subject: [dpdk-dev] [PATCH v3 07/10] doc: replace references to blacklist/whitelist 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 no longer used. Replace them in the documentation. Most of this was automatic replacement, but in a couple of places the language was awkward before and have tried to improve the readabilty. Signed-off-by: Stephen Hemminger Acked-by: Luca Boccassi --- doc/guides/cryptodevs/dpaa2_sec.rst | 4 ++-- doc/guides/cryptodevs/dpaa_sec.rst | 4 ++-- doc/guides/cryptodevs/qat.rst | 4 ++-- doc/guides/freebsd_gsg/build_sample_apps.rst | 2 +- doc/guides/linux_gsg/build_sample_apps.rst | 2 +- doc/guides/linux_gsg/eal_args.include.rst | 14 +++++++------- doc/guides/nics/bnxt.rst | 6 +++--- doc/guides/nics/cxgbe.rst | 4 ++-- doc/guides/nics/dpaa.rst | 4 ++-- doc/guides/nics/dpaa2.rst | 4 ++-- doc/guides/nics/enic.rst | 6 +++--- doc/guides/nics/fail_safe.rst | 14 +++++++------- doc/guides/nics/features.rst | 2 +- doc/guides/nics/ice.rst | 2 +- doc/guides/nics/mlx4.rst | 6 +++--- doc/guides/nics/mlx5.rst | 2 +- doc/guides/nics/sfc_efx.rst | 2 +- doc/guides/nics/tap.rst | 2 +- doc/guides/prog_guide/env_abstraction_layer.rst | 7 +++---- doc/guides/prog_guide/multi_proc_support.rst | 4 ++-- doc/guides/rel_notes/known_issues.rst | 4 ++-- doc/guides/rel_notes/release_2_1.rst | 2 +- doc/guides/sample_app_ug/bbdev_app.rst | 6 +++--- doc/guides/sample_app_ug/ipsec_secgw.rst | 4 ++-- doc/guides/sample_app_ug/l3_forward.rst | 2 +- .../sample_app_ug/l3_forward_access_ctrl.rst | 2 +- 26 files changed, 57 insertions(+), 58 deletions(-) diff --git a/doc/guides/cryptodevs/dpaa2_sec.rst b/doc/guides/cryptodevs/dpaa2_sec.rst index 3053636b8295..363c52f0422f 100644 --- a/doc/guides/cryptodevs/dpaa2_sec.rst +++ b/doc/guides/cryptodevs/dpaa2_sec.rst @@ -134,10 +134,10 @@ Supported DPAA2 SoCs * LS2088A/LS2048A * LS1088A/LS1048A -Whitelisting & Blacklisting +Allowlisting & Blocklisting --------------------------- -For blacklisting a DPAA2 SEC device, following commands can be used. +The DPAA2 SEC device can be blocked with the following: .. code-block:: console diff --git a/doc/guides/cryptodevs/dpaa_sec.rst b/doc/guides/cryptodevs/dpaa_sec.rst index db3c8e918945..295164523d22 100644 --- a/doc/guides/cryptodevs/dpaa_sec.rst +++ b/doc/guides/cryptodevs/dpaa_sec.rst @@ -82,10 +82,10 @@ Supported DPAA SoCs * LS1046A/LS1026A * LS1043A/LS1023A -Whitelisting & Blacklisting +Allowlisting & Blocklisting --------------------------- -For blacklisting a DPAA device, following commands can be used. +For blocking a DPAA device, following commands can be used. .. code-block:: console diff --git a/doc/guides/cryptodevs/qat.rst b/doc/guides/cryptodevs/qat.rst index c2cc3d5cae14..524a25adb644 100644 --- a/doc/guides/cryptodevs/qat.rst +++ b/doc/guides/cryptodevs/qat.rst @@ -122,7 +122,7 @@ Limitations optimisations in the GEN3 device. And if a GCM session is initialised on a GEN3 device, then attached to an op sent to a GEN1/GEN2 device, it will not be enqueued to the device and will be marked as failed. The simplest way to - mitigate this is to use the bdf whitelist to avoid mixing devices of different + mitigate this is to use the bdf allowlist to avoid mixing devices of different generations in the same process if planning to use for GCM. * The mixed algo feature on GEN2 is not supported by all kernel drivers. Check the notes under the Available Kernel Drivers table below for specific details. @@ -253,7 +253,7 @@ adjusted to the number of VFs which the QAT common code will need to handle. QAT VF may expose two crypto devices, sym and asym, it may happen that the number of devices will be bigger than MAX_DEVS and the process will show an error during PMD initialisation. To avoid this problem CONFIG_RTE_CRYPTO_MAX_DEVS may be - increased or -w, pci-whitelist domain:bus:devid:func option may be used. + increased or -w, pci-allowlist domain:bus:devid:func option may be used. QAT compression PMD needs intermediate buffers to support Deflate compression diff --git a/doc/guides/freebsd_gsg/build_sample_apps.rst b/doc/guides/freebsd_gsg/build_sample_apps.rst index 2a68f5fc3820..4fba671e4f5b 100644 --- a/doc/guides/freebsd_gsg/build_sample_apps.rst +++ b/doc/guides/freebsd_gsg/build_sample_apps.rst @@ -67,7 +67,7 @@ DPDK application. Some of the EAL options for FreeBSD are as follows: is a list of cores to use instead of a core mask. * ``-b ``: - Blacklisting of ports; prevent EAL from using specified PCI device + Blocklisting of ports; prevent EAL from using specified PCI device (multiple ``-b`` options are allowed). * ``--use-device``: diff --git a/doc/guides/linux_gsg/build_sample_apps.rst b/doc/guides/linux_gsg/build_sample_apps.rst index 2f606535c374..ebc6e3e02d74 100644 --- a/doc/guides/linux_gsg/build_sample_apps.rst +++ b/doc/guides/linux_gsg/build_sample_apps.rst @@ -102,7 +102,7 @@ The EAL options are as follows: Number of memory channels per processor socket. * ``-b ``: - Blacklisting of ports; prevent EAL from using specified PCI device + Blocklisting of ports; prevent EAL from using specified PCI device (multiple ``-b`` options are allowed). * ``--use-device``: diff --git a/doc/guides/linux_gsg/eal_args.include.rst b/doc/guides/linux_gsg/eal_args.include.rst index 0fe44579689b..41f399ccd608 100644 --- a/doc/guides/linux_gsg/eal_args.include.rst +++ b/doc/guides/linux_gsg/eal_args.include.rst @@ -44,20 +44,20 @@ Lcore-related options Device-related options ~~~~~~~~~~~~~~~~~~~~~~ -* ``-b, --pci-blacklist <[domain:]bus:devid.func>`` +* ``-b, --pci-skip-probe <[domain:]bus:devid.func>`` - Blacklist a PCI device to prevent EAL from using it. Multiple -b options are - allowed. + Skip probing a PCI device to prevent EAL from using it. + Multiple -b options are allowed. .. Note:: - PCI blacklist cannot be used with ``-w`` option. + PCI skip probe cannot be used with the only list ``-w`` option. -* ``-w, --pci-whitelist <[domain:]bus:devid.func>`` +* ``-w, --pci-only-list <[domain:]bus:devid.func>`` - Add a PCI device in white list. + Add a PCI device in to the list of probed devices. .. Note:: - PCI whitelist cannot be used with ``-b`` option. + PCI only list cannot be used with the skip probe ``-b`` option. * ``--vdev `` diff --git a/doc/guides/nics/bnxt.rst b/doc/guides/nics/bnxt.rst index ed650187e0d7..cf273c86b2be 100644 --- a/doc/guides/nics/bnxt.rst +++ b/doc/guides/nics/bnxt.rst @@ -277,7 +277,7 @@ Unicast MAC Filter ^^^^^^^^^^^^^^^^^^ The application adds (or removes) MAC addresses to enable (or disable) -whitelist filtering to accept packets. +allowlist filtering to accept packets. .. code-block:: console @@ -288,7 +288,7 @@ Multicast MAC Filter ^^^^^^^^^^^^^^^^^^^^ Application adds (or removes) Multicast addresses to enable (or disable) -whitelist filtering to accept packets. +allowlist filtering to accept packets. .. code-block:: console @@ -296,7 +296,7 @@ whitelist filtering to accept packets. testpmd> mcast_addr (add|remove) (port_id) (XX:XX:XX:XX:XX:XX) Application adds (or removes) Multicast addresses to enable (or disable) -whitelist filtering to accept packets. +allowlist filtering to accept packets. Note that the BNXT PMD supports up to 16 MC MAC filters. if the user adds more than 16 MC MACs, the BNXT PMD puts the port into the Allmulticast mode. diff --git a/doc/guides/nics/cxgbe.rst b/doc/guides/nics/cxgbe.rst index 54a4c138998c..9aabf346060b 100644 --- a/doc/guides/nics/cxgbe.rst +++ b/doc/guides/nics/cxgbe.rst @@ -40,8 +40,8 @@ expose a single PCI bus address, thus, librte_pmd_cxgbe registers itself as a PCI driver that allocates one Ethernet device per detected port. -For this reason, one cannot whitelist/blacklist a single port without -whitelisting/blacklisting the other ports on the same device. +For this reason, one cannot allowlist/blocklist a single port without +allowlisting/blocklisting the other ports on the same device. .. _t5-nics: diff --git a/doc/guides/nics/dpaa.rst b/doc/guides/nics/dpaa.rst index 17839a920e60..efcbb7207734 100644 --- a/doc/guides/nics/dpaa.rst +++ b/doc/guides/nics/dpaa.rst @@ -162,10 +162,10 @@ Manager. this pool. -Whitelisting & Blacklisting +Allowlisting & Blocklisting --------------------------- -For blacklisting a DPAA device, following commands can be used. +For blocking a DPAA device, following commands can be used. .. code-block:: console diff --git a/doc/guides/nics/dpaa2.rst b/doc/guides/nics/dpaa2.rst index fdfa6fdd5aea..91b5c59f8c0f 100644 --- a/doc/guides/nics/dpaa2.rst +++ b/doc/guides/nics/dpaa2.rst @@ -527,10 +527,10 @@ which are lower than logging ``level``. Using ``pmd.net.dpaa2`` as log matching criteria, all PMD logs can be enabled which are lower than logging ``level``. -Whitelisting & Blacklisting +Allowlisting & Blocklisting --------------------------- -For blacklisting a DPAA2 device, following commands can be used. +For blocking a DPAA2 device, following commands can be used. .. code-block:: console diff --git a/doc/guides/nics/enic.rst b/doc/guides/nics/enic.rst index a28a7f4e477a..69bcfd5c8576 100644 --- a/doc/guides/nics/enic.rst +++ b/doc/guides/nics/enic.rst @@ -187,14 +187,14 @@ or ``vfio`` in non-IOMMU mode. In the VM, the kernel enic driver may be automatically bound to the VF during boot. Unbinding it currently hangs due to a known issue with the driver. To -work around the issue, blacklist the enic module as follows. +work around the issue, blocklist the enic module as follows. Please see :ref:`Limitations ` for limitations in the use of SR-IOV. .. code-block:: console # cat /etc/modprobe.d/enic.conf - blacklist enic + blocklist enic # dracut --force @@ -437,7 +437,7 @@ PKT_RX_VLAN_STRIPPED mbuf flags would not be set. This mode is enabled with the - VF devices are not usable directly from the host. They can only be used as assigned devices on VM instances. - Currently, unbind of the ENIC kernel mode driver 'enic.ko' on the VM - instance may hang. As a workaround, enic.ko should be blacklisted or removed + instance may hang. As a workaround, enic.ko should be blocklisted or removed from the boot process. - pci_generic cannot be used as the uio module in the VM. igb_uio or vfio in non-IOMMU mode can be used. diff --git a/doc/guides/nics/fail_safe.rst b/doc/guides/nics/fail_safe.rst index b4a92f663b17..01ad66bec774 100644 --- a/doc/guides/nics/fail_safe.rst +++ b/doc/guides/nics/fail_safe.rst @@ -68,11 +68,11 @@ Fail-safe command line parameters .. note:: - In case where the sub-device is also used as a whitelist device, using ``-w`` + In case where the sub-device is also used as a allowlist device, using ``-w`` on the EAL command line, the fail-safe PMD will use the device with the options provided to the EAL instead of its own parameters. - When trying to use a PCI device automatically probed by the blacklist mode, + When trying to use a PCI device automatically probed by the blocklist mode, the name for the fail-safe sub-device must be the full PCI id: Domain:Bus:Device.Function, *i.e.* ``00:00:00.0`` instead of ``00:00.0``, as the second form is historically accepted by the DPDK. @@ -123,8 +123,8 @@ This section shows some example of using **testpmd** with a fail-safe PMD. #. To build a PMD and configure DPDK, refer to the document :ref:`compiling and testing a PMD for a NIC `. -#. Start testpmd. The sub-device ``84:00.0`` should be blacklisted from normal EAL - operations to avoid probing it twice, as the PCI bus is in blacklist mode. +#. Start testpmd. The sub-device ``84:00.0`` should be blocklisted from normal EAL + operations to avoid probing it twice, as the PCI bus is in blocklist mode. .. code-block:: console @@ -132,13 +132,13 @@ This section shows some example of using **testpmd** with a fail-safe PMD. --vdev 'net_failsafe0,mac=de:ad:be:ef:01:02,dev(84:00.0),dev(net_ring0)' \ -b 84:00.0 -b 00:04.0 -- -i - If the sub-device ``84:00.0`` is not blacklisted, it will be probed by the + If the sub-device ``84:00.0`` is not blocklisted, it will be probed by the EAL first. When the fail-safe then tries to initialize it the probe operation fails. - Note that PCI blacklist mode is the default PCI operating mode. + Note that PCI blocklist mode is the default PCI operating mode. -#. Alternatively, it can be used alongside any other device in whitelist mode. +#. Alternatively, it can be used alongside any other device in allowlist mode. .. code-block:: console diff --git a/doc/guides/nics/features.rst b/doc/guides/nics/features.rst index edd21c4d8e9d..6aecead6e019 100644 --- a/doc/guides/nics/features.rst +++ b/doc/guides/nics/features.rst @@ -247,7 +247,7 @@ Supports enabling/disabling receiving multicast frames. Unicast MAC filter ------------------ -Supports adding MAC addresses to enable whitelist filtering to accept packets. +Supports adding MAC addresses to enable allowlist filtering to accept packets. * **[implements] eth_dev_ops**: ``mac_addr_set``, ``mac_addr_add``, ``mac_addr_remove``. * **[implements] rte_eth_dev_data**: ``mac_addrs``. diff --git a/doc/guides/nics/ice.rst b/doc/guides/nics/ice.rst index 9a9f4a6bb093..865718fb83cd 100644 --- a/doc/guides/nics/ice.rst +++ b/doc/guides/nics/ice.rst @@ -61,7 +61,7 @@ Runtime Config Options In pipeline mode, a flow can be set at one specific stage by setting parameter ``priority``. Currently, we support two stages: priority = 0 or !0. Flows with priority 0 located at the first pipeline stage which typically be used as a firewall - to drop the packet on a blacklist(we called it permission stage). At this stage, + to drop the packet on a blocklist(we called it permission stage). At this stage, flow rules are created for the device's exact match engine: switch. Flows with priority !0 located at the second stage, typically packets are classified here and be steered to specific queue or queue group (we called it distribution stage), At this stage, flow diff --git a/doc/guides/nics/mlx4.rst b/doc/guides/nics/mlx4.rst index 1f1e2f6c7767..dfdccb4aab7c 100644 --- a/doc/guides/nics/mlx4.rst +++ b/doc/guides/nics/mlx4.rst @@ -29,8 +29,8 @@ Most Mellanox ConnectX-3 devices provide two ports but expose a single PCI bus address, thus unlike most drivers, librte_pmd_mlx4 registers itself as a PCI driver that allocates one Ethernet device per detected port. -For this reason, one cannot white/blacklist a single port without also -white/blacklisting the others on the same device. +For this reason, one cannot white/blocklist a single port without also +white/blocklisting the others on the same device. Besides its dependency on libibverbs (that implies libmlx4 and associated kernel support), librte_pmd_mlx4 relies heavily on system calls for control @@ -422,7 +422,7 @@ devices managed by librte_pmd_mlx4. eth4 eth5 -#. Optionally, retrieve their PCI bus addresses for whitelisting:: +#. Optionally, retrieve their PCI bus addresses for allowlisting:: { for intf in eth2 eth3 eth4 eth5; diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst index 0ff3c5354248..eb27cb5de5a1 100644 --- a/doc/guides/nics/mlx5.rst +++ b/doc/guides/nics/mlx5.rst @@ -1444,7 +1444,7 @@ ConnectX-4/ConnectX-5/ConnectX-6/BlueField devices managed by librte_pmd_mlx5. eth32 eth33 -#. Optionally, retrieve their PCI bus addresses for whitelisting:: +#. Optionally, retrieve their PCI bus addresses for allowlisting:: { for intf in eth2 eth3 eth4 eth5; diff --git a/doc/guides/nics/sfc_efx.rst b/doc/guides/nics/sfc_efx.rst index be1c2fe1d67e..44115a666a94 100644 --- a/doc/guides/nics/sfc_efx.rst +++ b/doc/guides/nics/sfc_efx.rst @@ -290,7 +290,7 @@ Per-Device Parameters ~~~~~~~~~~~~~~~~~~~~~ The following per-device parameters can be passed via EAL PCI device -whitelist option like "-w 02:00.0,arg1=value1,...". +allowlist option like "-w 02:00.0,arg1=value1,...". Case-insensitive 1/y/yes/on or 0/n/no/off may be used to specify boolean parameters value. diff --git a/doc/guides/nics/tap.rst b/doc/guides/nics/tap.rst index 7e44f846206c..0e726bf87f73 100644 --- a/doc/guides/nics/tap.rst +++ b/doc/guides/nics/tap.rst @@ -191,7 +191,7 @@ following:: .. Note: - Change the ``-b`` options to blacklist all of your physical ports. The + Change the ``-b`` options to blocklist all of your physical ports. The following command line is all one line. Also, ``-f themes/black-yellow.theme`` is optional if the default colors diff --git a/doc/guides/prog_guide/env_abstraction_layer.rst b/doc/guides/prog_guide/env_abstraction_layer.rst index 48a2fec066db..0b60ef987db0 100644 --- a/doc/guides/prog_guide/env_abstraction_layer.rst +++ b/doc/guides/prog_guide/env_abstraction_layer.rst @@ -407,12 +407,11 @@ device having emitted a Device Removal Event. In such case, calling callback. Care must be taken not to close the device from the interrupt handler context. It is necessary to reschedule such closing operation. -Blacklisting +Blocklisting ~~~~~~~~~~~~ -The EAL PCI device blacklist functionality can be used to mark certain NIC ports as blacklisted, -so they are ignored by the DPDK. -The ports to be blacklisted are identified using the PCIe* description (Domain:Bus:Device.Function). +The EAL PCI device blocklist functionality can be used to mark certain NIC ports as unavailale, so they are ignored by the DPDK. +The ports to be blocklisted are identified using the PCIe* description (Domain:Bus:Device.Function). Misc Functions ~~~~~~~~~~~~~~ diff --git a/doc/guides/prog_guide/multi_proc_support.rst b/doc/guides/prog_guide/multi_proc_support.rst index a84083b96c8a..14cb6db85661 100644 --- a/doc/guides/prog_guide/multi_proc_support.rst +++ b/doc/guides/prog_guide/multi_proc_support.rst @@ -30,7 +30,7 @@ after a primary process has already configured the hugepage shared memory for th Secondary processes should run alongside primary process with same DPDK version. Secondary processes which requires access to physical devices in Primary process, must - be passed with the same whitelist and blacklist options. + be passed with the same allowlist and blocklist options. To support these two process types, and other multi-process setups described later, two additional command-line parameters are available to the EAL: @@ -131,7 +131,7 @@ can use). .. note:: Independent DPDK instances running side-by-side on a single machine cannot share any network ports. - Any network ports being used by one process should be blacklisted in every other process. + Any network ports being used by one process should be blocklisted in every other process. Running Multiple Independent Groups of DPDK Applications ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/guides/rel_notes/known_issues.rst b/doc/guides/rel_notes/known_issues.rst index de0782136d3c..83a3b38c0ae0 100644 --- a/doc/guides/rel_notes/known_issues.rst +++ b/doc/guides/rel_notes/known_issues.rst @@ -523,8 +523,8 @@ Devices bound to igb_uio with VT-d enabled do not work on Linux kernel 3.15-3.17 DMAR:[fault reason 02] Present bit in context entry is clear **Resolution/Workaround**: - Use earlier or later kernel versions, or avoid driver binding on boot by blacklisting the driver modules. - I.e., in the case of ``ixgbe``, we can pass the kernel command line option: ``modprobe.blacklist=ixgbe``. + Use earlier or later kernel versions, or avoid driver binding on boot by blocklisting the driver modules. + I.e., in the case of ``ixgbe``, we can pass the kernel command line option: ``modprobe.blocklist=ixgbe``. This way we do not need to unbind the device to bind it to igb_uio. **Affected Environment/Platform**: diff --git a/doc/guides/rel_notes/release_2_1.rst b/doc/guides/rel_notes/release_2_1.rst index beadc51ba438..6339172c64fa 100644 --- a/doc/guides/rel_notes/release_2_1.rst +++ b/doc/guides/rel_notes/release_2_1.rst @@ -472,7 +472,7 @@ Resolved Issues * **devargs: Fix crash on failure.** - This problem occurred when passing an invalid PCI id to the blacklist API in + This problem occurred when passing an invalid PCI id to the blocklist API in devargs. diff --git a/doc/guides/sample_app_ug/bbdev_app.rst b/doc/guides/sample_app_ug/bbdev_app.rst index 405e706a46e4..b722d0263772 100644 --- a/doc/guides/sample_app_ug/bbdev_app.rst +++ b/doc/guides/sample_app_ug/bbdev_app.rst @@ -79,7 +79,7 @@ This means that HW baseband device/s must be bound to a DPDK driver or a SW baseband device/s (virtual BBdev) must be created (using --vdev). To run the application in linux environment with the turbo_sw baseband device -using the whitelisted port running on 1 encoding lcore and 1 decoding lcore +using the allowlisted port running on 1 encoding lcore and 1 decoding lcore issue the command: .. code-block:: console @@ -90,7 +90,7 @@ issue the command: where, NIC0PCIADDR is the PCI address of the Rx port This command creates one virtual bbdev devices ``baseband_turbo_sw`` where the -device gets linked to a corresponding ethernet port as whitelisted by +device gets linked to a corresponding ethernet port as allowlisted by the parameter -w. 3 cores are allocated to the application, and assigned as: @@ -111,7 +111,7 @@ Using Packet Generator with baseband device sample application To allow the bbdev sample app to do the loopback, an influx of traffic is required. This can be done by using DPDK Pktgen to burst traffic on two ethernet ports, and it will print the transmitted along with the looped-back traffic on Rx ports. -Executing the command below will generate traffic on the two whitelisted ethernet +Executing the command below will generate traffic on the two allowlisted ethernet ports. .. code-block:: console diff --git a/doc/guides/sample_app_ug/ipsec_secgw.rst b/doc/guides/sample_app_ug/ipsec_secgw.rst index 81c5d4360615..bf1aefc0e120 100644 --- a/doc/guides/sample_app_ug/ipsec_secgw.rst +++ b/doc/guides/sample_app_ug/ipsec_secgw.rst @@ -329,8 +329,8 @@ This means that if the application is using a single core and both hardware and software crypto devices are detected, hardware devices will be used. A way to achieve the case where you want to force the use of virtual crypto -devices is to whitelist the Ethernet devices needed and therefore implicitly -blacklisting all hardware crypto devices. +devices is to allowlist the Ethernet devices needed and therefore implicitly +blocklisting all hardware crypto devices. For example, something like the following command line: diff --git a/doc/guides/sample_app_ug/l3_forward.rst b/doc/guides/sample_app_ug/l3_forward.rst index 07c8d44936d6..69a29ab1314e 100644 --- a/doc/guides/sample_app_ug/l3_forward.rst +++ b/doc/guides/sample_app_ug/l3_forward.rst @@ -148,7 +148,7 @@ or In this command: -* -w option whitelist the event device supported by platform. Way to pass this device may vary based on platform. +* -w option allowlist the event device supported by platform. Way to pass this device may vary based on platform. * The --mode option defines PMD to be used for packet I/O. diff --git a/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst b/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst index a44fbcd52c3a..473326275e49 100644 --- a/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst +++ b/doc/guides/sample_app_ug/l3_forward_access_ctrl.rst @@ -18,7 +18,7 @@ The application loads two types of rules at initialization: * Route information rules, which are used for L3 forwarding -* Access Control List (ACL) rules that blacklist (or block) packets with a specific characteristic +* Access Control List (ACL) rules that blocklist (or block) packets with a specific characteristic When packets are received from a port, the application extracts the necessary information from the TCP/IP header of the received packet and From patchwork Sat Jun 13 00:00:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 71498 X-Patchwork-Delegate: thomas@monjalon.net 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 C95E4A00BE; Sat, 13 Jun 2020 02:02:26 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 13FB11C0C6; Sat, 13 Jun 2020 02:01:20 +0200 (CEST) Received: from mail-pj1-f67.google.com (mail-pj1-f67.google.com [209.85.216.67]) by dpdk.org (Postfix) with ESMTP id 0B2551C014 for ; Sat, 13 Jun 2020 02:01:17 +0200 (CEST) Received: by mail-pj1-f67.google.com with SMTP id m2so4531940pjv.2 for ; Fri, 12 Jun 2020 17:01:16 -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=y08CVofLWrNVCa/ZxBHEAYEWxvugLfYGWc0Bh888XpU=; b=kzAa+ZedwmwIhyToDDPkM2vt0tiJvp7Oe9NVRkKcbm16mcb+nKGTW55tb+97xXE7AF 53MXxaBjjxqQwo98JEwth/CBxy3j92JcWUA4qSEwgc1uFyO62gOSLFeQUbsgKyfBFejs CY0LqvjOjkWIKXyr7ICeginr5p8cWEbSOGmyw8IFxGqo+qGV/9En6vToy9LJ5GQ/5rZL VJL3YHIrOFlziL5CzXnN5c3T3iQW2vefyVl9JwLNdSYerbZ5CtzbY1UGaaqBB0p27El3 oK+zmUQFVqRPmTe7UODfGQ6gzAmj/lfw1pVBVa/Omf3z5HTAeR1O3Gf7PkAH2DgvYUS9 la/w== 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=y08CVofLWrNVCa/ZxBHEAYEWxvugLfYGWc0Bh888XpU=; b=nlmnymS5B4siJNniwDJeM5mLd5IonFav4Bsi/rJ/z7QMmvcZKgUkBZX0nISwNmyQXO 27X2bXDMiA3bZgwgR0yS25BU7YuVzB2gFmFpkxojBQyGRhEhm98V7EGo+6brQtUGiX8a T+4Y1BSuXWlg/aCikTksJYV38TYkB1pYid0f0t2Hof/jTTeuR8H43aj2BHHm90c9WXCC R8Jx7o3uf5bylPwtdcNBFU5UkQoj+PvgL2zXReV05UppITWOoHviQdAiEr3Pz0HhtLQP A7ckmZfInk4apiJ585Xc1ap0oulpJWo3E2COP07Fa6g5Y/DbSy+aGqktpwzpLOWn5eUO tEmA== X-Gm-Message-State: AOAM5314RRUFmAVkL/jsMKI69xIH59RWVaXdlNgCjLDfRFYZaYuhnncE vMZkx78wrEi0B97SzQ98MGKfyDx2txM= X-Google-Smtp-Source: ABdhPJzZwY3hjAs3kyPiKLrYHxFJU6LK1mJmabFm6S6p48e85qMzOBXJM0bxDl9/U6UGjwo4v4Dhsw== X-Received: by 2002:a17:902:40a:: with SMTP id 10mr12932459ple.52.1592006475211; Fri, 12 Jun 2020 17:01:15 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id 6sm7205921pfi.170.2020.06.12.17.01.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jun 2020 17:01:14 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Luca Boccassi Date: Fri, 12 Jun 2020 17:00:53 -0700 Message-Id: <20200613000055.7909-9-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 Subject: [dpdk-dev] [PATCH v3 08/10] app/test: use new allowlist and blocklist 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" Test the renamed pci-blocklist and pci-allowlist arguments. Use new terms in test variable names as well. Signed-off-by: Stephen Hemminger Acked-by: Luca Boccassi --- app/test/autotest.py | 16 ++++++------ app/test/autotest_runner.py | 18 ++++++------- app/test/test.c | 2 +- app/test/test_eal_flags.c | 52 ++++++++++++++++++------------------- 4 files changed, 44 insertions(+), 44 deletions(-) diff --git a/app/test/autotest.py b/app/test/autotest.py index b42f48879cc2..14b39a2e3347 100644 --- a/app/test/autotest.py +++ b/app/test/autotest.py @@ -11,7 +11,7 @@ def usage(): print("Usage: autotest.py [test app|test iso image] ", - "[target] [whitelist|-blacklist]") + "[target] [allowlist|-blocklist]") if len(sys.argv) < 3: usage() @@ -19,18 +19,18 @@ def usage(): target = sys.argv[2] -test_whitelist = None -test_blacklist = None +test_allowlist = None +test_blocklist = None -# get blacklist/whitelist +# get blocklist/allowlist if len(sys.argv) > 3: testlist = sys.argv[3].split(',') testlist = [test.lower() for test in testlist] if testlist[0].startswith('-'): testlist[0] = testlist[0].lstrip('-') - test_blacklist = testlist + test_blocklist = testlist else: - test_whitelist = testlist + test_allowlist = testlist cmdline = "%s -c f" % (sys.argv[1]) @@ -40,8 +40,8 @@ def usage(): # processes, so make it 1, otherwise make it 4. ignored for non-parallel tests n_processes = 1 if "bsd" in target else 4 -runner = autotest_runner.AutotestRunner(cmdline, target, test_blacklist, - test_whitelist, n_processes) +runner = autotest_runner.AutotestRunner(cmdline, target, test_blocklist, + test_allowlist, n_processes) runner.parallel_tests = autotest_data.parallel_test_list[:] runner.non_parallel_tests = autotest_data.non_parallel_test_list[:] diff --git a/app/test/autotest_runner.py b/app/test/autotest_runner.py index 95e74c760dba..72180a172553 100644 --- a/app/test/autotest_runner.py +++ b/app/test/autotest_runner.py @@ -193,14 +193,14 @@ class AutotestRunner: n_tests = 0 fails = 0 log_buffers = [] - blacklist = [] - whitelist = [] + blocklist = [] + allowlist = [] - def __init__(self, cmdline, target, blacklist, whitelist, n_processes): + def __init__(self, cmdline, target, blocklist, allowlist, n_processes): self.cmdline = cmdline self.target = target - self.blacklist = blacklist - self.whitelist = whitelist + self.blocklist = blocklist + self.allowlist = allowlist self.skipped = [] self.parallel_tests = [] self.non_parallel_tests = [] @@ -274,7 +274,7 @@ def __process_result(self, result): self.csvwriter.writerow([test_name, test_result, result_str]) # this function checks individual test and decides if this test should be in - # the group by comparing it against whitelist/blacklist. it also checks if + # the group by comparing it against allowlist/blocklist. it also checks if # the test is compiled into the binary, and marks it as skipped if necessary def __filter_test(self, test): test_cmd = test["Command"] @@ -284,10 +284,10 @@ def __filter_test(self, test): if "_autotest" in test_id: test_id = test_id[:-len("_autotest")] - # filter out blacklisted/whitelisted tests - if self.blacklist and test_id in self.blacklist: + # filter out blocklisted/allowlisted tests + if self.blocklist and test_id in self.blocklist: return False - if self.whitelist and test_id not in self.whitelist: + if self.allowlist and test_id not in self.allowlist: return False # if test wasn't compiled in, remove it as well diff --git a/app/test/test.c b/app/test/test.c index 94d26ab1f67c..13253ccee0bb 100644 --- a/app/test/test.c +++ b/app/test/test.c @@ -61,7 +61,7 @@ do_recursive_call(void) { "test_master_lcore_flag", no_action }, { "test_invalid_n_flag", no_action }, { "test_no_hpet_flag", no_action }, - { "test_whitelist_flag", no_action }, + { "test_allowlist_flag", no_action }, { "test_invalid_b_flag", no_action }, { "test_invalid_vdev_flag", no_action }, { "test_invalid_r_flag", no_action }, diff --git a/app/test/test_eal_flags.c b/app/test/test_eal_flags.c index 4ee809e3db2e..37807d10931d 100644 --- a/app/test/test_eal_flags.c +++ b/app/test/test_eal_flags.c @@ -30,7 +30,7 @@ #define no_hpet "--no-hpet" #define no_huge "--no-huge" #define no_shconf "--no-shconf" -#define pci_whitelist "--pci-whitelist" +#define pci_allowlist "--pci-allowlist" #define vdev "--vdev" #define memtest "memtest" #define memtest1 "memtest1" @@ -223,12 +223,12 @@ get_number_of_sockets(void) #endif /* - * Test that the app doesn't run with invalid whitelist option. + * Test that the app doesn't run with invalid allowlist option. * Final tests ensures it does run with valid options as sanity check (one * test for with Domain+BDF, second for just with BDF) */ static int -test_whitelist_flag(void) +test_allowlist_flag(void) { unsigned i; #ifdef RTE_EXEC_ENV_FREEBSD @@ -245,45 +245,45 @@ test_whitelist_flag(void) const char *wlinval[][7] = { {prgname, prefix, mp_flag, - pci_whitelist, "error", "", ""}, + pci_allowlist, "error", "", ""}, {prgname, prefix, mp_flag, - pci_whitelist, "0:0:0", "", ""}, + pci_allowlist, "0:0:0", "", ""}, {prgname, prefix, mp_flag, - pci_whitelist, "0:error:0.1", "", ""}, + pci_allowlist, "0:error:0.1", "", ""}, {prgname, prefix, mp_flag, - pci_whitelist, "0:0:0.1error", "", ""}, + pci_allowlist, "0:0:0.1error", "", ""}, {prgname, prefix, mp_flag, - pci_whitelist, "error0:0:0.1", "", ""}, + pci_allowlist, "error0:0:0.1", "", ""}, {prgname, prefix, mp_flag, - pci_whitelist, "0:0:0.1.2", "", ""}, + pci_allowlist, "0:0:0.1.2", "", ""}, }; - /* Test with valid whitelist option */ + /* Test with valid allowlist option */ const char *wlval1[] = {prgname, prefix, mp_flag, - pci_whitelist, "00FF:09:0B.3"}; + pci_allowlist, "00FF:09:0B.3"}; const char *wlval2[] = {prgname, prefix, mp_flag, - pci_whitelist, "09:0B.3", pci_whitelist, "0a:0b.1"}; + pci_allowlist, "09:0B.3", pci_allowlist, "0a:0b.1"}; const char *wlval3[] = {prgname, prefix, mp_flag, - pci_whitelist, "09:0B.3,type=test", - pci_whitelist, "08:00.1,type=normal", + pci_allowlist, "09:0B.3,type=test", + pci_allowlist, "08:00.1,type=normal", }; for (i = 0; i < RTE_DIM(wlinval); i++) { if (launch_proc(wlinval[i]) == 0) { printf("Error - process did run ok with invalid " - "whitelist parameter\n"); + "allowlist parameter\n"); return -1; } } if (launch_proc(wlval1) != 0 ) { - printf("Error - process did not run ok with valid whitelist\n"); + printf("Error - process did not run ok with valid allowlist\n"); return -1; } if (launch_proc(wlval2) != 0 ) { - printf("Error - process did not run ok with valid whitelist value set\n"); + printf("Error - process did not run ok with valid allowlist value set\n"); return -1; } if (launch_proc(wlval3) != 0 ) { - printf("Error - process did not run ok with valid whitelist + args\n"); + printf("Error - process did not run ok with valid allowlist + args\n"); return -1; } @@ -291,7 +291,7 @@ test_whitelist_flag(void) } /* - * Test that the app doesn't run with invalid blacklist option. + * Test that the app doesn't run with invalid blocklist option. * Final test ensures it does run with valid options as sanity check */ static int @@ -317,7 +317,7 @@ test_invalid_b_flag(void) {prgname, prefix, mp_flag, "-b", "error0:0:0.1"}, {prgname, prefix, mp_flag, "-b", "0:0:0.1.2"}, }; - /* Test with valid blacklist option */ + /* Test with valid blocklist option */ const char *blval[] = {prgname, prefix, mp_flag, "-b", "FF:09:0B.3"}; @@ -326,12 +326,12 @@ test_invalid_b_flag(void) for (i = 0; i != RTE_DIM(blinval); i++) { if (launch_proc(blinval[i]) == 0) { printf("Error - process did run ok with invalid " - "blacklist parameter\n"); + "blocklist parameter\n"); return -1; } } if (launch_proc(blval) != 0) { - printf("Error - process did not run ok with valid blacklist value\n"); + printf("Error - process did not run ok with valid blocklist value\n"); return -1; } return 0; @@ -419,7 +419,7 @@ test_invalid_r_flag(void) {prgname, prefix, mp_flag, "-r", "-1"}, {prgname, prefix, mp_flag, "-r", "17"}, }; - /* Test with valid blacklist option */ + /* Test with valid blocklist option */ const char *rval[] = {prgname, prefix, mp_flag, "-r", "16"}; int i; @@ -1489,9 +1489,9 @@ test_eal_flags(void) return ret; } - ret = test_whitelist_flag(); + ret = test_allowlist_flag(); if (ret < 0) { - printf("Error in test_invalid_whitelist_flag()\n"); + printf("Error in test_invalid_allowlist_flag()\n"); return ret; } @@ -1543,7 +1543,7 @@ REGISTER_TEST_COMMAND(eal_flags_master_opt_autotest, test_master_lcore_flag); REGISTER_TEST_COMMAND(eal_flags_n_opt_autotest, test_invalid_n_flag); REGISTER_TEST_COMMAND(eal_flags_hpet_autotest, test_no_hpet_flag); REGISTER_TEST_COMMAND(eal_flags_no_huge_autotest, test_no_huge_flag); -REGISTER_TEST_COMMAND(eal_flags_w_opt_autotest, test_whitelist_flag); +REGISTER_TEST_COMMAND(eal_flags_w_opt_autotest, test_allowlist_flag); REGISTER_TEST_COMMAND(eal_flags_b_opt_autotest, test_invalid_b_flag); REGISTER_TEST_COMMAND(eal_flags_vdev_opt_autotest, test_invalid_vdev_flag); REGISTER_TEST_COMMAND(eal_flags_r_opt_autotest, test_invalid_r_flag); From patchwork Sat Jun 13 00:00:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 71499 X-Patchwork-Delegate: thomas@monjalon.net 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 B696AA00BE; Sat, 13 Jun 2020 02:02:38 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C20CC1C12F; Sat, 13 Jun 2020 02:01:21 +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 175581C07E for ; Sat, 13 Jun 2020 02:01:18 +0200 (CEST) Received: by mail-pg1-f193.google.com with SMTP id w20so4862078pga.6 for ; Fri, 12 Jun 2020 17:01:18 -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=KwzVuk45Qw5c35FLz95SxK9IsWCloAy0F5VLjgrWh24=; b=fmf+ezHPuZeb7Iscq5TKr+xM66x+EYiOkZuRU1Mv+VU2P6syoHlfBdzsqjlHVhVjQd pYUOkfCfD9mpe8xUwKZSJ1jBerRJ2uyzbSME3CEpNsezOKs8DJvRxnvx64YKyg1s527M Q5K7yWzCuENlO3exsAdRXPwEO5BVtF/k3XkGIm+vosm7XGAPDTixT077sHg4JoGWpE0F 1jqaYnljsxY3Pppl4vEL59SA7KSXD1vtbuHFn8j8HU+svSTpGF9qSZ48FFU7cca8vez9 CR6AoDwgCR1O6guEe3fHVg/u3s2EfTdrLmhvljbA+bF6m02dXAoi9HhPjuhuX1trJAUN MZ9Q== 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=KwzVuk45Qw5c35FLz95SxK9IsWCloAy0F5VLjgrWh24=; b=fYISXDrutm0FSCcfLvAEDQ9fvqV4t8jQHDqAwcado+SxtzaLIaKd8lBzn5XntHIXZ+ wCDD5hW5IvpmA1B2sawWmBB6QHoEjoBC22UIwadNoCAcY/1YXt38J47WNVrwTfZYiaVT /YH/8KHmKjYDLqsXYHfhWoplE50t3bkHRtfTpIfjPzgZeNqPphVU75h3VS+KK5ndK4cA blI+Hxxd0pHLq4+Wr1eW2/vluKGwyLl7dxc8TUwtg1mmbGxpsciFUQozwqrzp28WVC+9 ku/r2KLDiYRD0gcD/XOj8s6TfwA0qUpjSGcWB0uC31oV499KZq8Fa4sUUsoeVXN9v7SF YMbQ== X-Gm-Message-State: AOAM5331d+efx2AkmWmNPv9myff9BEtyQH5DZq+QUffb0ZLuals3nFlw 8HRyofzkpMIHz5Ai+/owJQ0JWeO1zig= X-Google-Smtp-Source: ABdhPJxp2yQF04vdJDF+GKf8tHgJkHdyQlPsqH3iZnxvHS+y1K3iwsqxSV+qxJe/92yGS/CsdPNjJw== X-Received: by 2002:a05:6a00:134c:: with SMTP id k12mr13640234pfu.313.1592006476736; Fri, 12 Jun 2020 17:01:16 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id 6sm7205921pfi.170.2020.06.12.17.01.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jun 2020 17:01:15 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Luca Boccassi Date: Fri, 12 Jun 2020 17:00:54 -0700 Message-Id: <20200613000055.7909-10-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 Subject: [dpdk-dev] [PATCH v3 09/10] doc: add note about blacklist/whitelist changes 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 blacklist/whitelist changes to API will not be a breaking change for applications in this release but worth adding a note to encourage migration. Signed-off-by: Stephen Hemminger Acked-by: Luca Boccassi --- doc/guides/rel_notes/release_20_08.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/guides/rel_notes/release_20_08.rst b/doc/guides/rel_notes/release_20_08.rst index dee4ccbb5887..9e68544e7920 100644 --- a/doc/guides/rel_notes/release_20_08.rst +++ b/doc/guides/rel_notes/release_20_08.rst @@ -91,6 +91,11 @@ API Changes Also, make sure to start the actual text at the margin. ========================================================= +* eal: The definitions related to including and excluding devices + has been changed from blacklist/whitelist to blocklist/allowlist. + There are compatiablity macros and command line mapping to accept + the old values but applications and scripts are strongly encouraged + to migrate to the new names. ABI Changes ----------- From patchwork Sat Jun 13 00:00:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 71500 X-Patchwork-Delegate: thomas@monjalon.net 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 1C435A00BE; Sat, 13 Jun 2020 02:02:46 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D99571C194; Sat, 13 Jun 2020 02:01:22 +0200 (CEST) Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by dpdk.org (Postfix) with ESMTP id 6B8851C0BF for ; Sat, 13 Jun 2020 02:01:19 +0200 (CEST) Received: by mail-pg1-f196.google.com with SMTP id l63so2616690pge.12 for ; Fri, 12 Jun 2020 17:01:19 -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=oCyaVkNsuXTWoNhLqwAmK5SoYM/51ofXAdsYujHO+/Q=; b=tTslLwY/nCKetawhEpq8kP+QLmcSmYfMOBi03RiqmW3yoLtNV6Kn5OKWgWsZ/SWTYE BkgX7gqwo+f3p01MIPfw4WWWCfqdTrVlIiUCG/VuYuB5WIsRfRi9bFZbjtkasTvH2QTN Tom3EbnjrAsrxbttWRexc44ArIgpnwm9oZFGEii3ZoEr8M95hmcZ3F9j/OkDghZVz8jH zq2pwUqhYialihM1TTQZYJ7wS6TcZqbuJMMIjLZj8Rt1Yy7L3ZMyvz0jNsTzqot5gIri 7vv8i7QXSDfv5alD1Wxy5KdQXLgoqDan2pkLX0fe/9n6QqnBjMRvNYxwGHBd3nbBpBJ7 MJIg== 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=oCyaVkNsuXTWoNhLqwAmK5SoYM/51ofXAdsYujHO+/Q=; b=pPdZmh95mI1B5YGPFo2Uocudy7jmOzStx6OCh7aVrCv4pfauKyBuzYUDuUWiKW7WQw zKvZwAcrmxA9YhXKXSetybE2D1eScKynNy1P10AJB7+PA07IgLL6G1rI9/R/ynu/TNzS YjQi4ybLi6yOQyZ/jRlny4xPdg0oWc0TvHU+Jw6Yz3HoDAv2PDoDBzg+p2qgra6FCQWM MCD6TH97SxY+GGV88rBn/RtllXLNlDNSoSFc5gwk7vmyDagmauucqBoJO5hxodWwGlwN D/UT+bH7OwARQCBddLkfvQUkPBj3sQcyrYXpqdfEvfr184V1uD9pYsx9fXP64cWw1S5q IA0A== X-Gm-Message-State: AOAM533Zpbyrf9EJTOTaz+cpOCo7UEK1/UUXeBwFP212qFKRcvjnCVWR 6loCSYaXJVx/uv7g7wEcuV0DT5CM2+E= X-Google-Smtp-Source: ABdhPJwBuClgF5pfyRBtQWJxJUkjJsQRjk8MU4FUq/+hxBy6IJy0uRWUey4eQZCOE03pZPYNMDoAGQ== X-Received: by 2002:a62:5210:: with SMTP id g16mr10283638pfb.204.1592006478165; Fri, 12 Jun 2020 17:01:18 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id 6sm7205921pfi.170.2020.06.12.17.01.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jun 2020 17:01:17 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Luca Boccassi Date: Fri, 12 Jun 2020 17:00:55 -0700 Message-Id: <20200613000055.7909-11-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 Subject: [dpdk-dev] [PATCH v3 10/10] eal: mark old macros for blacklist/whitelist as deprecated 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" Use of these macros in applications should cause a deprecation warning. Signed-off-by: Stephen Hemminger Acked-by: Luca Boccassi --- lib/librte_eal/include/rte_bus.h | 9 +++++++-- lib/librte_eal/include/rte_dev.h | 10 +++++++--- lib/librte_eal/include/rte_devargs.h | 10 +++++++--- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/lib/librte_eal/include/rte_bus.h b/lib/librte_eal/include/rte_bus.h index 19309ad2ddd7..aa0f3aa9c81b 100644 --- a/lib/librte_eal/include/rte_bus.h +++ b/lib/librte_eal/include/rte_bus.h @@ -220,8 +220,13 @@ enum rte_bus_scan_mode { }; /* Backwards compatibility will be deprecated */ -#define RTE_BUS_SCAN_WHITELIST RTE_BUS_SCAN_ALLOWLIST -#define RTE_BUS_SCAN_BLACKLIST RTE_BUS_SCAN_BLOCKLIST +#define RTE_BUS_SCAN_WHITELIST \ + _Pragma("GCC warning \"'RTE_BUS_SCAN_WHITELIST' macro is deprecated.\"") \ + RTE_BUS_SCAN_ALLOWLIST + +#define RTE_BUS_SCAN_BLACKLIST \ + _Pragma("GCC warning \"'RTE_BUS_SCAN_BLACKLIST' macro is deprecated.\"") \ + 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 1208b1e99b05..81dded1dad24 100644 --- a/lib/librte_eal/include/rte_dev.h +++ b/lib/librte_eal/include/rte_dev.h @@ -74,9 +74,13 @@ enum rte_dev_policy { RTE_DEV_BLOCKED, }; -/* Backwards compatiablity will be deprecated */ -#define RTE_DEV_WHITELISTED RTE_DEV_ALLOWED -#define RTE_DEV_BLACKLISTED RTE_DEV_BLOCKED +#define RTE_DEV_WHITELISTED \ + _Pragma("GCC warning \"'RTE_DEV_WHITELISTED' macro is deprecated.\"") \ + RTE_DEV_ALLOWED + +#define RTE_DEV_BLACKLISTED \ + _Pragma("GCC warning \"'RTE_DEV_BLACKLISTED' macro is deprecated.\"") \ + 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 e1a4277ff167..535bff9a14fb 100644 --- a/lib/librte_eal/include/rte_devargs.h +++ b/lib/librte_eal/include/rte_devargs.h @@ -34,9 +34,13 @@ enum rte_devtype { 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 +#define RTE_DEVTYPE_WHITELISTED_PCI \ + _Pragma("GCC warning \"'RTE_DEVTYPE_WHITELISTED_PCI' macro is deprecated.\"") \ + RTE_DEVTYPE_ALLOWED_PCI + +#define RTE_DEVTYPE_BLACKLISTED_PCI \ + _Pragma("GCC warning \"'RTE_DEVTYPE_BLACKLISTED_PCI' macro is deprecated.\"") \ + RTE_DEVTYPE_BLOCKED_PCI /** * Structure that stores a device given by the user with its arguments