From 7df485eb3d56fbe5e6fcd160d33ca971bc3d3572 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 23 Aug 2021 08:06:53 -0700 Subject: [PATCH] eal: remove deprecated noninclusive API New API 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 Reviewed-by: Ruifeng Wang Acked-by: David Marchand --- 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 43d367bcad..1d56fa9bf2 100644 --- a/doc/guides/rel_notes/release_21_11.rst +++ b/doc/guides/rel_notes/release_21_11.rst @@ -100,6 +100,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 iterator 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 ff5861b5f3..6ecf5fd660 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 7b348e707f..8e4f7202a2 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 a935ab1be4..8816e40b60 100644 --- a/lib/eal/include/rte_bus.h +++ b/lib/eal/include/rte_bus.h @@ -235,12 +235,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 6dd72c11a1..aec70300ad 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 cd90944fe8..665f4aaaa9 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 22a901ce62..bad6d5c1f2 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 1550b75da0..0458d233de 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.20.1