From patchwork Mon Jun 8 19:25:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 70973 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 7691DA04F2; Mon, 8 Jun 2020 21:26:06 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8C76A2D13; Mon, 8 Jun 2020 21:26:00 +0200 (CEST) Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by dpdk.org (Postfix) with ESMTP id 6A02B2C60 for ; Mon, 8 Jun 2020 21:25:59 +0200 (CEST) Received: by mail-pg1-f194.google.com with SMTP id d10so9201522pgn.4 for ; Mon, 08 Jun 2020 12:25:59 -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=qZjsaZFNml3wgOdOZ1yamYvJdCOSg46jx9Ic8aWSJ+s=; b=nsrOM4H/1SlOCsbauuTWEHp5AAlhwStgUJ5O2jCiJQT7nvkToRvx6L3yz+Bp65Ooz0 OAPGQh3wIOdonipkhbvPSup4DPxiD4K1lvxkqHB+kG/GakCKMte+zNRjfPR9wSFJNTGm IfkHms5xQRCoOwFoQaQXURb6k6ANvMH1+ZVWhLaIC7M6rN4RA1/HnkUi6XaLjLQyXKf0 EY0MWrsokKaW0VaMmX/4vpPauHY+1qnstrT6FvCIU0dHEd52OEU2VxEWBTR76wujY5yK eDiQg06QWMFMD9zNolfPwmnNUlHydP8m/Ghsh+SUyFQ6Ku7N/C/Fb/fRXlfBG3eYTkj7 1cbg== 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=qZjsaZFNml3wgOdOZ1yamYvJdCOSg46jx9Ic8aWSJ+s=; b=PrHtWnsuPeHE8RceRhU7PsbY6B0MD/DmRS1jnsS3XIS8kUj5bBjsPANoo60HMYOe+E bB40LLAZHT42zPMNgOjO4P5Nq3rs9wRK16KFZbKDBr6L0O2dADKT86fLP5+5mM5rhj/Z dACL433nuI/zMIrUm+D2HxlGJMftE5/dNkQm7SIEvrE0nM66gpKBn/GAlnUXjtlnf/YG vXfn7yaoPr4bNjPHjJtwIBrUYqzNfXg1CGgrdYLT5VJQ6PQj5aJTGtS3GkTkd/KG6VKf +hgq99BYMssHD/V6ED3S57tvy1vwrnCysQB7Byyrt4qbB0jKzpp2ID4c89tMHgkv1rHa SS7A== X-Gm-Message-State: AOAM531dcpAwoFX1+W++g32VccEq6Gm7P7q2DudZp+IV1ur5dHTfBNoB rlwm1wCm1XGBH6Hlzuth2xL0WZqf6PM= X-Google-Smtp-Source: ABdhPJz5HeHr3fXS36TmgRQ3DXMT0t7lTFh04hCeTNJlFStFluHFlskNf5EBrVY+IPKROqVt8YBcEg== X-Received: by 2002:a63:480d:: with SMTP id v13mr8896327pga.286.1591644358152; Mon, 08 Jun 2020 12:25:58 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id z140sm8114529pfc.135.2020.06.08.12.25.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jun 2020 12:25:56 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Mon, 8 Jun 2020 12:25:37 -0700 Message-Id: <20200608192546.7160-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200608192546.7160-1-stephen@networkplumber.org> References: <20200607170127.15694-1-stephen@networkplumber.org> <20200608192546.7160-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 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 --- 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 an set of addresses used for accepting incoming packets. * * @param port_id * The port identifier of the Ethernet device. From patchwork Mon Jun 8 19:25:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 70974 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 F2131A04F2; Mon, 8 Jun 2020 21:26:14 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id F2A0749E0; Mon, 8 Jun 2020 21:26:02 +0200 (CEST) Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by dpdk.org (Postfix) with ESMTP id 1F71F374C for ; Mon, 8 Jun 2020 21:26:01 +0200 (CEST) Received: by mail-pg1-f179.google.com with SMTP id e9so9172056pgo.9 for ; Mon, 08 Jun 2020 12:26:01 -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=WHMEMgHTeULq2ZwQQasoG8F/y8jATXS0avBmKgmNwvI=; b=f3q2WE3K2jnAY+wqB5M3/S0FkmQklcaConIMfkQbodfBan9RKKbFtZDKZcw3MJVEbE raQyZeiS/UKKn1Jn/mo+FBuOpPPQbqxdaSvzjEy4oSXrxSleybZ6gFRnlHvDJbSuKr0C +JOXpi+RU4U7cxsqw36MHiJqlE2aUcTrovi9H99zHbVDCjThcm/rINuq/M7uD9hxno9W 86ZMGhXwVZrGKCcAk3/uyxFOqldBkCok9ZgSkz1E4VA66QPVYxby6ukluZ7NRZ/z0wAF g+LSBsCDcHkF5aNlD+9CQ1kB8c9ueGVp/Q0Hdo9Qzybw64rxEARSmuHyuymaZGHQ3VhS WYjg== 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=WHMEMgHTeULq2ZwQQasoG8F/y8jATXS0avBmKgmNwvI=; b=tmk4JMs9U+e0Gso38Bq3gjCdTJSZ1CcRYJEqcOCSxV6qAVYCIAj3+oOTP4ZW2G78g9 Z0/AufZ48TTJc4JZtrFmc6JjYz58/anb6KFzYHwOm9TNuVm2+/R2+k7ynKL/Jjb44gpv OBTublBxbaPvpRevviqhquNJuqN+RAB2E/5OTU5PDKq2We6BBLQ/I/61LeQjOpK7Uwqx s9wmWxjwlUVrWFcPNVBGNwBFASRhbgB5T/XzDxkg3SFNFFs/F8ptt65w2Mc8rQ+1CpUX JQUt9xKxQ9xIkStPuX4g+82H4HpMDj+3lVH6AuTNW+LHe2zVm98a6xEGANN8ufMXT7dh bflA== X-Gm-Message-State: AOAM532sxc6CY5s3REt/DZcYgBgfofwFQQuJIiAAQKpoJr0yirEajVFe XOTTxkXdCbguYd1IgNVnnIgkuICb7eg= X-Google-Smtp-Source: ABdhPJxCBQKM3D7PkOvtMtCGRI0lEAdVQ3LCelEvGAB31DpfL7XvKkReRBDEcriXxge+Gyjx3kELeA== X-Received: by 2002:a63:d652:: with SMTP id d18mr21962577pgj.164.1591644359863; Mon, 08 Jun 2020 12:25:59 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id z140sm8114529pfc.135.2020.06.08.12.25.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jun 2020 12:25:58 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Mon, 8 Jun 2020 12:25:38 -0700 Message-Id: <20200608192546.7160-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200608192546.7160-1-stephen@networkplumber.org> References: <20200607170127.15694-1-stephen@networkplumber.org> <20200608192546.7160-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 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 --- 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 Mon Jun 8 19:25:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 70975 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 DDF58A04F2; Mon, 8 Jun 2020 21:26:22 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3774C4C99; Mon, 8 Jun 2020 21:26:04 +0200 (CEST) Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by dpdk.org (Postfix) with ESMTP id 8401937B0 for ; Mon, 8 Jun 2020 21:26:02 +0200 (CEST) Received: by mail-pj1-f47.google.com with SMTP id a45so231869pje.1 for ; Mon, 08 Jun 2020 12:26:02 -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=3eWKfuCB9j+aWczWABajV8TpkcuUf3NeJd4VolVpqho=; b=dsNZcwVVXNBODd6iczczIWHbIM4h+jpATWTPrTu24PV+U+e64O+3ILr+HlOhh/BHzF sQqWO7xIkzUS7atQ1xk2b7Mu/V26ZbcNmwdbqUhTO+5xffZU8rcKh38S9PSgl1PcBATH 2D44F0b+t/dBfhMpd1lgRUiIJ5XG2adhDZWJAufg4fDqnSyS2+Dt1F4VO0q+nMiCJ6Ry SgXY9scfNv60x9sJXTNbdcligaP5GT6iSTm6qxvs2mbFAN09fsMXhNW3yfDietlkj7d7 wvI4OmBuGSL9rSX12UxWEQCt+L0wyCJlGQhflM2Z+tnW7aRiDSpZh374mU7oPYMZ0C8n 0pQQ== 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=3eWKfuCB9j+aWczWABajV8TpkcuUf3NeJd4VolVpqho=; b=i4Lh95EOj1MIPTVVCWbWH6gY51I5e/JZ5BRQicK8d1gvqeUFtUPqMzsFFnSNmI0BZK e9c6w/yEHCt6BA4jR2OsIxLYA3UKtgNeNpkuV08Wd8sDgmtEInNdCPGXvozYRd6VGj/I mr7+Tz+q+TGIrAPrmb2XmuVC9Gz3v7bC8boiVzw+VDNyYZAfUbQil1GeiXnQuBjbhhHc OENvUkRVJOIsuA3z4Gi9cGaktD4LVFeEgn3hJT9IUPhQ2NNUfzWYZwxLfXCFY6QUXY8f 3oXv8yPD7uMRWi+Zt8UFma38FWNeTEqVqHhTZnvQhD20oT2AFt6r3jUQkxd+1Kj1d3Mi yO9A== X-Gm-Message-State: AOAM532WhtnUF52VdQm7uijjek+PjFMRf2piTTvWdEAYW4IDVkGnAnzm UWY5Q9g4v2zIMM6kOKuuiNHgX9fcfAI= X-Google-Smtp-Source: ABdhPJzGWht8LRAS2hH28M3CtugTMP7mMZq1gL1me15crwrykdjz3UwOb86uQnuQ2rLLNqIhDpSP4Q== X-Received: by 2002:a17:90a:c301:: with SMTP id g1mr837489pjt.83.1591644361312; Mon, 08 Jun 2020 12:26:01 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id z140sm8114529pfc.135.2020.06.08.12.25.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jun 2020 12:26:00 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Mon, 8 Jun 2020 12:25:39 -0700 Message-Id: <20200608192546.7160-4-stephen@networkplumber.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200608192546.7160-1-stephen@networkplumber.org> References: <20200607170127.15694-1-stephen@networkplumber.org> <20200608192546.7160-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 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 --- 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 Mon Jun 8 19:25:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 70976 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 D5E6AA04F2; Mon, 8 Jun 2020 21:26:30 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7B7025323; Mon, 8 Jun 2020 21:26:06 +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 1DD2A4C8B for ; Mon, 8 Jun 2020 21:26:04 +0200 (CEST) Received: by mail-pl1-f194.google.com with SMTP id n9so7058970plk.1 for ; Mon, 08 Jun 2020 12:26:03 -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=lfM/Ft6FodWAVcDqo9RlrMCDvl8AcsVI7Sytwky3egI=; b=AHHYGg743AyNE4jAutN6ItUNobLZhpKSNNp4CIjKYHohR0Om2Rbk8ikWzich17d9RC iprE6LAUdchdO8TVQlZ8yrc+jFJK+nHHRc7ckry67nGemgF1Cw1Z3REGRpl1b/HvxYls TXGc7N9ObiO6j2LJNUF4oZ00NrC9hFVktSM0W8QukgyE+biFRLQKCY8ySIIUuYB7Hx5I XCeFEdGSdB/kdde9qtMg2igOHcUZALKQduvl5NHJszhEYKfiHvQrYr7GUodcJatHKXOt LrlMxdmuSYVfp/RDp+v5TF5QV6PrQmcEZc0wQaquMy3CHQR/fwwykdS43tFh/gSy2vEd 9SGg== 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=lfM/Ft6FodWAVcDqo9RlrMCDvl8AcsVI7Sytwky3egI=; b=EX6fesWgUH/tphEjnZ3twwkCy3CCQFMVNRnp1g7Du3Qf82pzsyHfF0YQEE4hLhfOK+ bqBpklSiR2VIoU6g9dIU9XghfKz60JXDbQNUAsbYk7+G6LH8XQ69ZJ/e3IL5Ii3fbPxD kZBQ/21X2uhFWUn5XnEQKIj/7zjoRu4hJXooUzRgwLTlrVwn7agLShSGOF0/+BhLskaI QS6sExaDz09EnyMcDIoZJPbwYO54DQgzlmWKsY8gchyurLAwp3Tc/D090FmERHC8BJHg mwUukWQ+vEYrBd9FUKZ0ov9s+3oeJfccBQHl+Hx5FeOlNeYEwQNlEM42CskkpRAUPQEd iSqw== X-Gm-Message-State: AOAM5308vtVkgbDoS+6yY5yP0PnJY+D5LxchoEQnbpRJjzhxwLCHcbYC axvd7Rj/jBdZEqs9cvXvWiTdwg+s9uo= X-Google-Smtp-Source: ABdhPJw2MUkDe0GkMEWYUDDYcXMPcFqH0xqkJvNGSzDXt46CJBQ6RV888jrmKMwHMCXpLWueRxgb8w== X-Received: by 2002:a17:90a:e506:: with SMTP id t6mr836153pjy.35.1591644362728; Mon, 08 Jun 2020 12:26:02 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id z140sm8114529pfc.135.2020.06.08.12.26.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jun 2020 12:26:01 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Mon, 8 Jun 2020 12:25:40 -0700 Message-Id: <20200608192546.7160-5-stephen@networkplumber.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200608192546.7160-1-stephen@networkplumber.org> References: <20200607170127.15694-1-stephen@networkplumber.org> <20200608192546.7160-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 04/10] eal: replace usage of blacklist/whitelist in enum X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This patch renames the enum values in the EAL include files. As a backward compatiable temporary migration tool, define a replacement mapping for old values. The old names relating to blacklist and whitelist are replaced by blocklist and allowlist, but applications may be using the older compatiablity macros. Signed-off-by: Stephen Hemminger --- lib/librte_eal/common/eal_common_devargs.c | 14 +++++++------- lib/librte_eal/include/rte_bus.h | 8 ++++++-- lib/librte_eal/include/rte_dev.h | 8 ++++++-- lib/librte_eal/include/rte_devargs.h | 8 ++++++-- 4 files changed, 25 insertions(+), 13 deletions(-) diff --git a/lib/librte_eal/common/eal_common_devargs.c b/lib/librte_eal/common/eal_common_devargs.c index 2123773ef840..d0d58358fee1 100644 --- a/lib/librte_eal/common/eal_common_devargs.c +++ b/lib/librte_eal/common/eal_common_devargs.c @@ -296,7 +296,7 @@ rte_devargs_insert(struct rte_devargs **da) return 0; } -/* store a whitelist parameter for later parsing */ +/* store an allowlist parameter for later parsing */ int rte_devargs_add(enum rte_devtype devtype, const char *devargs_str) { @@ -313,13 +313,13 @@ rte_devargs_add(enum rte_devtype devtype, const char *devargs_str) goto fail; devargs->type = devtype; bus = devargs->bus; - if (devargs->type == RTE_DEVTYPE_BLACKLISTED_PCI) - devargs->policy = RTE_DEV_BLACKLISTED; + if (devargs->type == RTE_DEVTYPE_BLOCKED_PCI) + devargs->policy = RTE_DEV_BLOCKED; if (bus->conf.scan_mode == RTE_BUS_SCAN_UNDEFINED) { - if (devargs->policy == RTE_DEV_WHITELISTED) - bus->conf.scan_mode = RTE_BUS_SCAN_WHITELIST; - else if (devargs->policy == RTE_DEV_BLACKLISTED) - bus->conf.scan_mode = RTE_BUS_SCAN_BLACKLIST; + if (devargs->policy == RTE_DEV_ALLOWED) + bus->conf.scan_mode = RTE_BUS_SCAN_ALLOWLIST; + else if (devargs->policy == RTE_DEV_BLOCKED) + bus->conf.scan_mode = RTE_BUS_SCAN_BLOCKLIST; } TAILQ_INSERT_TAIL(&devargs_list, devargs, next); return 0; diff --git a/lib/librte_eal/include/rte_bus.h b/lib/librte_eal/include/rte_bus.h index d3034d0edf77..463f0224ff2b 100644 --- a/lib/librte_eal/include/rte_bus.h +++ b/lib/librte_eal/include/rte_bus.h @@ -215,10 +215,14 @@ typedef int (*rte_bus_sigbus_handler_t)(const void *failure_addr); */ enum rte_bus_scan_mode { RTE_BUS_SCAN_UNDEFINED, - RTE_BUS_SCAN_WHITELIST, - RTE_BUS_SCAN_BLACKLIST, + RTE_BUS_SCAN_ALLOWLIST, + RTE_BUS_SCAN_BLOCKLIST, }; +/* Backwards compatiablity will be deprecated */ +#define RTE_BUS_SCAN_WHITELIST RTE_BUS_SCAN_ALLOWLIST +#define RTE_BUS_SCAN_BLACKLIST RTE_BUS_SCAN_BLOCKLIST + /** * A structure used to configure bus operations. */ diff --git a/lib/librte_eal/include/rte_dev.h b/lib/librte_eal/include/rte_dev.h index c8d985fb5cf9..1208b1e99b05 100644 --- a/lib/librte_eal/include/rte_dev.h +++ b/lib/librte_eal/include/rte_dev.h @@ -70,10 +70,14 @@ enum rte_kernel_driver { * Device policies. */ enum rte_dev_policy { - RTE_DEV_WHITELISTED, - RTE_DEV_BLACKLISTED, + RTE_DEV_ALLOWED, + RTE_DEV_BLOCKED, }; +/* Backwards compatiablity will be deprecated */ +#define RTE_DEV_WHITELISTED RTE_DEV_ALLOWED +#define RTE_DEV_BLACKLISTED RTE_DEV_BLOCKED + /** * A generic memory resource representation. */ diff --git a/lib/librte_eal/include/rte_devargs.h b/lib/librte_eal/include/rte_devargs.h index 898efa0d667b..e1a4277ff167 100644 --- a/lib/librte_eal/include/rte_devargs.h +++ b/lib/librte_eal/include/rte_devargs.h @@ -29,11 +29,15 @@ extern "C" { * Type of generic device */ enum rte_devtype { - RTE_DEVTYPE_WHITELISTED_PCI, - RTE_DEVTYPE_BLACKLISTED_PCI, + RTE_DEVTYPE_ALLOWED_PCI, + RTE_DEVTYPE_BLOCKED_PCI, RTE_DEVTYPE_VIRTUAL, }; +/* Backwards compatiablity will be removed later */ +#define RTE_DEVTYPE_WHITELISTED_PCI RTE_DEVTYPE_ALLOWED_PCI +#define RTE_DEVTYPE_BLACKLISTED_PCI RTE_DEVTYPE_BLOCKED_PCI + /** * Structure that stores a device given by the user with its arguments * From patchwork Mon Jun 8 19:25:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 70977 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 7039AA04F2; Mon, 8 Jun 2020 21:26:40 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0DE951B75C; Mon, 8 Jun 2020 21:26:09 +0200 (CEST) Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by dpdk.org (Postfix) with ESMTP id BF5FF4CBD for ; Mon, 8 Jun 2020 21:26:05 +0200 (CEST) Received: by mail-pg1-f195.google.com with SMTP id r18so2918481pgk.11 for ; Mon, 08 Jun 2020 12:26: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=bo8O40zYwgIvjLOovb26J3x3H6VA9UzM6C2LRK9HcWw=; b=ga7c6edSt+6OyL9PehubckCqlCrAyYkLZL39qq8LcE3fITtXb7/+yji30bxytMF0qJ 9/Ym7oaMCxzWSiVNEw96BYweWvlaDxPlEliDmwKFkl3I/ReJcD+fXdldEsJQ38Qx+nzA LHoQmwfoJJmcom5Nm8lTGD8M9bpWFWnhoe0fRey3L1O1Xnb+t1VL4y9ElzHMDKkQJLK1 /0pabhUIulaYvInQFj/BgqxSNCvjMnX8yeTEfjW59w8v7IUgB3iWW0MiJ9ztGbpBc5DG XS0jm9SWSfChG+PlwQ4N54hnXYDEp+YoVzfB4J6TCDsQb0qp7IYelF6fT7iGiUcyrMwR oy7g== 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=bo8O40zYwgIvjLOovb26J3x3H6VA9UzM6C2LRK9HcWw=; b=Jp1++x6LncRVHIFS0i41B9Q25IsltfNej1K7HICS/Zcd91wsC0GShtDC2Vt63Rftkr ODKCYLkIRfQ4sfqCwhC68QHg/3q4ypIz97tsFx1WkHGDBhlihR6OI2BmZOE34s5RmGgs 0K6j6Uv0yM968JBCp9BahaahMUUc7qKYD5JMVGhsqRinbG8GTmldfyZl0M6nV04Rv/pT 5L2UVmooLzgLd0fdaC/GRIOOB3qwzAUaE6VqeNNmYyOkZbPlHg6LUvzUzp9vXl4Fkv77 dYYmxt3cEsxmwJH8fEKDaRtWY5a39bZOw8y0a8NRRF1xNBXMC388jkEMOimN1aSr0H6W xWBQ== X-Gm-Message-State: AOAM531BiCmcIAaUtz9d7WYaVtfnazelUNbD2trNEhC/uPVSV5duxAhq nLtkICWkjMNGkmVlodhCmRSosRKBSn4= X-Google-Smtp-Source: ABdhPJwz1mIXdMaBYOPbtTtxB4lsiIG6yvH3hLdE8xzvtCp2+f7vWliCrTGIeWTeQyyNj3DMWRdkEg== X-Received: by 2002:aa7:96ec:: with SMTP id i12mr21960891pfq.71.1591644364283; Mon, 08 Jun 2020 12:26:04 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id z140sm8114529pfc.135.2020.06.08.12.26.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jun 2020 12:26:03 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Mon, 8 Jun 2020 12:25:41 -0700 Message-Id: <20200608192546.7160-6-stephen@networkplumber.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200608192546.7160-1-stephen@networkplumber.org> References: <20200607170127.15694-1-stephen@networkplumber.org> <20200608192546.7160-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 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 terminolgy BLOCKED to describe when devices are excluded from being used. Signed-off-by: Stephen Hemminger --- 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 | 21 +++++++++------------ 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, 25 insertions(+), 30 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..1fa247b8fa08 100644 --- a/drivers/bus/pci/pci_common.c +++ b/drivers/bus/pci/pci_common.c @@ -66,7 +66,7 @@ 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 + /* In blocklist mode, if the device is not blocklisted, no * rte_devargs exists for it. */ if (devargs != NULL) @@ -132,7 +132,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 blocklisted; Check if driver supports it */ if (!rte_pci_match(dr, dev)) /* Match of device and driver failed */ return 1; @@ -141,12 +141,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 blocklisted, 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 +587,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..ceada945e7e2 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 blocklisted */ /* 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..c79d210cc74d 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 allowlisted 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..8ef1e1d35a75 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 allowlisted but driver type is KDRV_UNKNOWN. * Return 1 if kernel driver is managing the device. * Return 0 on success. */ From patchwork Mon Jun 8 19:25:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 70978 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 08B80A04F2; Mon, 8 Jun 2020 21:26:48 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2098F1BC24; Mon, 8 Jun 2020 21:26:10 +0200 (CEST) Received: from mail-pj1-f68.google.com (mail-pj1-f68.google.com [209.85.216.68]) by dpdk.org (Postfix) with ESMTP id 52D3D5F2F for ; Mon, 8 Jun 2020 21:26:07 +0200 (CEST) Received: by mail-pj1-f68.google.com with SMTP id d6so258446pjs.3 for ; Mon, 08 Jun 2020 12:26: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=HEoQuMmEI+6Ezg27Fi19v9kWg3x6DeIhu6gOwNsO1oU=; b=qzDGgOJ/pBjd0nG/yCELW31T//0X0DC8MLbZ3x2ewoduE6B4uCyQm6Zn69Cw18VQzA 3lVTlMgDQbVHYYQVvPTW1YlqvcnWPJjgsaKv0tryojo/pHdJC9ogH9mr7Cx3OuGstrho ZDX2U16SpWnZarAF1ujc1wXbAsbHNelcWbQsnMh/psNvkUc6J+jALV8xwQ2UxdwPXLdO KLv5c/PeEnbPfhoYLb/7PngehiWFFny7Zub2I8GNJEWe1ZjOMgl/FXG59yPTi8isJzYW 9sdBsNoQnZKEGgVE4uT6tFyTjMK1QKvOw0aXctqjrjX177gTjmCrfehH7Zj8XggC1mt9 bttQ== 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=HEoQuMmEI+6Ezg27Fi19v9kWg3x6DeIhu6gOwNsO1oU=; b=VWJkiJEe8ThdbSdRnfllWlfqI/PAVDyfAq0W486tyAq0dmbWgnrWspcEGQT72R0cyv eIawMNxCtKYsj90Q89dPmIF5mc689MSBw/ZVgSnIT6mhHNM2zZ28N1VJS2bMEIjtsDCZ 72tCbRZsdK0pVLTdWAwZkMw/q2EBAVO/+uMECaE4QsQ+tXjK/+Akhzf9m5EfRngWrEuw u4TzxrBop/5FyDcikm2Js2INhrWeTNo3P8nRwCRmENKFMGX45SJy7dwI911bCkxrm0Cp +1Sp70kOqkNQeNTUcLXKZQ0j7rin3YiVf9cBC25ryUVFArlu1ciVqAagNF9Htmg3ffw+ YkEA== X-Gm-Message-State: AOAM532LLimXbWrfZ57/7tvBd7sX17n5McDPi9CfNv20S4hRYhz9838E 87garMdeY27fXwBJccZT5u1WXK0ypVU= X-Google-Smtp-Source: ABdhPJzHU5GYxQVbCi3t/ve8EUPvW9ITtnt7S2IxXUWxXSYUeIAHRfLRURdzUVfzpqepdPpIgw1wzA== X-Received: by 2002:a17:90a:64cb:: with SMTP id i11mr783689pjm.193.1591644366047; Mon, 08 Jun 2020 12:26:06 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id z140sm8114529pfc.135.2020.06.08.12.26.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jun 2020 12:26:04 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Mon, 8 Jun 2020 12:25:42 -0700 Message-Id: <20200608192546.7160-7-stephen@networkplumber.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200608192546.7160-1-stephen@networkplumber.org> References: <20200607170127.15694-1-stephen@networkplumber.org> <20200608192546.7160-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 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-only-list and pci-blacklist with pci-skip-probe. Allow the old options for now, but make sure help and all tests will use the new options. Leave the short flags are more commonly used and changing them would impact more documentation and applications. Signed-off-by: Stephen Hemminger --- 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..52d01856c5fd 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 Mon Jun 8 19:25:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 70979 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 EE624A04F2; Mon, 8 Jun 2020 21:26:55 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 59DF21BE80; Mon, 8 Jun 2020 21:26:11 +0200 (CEST) Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by dpdk.org (Postfix) with ESMTP id 7812A199BC for ; Mon, 8 Jun 2020 21:26:09 +0200 (CEST) Received: by mail-pj1-f46.google.com with SMTP id s88so253107pjb.5 for ; Mon, 08 Jun 2020 12:26: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=6DBn6F3b+zikuXv+ymfXPJzVh+dFnN80OBXdjaTfG3c=; b=hHCW10J0wGrQredwcC99XPkWkL9okXb2utxuXmYGAJDskSJi7RPgqEMG1LCiP5VK0m 4ONA/m4NHt5bZx0w7n+CSiS9jODwONrl1NMAYpfvrQffuIMstlAnvopuR76AcfDaoSEh 2rhlkFAyIxhwE97JD0fiuQesPKZQx/hwqbtjhMbI3FFtWqVaOOrmEl5j1WDYPB46mpZi TjkwlQTjoEAvvS5lFGDc7aHZkGMielTdEW8AD95Qs8knvqBbItCkSYEsnsD4d8r15ypU PybQJ3pVRqbfc2wUllZRJV4u737UHb70aiMxGKNYTi6ZWn5kOkrHBdeoRUB1qih/+7GY VJBQ== 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=6DBn6F3b+zikuXv+ymfXPJzVh+dFnN80OBXdjaTfG3c=; b=c1isf7AhJC9zUiadsbsbpSiWciC9A9Sg9mH8b6Iyo5UvDf3bQh442QYyx/9aqhhArD MNUD3ztFlTqz3QbPPS4sjMRyJ9kM7Of2twcTBeGIN9eLcXAzYr3HIk9zx4iKv7ZJPiHo f0OFaCZKHp758CN3kfDNjjce3Xjys35izqulJ+xJeKQNd79xtjcsqoiDE/PCapDxw6hC wPJPIZZHp1d8qbYFc8wteX/4KpG1LAQseFBwZXDPMRuZCAzQ1CpsR47+YwsEhT6//NJV EeWj98l4yGB6wsKelgO6Oiq+ODeQsXh+4Zkqbip8Cz/RhQ6W1XiktcKegqOpVq+OzI9u 112A== X-Gm-Message-State: AOAM531OuPjYAW3ahIs6rpWctIyoQT4mk2LEusG6dAIMBw0ftFyumf7S uPNzSBcWKx8kK8Uv9Z5BRKS9dONffKw= X-Google-Smtp-Source: ABdhPJx+z7/JNhDRN8KDh71oWZp7TFjFX+gPv01HPMdhRsHpH94ntWMKNYMDKMJjS9lsybzFlWGouw== X-Received: by 2002:a17:90b:4c4b:: with SMTP id np11mr826985pjb.58.1591644367472; Mon, 08 Jun 2020 12:26:07 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id z140sm8114529pfc.135.2020.06.08.12.26.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jun 2020 12:26:06 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Mon, 8 Jun 2020 12:25:43 -0700 Message-Id: <20200608192546.7160-8-stephen@networkplumber.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200608192546.7160-1-stephen@networkplumber.org> References: <20200607170127.15694-1-stephen@networkplumber.org> <20200608192546.7160-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 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 --- 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 bb03df66a84a..22f1598be06d 100644 --- a/doc/guides/nics/mlx5.rst +++ b/doc/guides/nics/mlx5.rst @@ -1424,7 +1424,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 Mon Jun 8 19:25:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 70980 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 18BA1A04F2; Mon, 8 Jun 2020 21:27:07 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2B6461BE97; Mon, 8 Jun 2020 21:26:13 +0200 (CEST) Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by dpdk.org (Postfix) with ESMTP id 594BD1BDAC for ; Mon, 8 Jun 2020 21:26:10 +0200 (CEST) Received: by mail-pg1-f194.google.com with SMTP id o6so9210948pgh.2 for ; Mon, 08 Jun 2020 12:26:10 -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=anIfuWAl4KRTKy4i1XCxtfurPDmYKmd2pzxNcxAiT4o=; b=1hj4ved3T61OvYe0kyfGGsC3zGMY6GVyiDEJVWURbHuVXttx18rV8wANAqJC0rSwpi MFiceMEcIIZKBscqKCyBQItW3XDK7BBiMFyVqbpL3NlO+oZ6KNNgXQiO3NO5bk92KUt/ c3e0HqZ7xzrcJZhzBAfQ4G1A2QXVpRNrcZ5hgu4IZsnGrXDls6zNKe+oqhySvqnZFx/u SMduz9naYqaDHSILIz081RlPp5n7V2gEu6bTJ9wusyPOreHAoQYjW2u2YXPxfJpiINQw J5oODMp3mxYnAFXn92kX/WHeXlcl/y5Jby0WIdi+5xz0Y9UJDbggHLWYTFnxvcpXEHg8 OVNg== 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=anIfuWAl4KRTKy4i1XCxtfurPDmYKmd2pzxNcxAiT4o=; b=j9MMNh9yvHbsYWxwChMmV4/e7iMNgbAjIHGKl3QCwbAMq5tfHhzUcr/4WZpLO1y38w yTpCPHgvYzh3TPspwfc1Ql/YQEVt7SYKe78lQw+kq1PKuBWrcTXOemDRytVgEMSpDJYa /rRkRq+ym7PiXsCk3Urp/QC1+NPJ050L+gbObmzRNhZzZLAUixPtAyb5qkJn730zXZw6 haWRl1EJDfpt4E+gXLV55eNtprTdoZWDeBPlv4AzndQw4nLQsMlwhIbk+5dY/fXXQPqm 9hfBZ9tDJa5Fn+SHUefwlu6hhtX26xCZcgB652T60SDAcc5HGSAHcOr7bF1ZH6KFaxHJ TO+Q== X-Gm-Message-State: AOAM532vvM/14Py3g5nvz158mqNxDJR/4abBbXqIu0s37FZ9+f7TrcSr klCn1gizj6S/2ScJdLk38CX/uWQtXjU= X-Google-Smtp-Source: ABdhPJyOnu1eB0h8N82vTnkNI1Ubwm9VuIbUMdk7xaspvEVhX0et3ecqOEJhYMN2TpsfemTZSBwdew== X-Received: by 2002:a63:550d:: with SMTP id j13mr9853513pgb.139.1591644368935; Mon, 08 Jun 2020 12:26:08 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id z140sm8114529pfc.135.2020.06.08.12.26.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jun 2020 12:26:07 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Mon, 8 Jun 2020 12:25:44 -0700 Message-Id: <20200608192546.7160-9-stephen@networkplumber.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200608192546.7160-1-stephen@networkplumber.org> References: <20200607170127.15694-1-stephen@networkplumber.org> <20200608192546.7160-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 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 --- 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 Mon Jun 8 19:25:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 70981 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 9F8E9A04F2; Mon, 8 Jun 2020 21:27:14 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 608831BE9D; Mon, 8 Jun 2020 21:26:14 +0200 (CEST) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by dpdk.org (Postfix) with ESMTP id BC48B1BDF8 for ; Mon, 8 Jun 2020 21:26:11 +0200 (CEST) Received: by mail-pf1-f179.google.com with SMTP id x207so8980677pfc.5 for ; Mon, 08 Jun 2020 12:26: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=mNkOVVEPxA7QcFGYXuLblxDDhJcy5ZWCcBHzL6426VQ=; b=otzvHK+eBjSc2YBImFyYxfbd5rOt63085xgVRpN4QAYhquH816AIHlPEX8Mf9y3rsh 4i6JdbiC5OMLgGXXTU7FC4N7ROY/B5dkP+/tmDNSb0SGjSt9IL6oMoNIy1B49BoKB+ow 8B8Rn4kAv7eBDWI7ZuVd1olqOET5UqUhDOtMAARh1iaXyk/gycCMPPadz4Qlljt3OuIb ZrLTXAQ3sAhdVTIJ3N6xnX+aiz2xvMMOIFEHa298YUMr5ujoXDdEti8XHSyrAm2P2/RL UkQxhWZTtDELKJVxqOK3qQJV/RVX49wgwXB5aEhgJFx/CWPAVmDn0j0cOvYR1uBCTNt9 rHqw== 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=mNkOVVEPxA7QcFGYXuLblxDDhJcy5ZWCcBHzL6426VQ=; b=cFG5j0QNQ2cioKrPn8VBnT0R8zEC1vaTGqVa63wryIObXetEWgnnHpqJkkEeqmHazu FCyNcOZgsUYPjDRlVvWhqRLQDVJ3AHSk3yO6RqiZcFWzklQeF+GKjfUnnndPeQXNnQdO XMgTYW/XC3lEtcdv6kHAj2Swsqi7ATU8F3EUiSZPLhdXLWWh7bf7x/PKm00rQ6ncyeUa IQkxyyhNGBFGsTDursmpR09EM/Q2PzhhF5TEGHjsf8NgFNhBmsdjq5yeYmpm+CC5BegS dvz4yg+E3suwuG6QmdWPLmsFqAJ4BlbnPvuAF4+uxCPgbmh5CmOQ0sPeNGrinzPqhabb eGXA== X-Gm-Message-State: AOAM5333Pu4z88A/RsTccqZWoeGCwRnA5uP8FBGpUU1cMGdH1rsxePGl CG/u1VYFJHme2aeLo7rghqO5355d9ns= X-Google-Smtp-Source: ABdhPJwvFzG9oA3CkM+wT+4dyl0A2ogVCREntbnHKTqLNHPpCf/ASiscP/xnzkF5yGKEd9L0pfAleg== X-Received: by 2002:a65:6790:: with SMTP id e16mr22335503pgr.145.1591644370543; Mon, 08 Jun 2020 12:26:10 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id z140sm8114529pfc.135.2020.06.08.12.26.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jun 2020 12:26:09 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Mon, 8 Jun 2020 12:25:45 -0700 Message-Id: <20200608192546.7160-10-stephen@networkplumber.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200608192546.7160-1-stephen@networkplumber.org> References: <20200607170127.15694-1-stephen@networkplumber.org> <20200608192546.7160-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 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 cause warnings to change for applications. Signed-off-by: Stephen Hemminger --- doc/guides/rel_notes/release_20_08.rst | 5 +++++ 1 file changed, 5 insertions(+) 2.26.2 diff --git a/doc/guides/rel_notes/release_20_08.rst b/doc/guides/rel_notes/release_20_08.rst index 39064afbe968..502d67f26ff8 100644 --- a/doc/guides/rel_notes/release_20_08.rst +++ b/doc/guides/rel_notes/release_20_08.rst @@ -85,7 +85,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 block/allow. + There are compatibility 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 Mon Jun 8 19:25: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: 70982 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 1C138A04F2; Mon, 8 Jun 2020 21:27:22 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A94541BEA6; Mon, 8 Jun 2020 21:26:15 +0200 (CEST) Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by dpdk.org (Postfix) with ESMTP id 4E78F1BE9B for ; Mon, 8 Jun 2020 21:26:13 +0200 (CEST) Received: by mail-pf1-f193.google.com with SMTP id h185so8982518pfg.2 for ; Mon, 08 Jun 2020 12:26: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=Ilv7w0k4uFxAxjQmjkY7RGlCAOui3nMyt9FvF0tPmkk=; b=2A8vn6wLdl82kjO2iHicMLABsLbBfURwVJASQdrGIA7MUVdhbQIryUBkPFdgA0tvji cyRlN+jFFbe2BFE2CXAxJveoPJ7u39d3QRRUQXsnF+Mk7n5WleNgPb8hs6vohwrxZpDT 0orQcjR0FXlwNWcmdBp2BqYSKqdMPkGPjCvLKqISLXFKeAHxIhNqPJascNS2BijaWydS 3787bMd4XeGBzl+UO/4ZAvJ3SkoE5j2O2GIHi/5f1pTuMVTw8pAntk7BYMVEVHhjgT3u EgDmmOL0FOCzHz/wm/YJ5qE8Y8IUR3whIFlcc/1+lWBSOy702+G3kP0UKPxUZOdj/A8q AETw== 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=Ilv7w0k4uFxAxjQmjkY7RGlCAOui3nMyt9FvF0tPmkk=; b=MDJHtXwQd9VLGVBSwsljpdSAxsVYm/g+5A17uwQ6Y+KxjpDQ/sQSu+wwtBniRHOQwg 6J7edw9YNhT6K0ZPMbUmJXYntnj6CIMiNIxb5Ti+4AhcBjX1SQYbLqbgoWMSG7xO7bbx ZrtO26Xe9kAza/Qt8BYrUKFu9kDCG2HddnZ2Ty64VP/dcEds93ctnCayEU8daflXzsn6 zqBfwFBYRZ/yVup6JWdMSVBaOzNzC2hp/pHeOOMgqEfkfvtC1ppReJ42eLxZlpOC1jUi mJWQvSJxCNgdT4LW/F/lmmHodV4KGhVLhPi0jISYbTVa/wIfhNiKxreJtZXFw8/Q2cH5 QvNg== X-Gm-Message-State: AOAM530qONaGV1bNnG93QfqHw/FIfHbzRBToViYhgKfKdfaCckRCwF47 XZh3T04IZMRqHZUAsS1z5YCXKzt6bPU= X-Google-Smtp-Source: ABdhPJynXyWpj4nJ8CB6l1eewYZ+3EiJ9I4q0TZA+AQVtds5goCYMMqO8nfCiEgbenpSk2j/UC94YA== X-Received: by 2002:a62:2c07:: with SMTP id s7mr21184628pfs.88.1591644372054; Mon, 08 Jun 2020 12:26:12 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id z140sm8114529pfc.135.2020.06.08.12.26.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jun 2020 12:26:10 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Mon, 8 Jun 2020 12:25:46 -0700 Message-Id: <20200608192546.7160-11-stephen@networkplumber.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200608192546.7160-1-stephen@networkplumber.org> References: <20200607170127.15694-1-stephen@networkplumber.org> <20200608192546.7160-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 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 --- lib/librte_eal/include/rte_bus.h | 10 +++++++--- lib/librte_eal/include/rte_dev.h | 10 +++++++--- lib/librte_eal/include/rte_devargs.h | 10 +++++++--- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/lib/librte_eal/include/rte_bus.h b/lib/librte_eal/include/rte_bus.h index 463f0224ff2b..b1a0ac554d83 100644 --- a/lib/librte_eal/include/rte_bus.h +++ b/lib/librte_eal/include/rte_bus.h @@ -219,9 +219,13 @@ enum rte_bus_scan_mode { RTE_BUS_SCAN_BLOCKLIST, }; -/* Backwards compatiablity will be deprecated */ -#define RTE_BUS_SCAN_WHITELIST RTE_BUS_SCAN_ALLOWLIST -#define RTE_BUS_SCAN_BLACKLIST RTE_BUS_SCAN_BLOCKLIST +#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