From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id C68F2A0C53; Mon, 23 Aug 2021 17:06:59 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4318C40142; Mon, 23 Aug 2021 17:06:59 +0200 (CEST) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by mails.dpdk.org (Postfix) with ESMTP id 59B9640042 for ; Mon, 23 Aug 2021 17:06:58 +0200 (CEST) Received: by mail-pl1-f172.google.com with SMTP id m17so3273526plc.6 for ; Mon, 23 Aug 2021 08:06:58 -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=SibsKjDL+OTsnd1+ZsZ1nmhuC0sMimvTxLzf/k7WaOk=; b=e7IeoCvyNEfOXXdcHAQTDlQm1Yu2tm0nR+XnhP4/DAgF0bjGsywSV/Z7YOj34t0mJv o9UtotnHKB+VH03fW3Kbe6wc6DHUGSZMw5QyWHcmvsuzDMEa0rQG7Y86hKBQhDeI3oS9 KC9LC6c7Gb5s91+rA7KpEPifnQ56qtPmDa7rKOZNiNXUsMc1bHHI7MsAHDnkqWf+UQeo zsnen3H0FzmyL2p6HISRLxrSAtSupQoWr/Fx0LBx2c+NxDJdB8nBqH6ep1yJXbLqiFXJ BTaQAYkks4LEtyd63zNRVuuwmfIE0AeAh7Fv34LmPLQLWIG2wRh38FEkxFKEf3hO+2l6 A8sg== 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=SibsKjDL+OTsnd1+ZsZ1nmhuC0sMimvTxLzf/k7WaOk=; b=bl+3Evart4A4w6Xjbu4TmODYAwMjcqTT10CR+J4+pwMRG5TTDUbtjMnW4NV+tVUi9V dayAFSM56QbV/h9K2ZE+S4ftpcxpabMUJDqbb2j1pypDjm+LMBh2JbfKHDKZysakywNH qJDDMBX4zKjaI1TfWBP5nbhTyHJB/APAuRirQq4HMcUQZ3UP+E1p0MI0VC/aSMXVneci 9PRuTX9UliZFYVXOLYv1Gr1W9Un6cdy9yqCFJ4ixwcmAUzBi9F93de3GrCJyRIa+Xd7B p4ZggEBwV7KUv4Yp7Rs/3mMSJoEk1QL2EVjvVYzlGTkpSbGNRoksqDa9w7aGqemtaA5n LLkQ== X-Gm-Message-State: AOAM533erIFzkWtNDtUSI8SECz3a8a3VwPzzh30cDjpUOO4cAqgDb4Eb QWzOPl4MzER4H80ci7P1kvZK/DTEkzgfoA== X-Google-Smtp-Source: ABdhPJwHW7IoKxE5LcTHbN0b2vEF1I5RWCvhoiT9ORGsmwo/LK28bTO/1uYIybj7HmsLVzVFXOC5wQ== X-Received: by 2002:a17:902:b084:b029:12b:6caa:7d9e with SMTP id p4-20020a170902b084b029012b6caa7d9emr28593615plr.57.1629731216555; Mon, 23 Aug 2021 08:06:56 -0700 (PDT) Received: from hermes.local (204-195-33-123.wavecable.com. [204.195.33.123]) by smtp.gmail.com with ESMTPSA id m2sm19123741pgu.15.2021.08.23.08.06.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Aug 2021 08:06:55 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Mon, 23 Aug 2021 08:06:53 -0700 Message-Id: <20210823150653.53083-1-stephen@networkplumber.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210820031614.451034-1-stephen@networkplumber.org> References: <20210820031614.451034-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v2] eal: remove the deprecated whitelist/blacklist and master/slave API's X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 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" New API's for these were added in 20.11 and the old API was retained but marked deprecated. Since 21.11 is the next LTS, it is time to remove the deprecated ones. Signed-off-by: Stephen Hemminger --- v2 remove the short 'w' option as well doc/guides/rel_notes/release_21_11.rst | 7 +++++++ lib/eal/common/eal_common_options.c | 19 ------------------- lib/eal/common/eal_options.h | 10 ---------- lib/eal/include/rte_bus.h | 6 ------ lib/eal/include/rte_dev.h | 6 ------ lib/eal/include/rte_devargs.h | 6 ------ lib/eal/include/rte_launch.h | 4 ---- lib/eal/include/rte_lcore.h | 15 --------------- 8 files changed, 7 insertions(+), 66 deletions(-) diff --git a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst index d707a554efaf..e34c5aa74ad0 100644 --- a/doc/guides/rel_notes/release_21_11.rst +++ b/doc/guides/rel_notes/release_21_11.rst @@ -68,6 +68,13 @@ Removed Items Also, make sure to start the actual text at the margin. ======================================================= +* eal: Removed the deprecated function ``rte_get_master_lcore()`` + and the iterarator macro ``RTE_LCORE_FOREACH_SLAVE``. + +* eal: The old api arguments that were deprecated for + blacklist/whitelist are removed. Users must use the new + block/allow list arguments. + API Changes ----------- diff --git a/lib/eal/common/eal_common_options.c b/lib/eal/common/eal_common_options.c index ff5861b5f3ef..6ecf5fd6603c 100644 --- a/lib/eal/common/eal_common_options.c +++ b/lib/eal/common/eal_common_options.c @@ -65,7 +65,6 @@ eal_short_options[] = "n:" /* memory channels */ "r:" /* memory ranks */ "v" /* version */ - "w:" /* pci-whitelist (deprecated) */ ; const struct option @@ -83,7 +82,6 @@ eal_long_options[] = { {OPT_TRACE_DIR, 1, NULL, OPT_TRACE_DIR_NUM }, {OPT_TRACE_BUF_SIZE, 1, NULL, OPT_TRACE_BUF_SIZE_NUM }, {OPT_TRACE_MODE, 1, NULL, OPT_TRACE_MODE_NUM }, - {OPT_MASTER_LCORE, 1, NULL, OPT_MASTER_LCORE_NUM }, {OPT_MAIN_LCORE, 1, NULL, OPT_MAIN_LCORE_NUM }, {OPT_MBUF_POOL_OPS_NAME, 1, NULL, OPT_MBUF_POOL_OPS_NAME_NUM}, {OPT_NO_HPET, 0, NULL, OPT_NO_HPET_NUM }, @@ -108,10 +106,6 @@ eal_long_options[] = { {OPT_NO_TELEMETRY, 0, NULL, OPT_NO_TELEMETRY_NUM }, {OPT_FORCE_MAX_SIMD_BITWIDTH, 1, NULL, OPT_FORCE_MAX_SIMD_BITWIDTH_NUM}, - /* legacy options that will be removed in future */ - {OPT_PCI_BLACKLIST, 1, NULL, OPT_PCI_BLACKLIST_NUM }, - {OPT_PCI_WHITELIST, 1, NULL, OPT_PCI_WHITELIST_NUM }, - {0, 0, NULL, 0 } }; @@ -1521,10 +1515,6 @@ eal_parse_common_option(int opt, const char *optarg, static int a_used; switch (opt) { - case OPT_PCI_BLACKLIST_NUM: - fprintf(stderr, - "Option --pci-blacklist is deprecated, use -b, --block instead\n"); - /* fallthrough */ case 'b': if (a_used) goto ba_conflict; @@ -1533,10 +1523,6 @@ eal_parse_common_option(int opt, const char *optarg, b_used = 1; break; - case 'w': - fprintf(stderr, - "Option -w, --pci-whitelist is deprecated, use -a, --allow option instead\n"); - /* fallthrough */ case 'a': if (b_used) goto ba_conflict; @@ -1698,11 +1684,6 @@ eal_parse_common_option(int opt, const char *optarg, conf->process_type = eal_parse_proc_type(optarg); break; - case OPT_MASTER_LCORE_NUM: - fprintf(stderr, - "Option --" OPT_MASTER_LCORE - " is deprecated use " OPT_MAIN_LCORE "\n"); - /* fallthrough */ case OPT_MAIN_LCORE_NUM: if (eal_parse_main_lcore(optarg) < 0) { RTE_LOG(ERR, EAL, "invalid parameter for --" diff --git a/lib/eal/common/eal_options.h b/lib/eal/common/eal_options.h index 7b348e707fb4..8e4f7202a2d5 100644 --- a/lib/eal/common/eal_options.h +++ b/lib/eal/common/eal_options.h @@ -18,10 +18,6 @@ enum { #define OPT_DEV_BLOCK "block" OPT_DEV_BLOCK_NUM = 'b', - /* legacy option that will be removed in future */ -#define OPT_PCI_WHITELIST "pci-whitelist" - OPT_PCI_WHITELIST_NUM = 'w', - /* first long only option value must be >= 256, so that we won't * conflict with short options */ OPT_LONG_MIN_NUM = 256, @@ -49,8 +45,6 @@ enum { OPT_TRACE_MODE_NUM, #define OPT_MAIN_LCORE "main-lcore" OPT_MAIN_LCORE_NUM, -#define OPT_MASTER_LCORE "master-lcore" - OPT_MASTER_LCORE_NUM, #define OPT_MBUF_POOL_OPS_NAME "mbuf-pool-ops-name" OPT_MBUF_POOL_OPS_NAME_NUM, #define OPT_PROC_TYPE "proc-type" @@ -94,10 +88,6 @@ enum { #define OPT_FORCE_MAX_SIMD_BITWIDTH "force-max-simd-bitwidth" OPT_FORCE_MAX_SIMD_BITWIDTH_NUM, - /* legacy option that will be removed in future */ -#define OPT_PCI_BLACKLIST "pci-blacklist" - OPT_PCI_BLACKLIST_NUM, - OPT_LONG_MAX_NUM }; diff --git a/lib/eal/include/rte_bus.h b/lib/eal/include/rte_bus.h index 80b154fb982c..8c4a352bfc8e 100644 --- a/lib/eal/include/rte_bus.h +++ b/lib/eal/include/rte_bus.h @@ -219,12 +219,6 @@ enum rte_bus_scan_mode { RTE_BUS_SCAN_BLOCKLIST, }; -/* Backwards compatibility will be removed */ -#define RTE_BUS_SCAN_WHITELIST \ - RTE_DEPRECATED(RTE_BUS_SCAN_WHITELIST) RTE_BUS_SCAN_ALLOWLIST -#define RTE_BUS_SCAN_BLACKLIST \ - RTE_DEPRECATED(RTE_BUS_SCAN_BLACKLIST) RTE_BUS_SCAN_BLOCKLIST - /** * A structure used to configure bus operations. */ diff --git a/lib/eal/include/rte_dev.h b/lib/eal/include/rte_dev.h index 6dd72c11a14a..aec70300ada7 100644 --- a/lib/eal/include/rte_dev.h +++ b/lib/eal/include/rte_dev.h @@ -56,12 +56,6 @@ enum rte_dev_policy { RTE_DEV_BLOCKED, }; -/* Backwards compatibility will be removed */ -#define RTE_DEV_WHITELISTED \ - RTE_DEPRECATED(RTE_DEV_WHITELISTED) RTE_DEV_ALLOWED -#define RTE_DEV_BLACKLISTED \ - RTE_DEPRECATED(RTE_DEV_BLACKLISTED) RTE_DEV_BLOCKED - /** * A generic memory resource representation. */ diff --git a/lib/eal/include/rte_devargs.h b/lib/eal/include/rte_devargs.h index cd90944fe8f9..665f4aaaa964 100644 --- a/lib/eal/include/rte_devargs.h +++ b/lib/eal/include/rte_devargs.h @@ -58,12 +58,6 @@ enum rte_devtype { RTE_DEVTYPE_VIRTUAL, }; -/* Backwards compatibility will be removed later */ -#define RTE_DEVTYPE_WHITELISTED_PCI \ - RTE_DEPRECATED(RTE_DEVTYPE_WHITELISTED_PCI) RTE_DEVTYPE_ALLOWED -#define RTE_DEVTYPE_BLACKLISTED_PCI \ - RTE_DEPRECATED(RTE_DEVTYPE_BLACKLISTED_PCI) RTE_DEVTYPE_BLOCKED - /** * Structure that stores a device given by the user with its arguments * diff --git a/lib/eal/include/rte_launch.h b/lib/eal/include/rte_launch.h index 22a901ce62f6..bad6d5c1f287 100644 --- a/lib/eal/include/rte_launch.h +++ b/lib/eal/include/rte_launch.h @@ -73,10 +73,6 @@ enum rte_rmt_call_main_t { CALL_MAIN, /**< lcore handler executed by main core. */ }; -/* These legacy definitions will be removed in future release */ -#define SKIP_MASTER RTE_DEPRECATED(SKIP_MASTER) SKIP_MAIN -#define CALL_MASTER RTE_DEPRECATED(CALL_MASTER) CALL_MAIN - /** * Launch a function on all lcores. * diff --git a/lib/eal/include/rte_lcore.h b/lib/eal/include/rte_lcore.h index 1550b75da0a5..0458d233de4c 100644 --- a/lib/eal/include/rte_lcore.h +++ b/lib/eal/include/rte_lcore.h @@ -86,18 +86,6 @@ rte_lcore_id(void) */ unsigned int rte_get_main_lcore(void); -/** - * Deprecated function the id of the main lcore - * - * @return - * the id of the main lcore - */ -__rte_deprecated -static inline unsigned int rte_get_master_lcore(void) -{ - return rte_get_main_lcore(); -} - /** * Return the number of execution units (lcores) on the system. * @@ -246,9 +234,6 @@ unsigned int rte_get_next_lcore(unsigned int i, int skip_main, int wrap); i < RTE_MAX_LCORE; \ i = rte_get_next_lcore(i, 1, 0)) -#define RTE_LCORE_FOREACH_SLAVE(l) \ - RTE_DEPRECATED(RTE_LCORE_FOREACH_SLAVE) RTE_LCORE_FOREACH_WORKER(l) - /** * Callback prototype for initializing lcores. * -- 2.30.2