Remove deprecated because of invalid namespace defines. Andrew Rybchenko (10): ethdev: remove deprecated link speed and duplex defines ethdev: remove deprecated Rx and Tx multi-queue mode defines ethdev: remove deprecated defines for RSS configuration ethdev: remove deprecated Rx and Tx offload defines ethdev: remove deprecated DCB and VMDq defines ethdev: remove deprecated tunnel type defines ethdev: remove deprecated flow control defines ethdev: remove deprecated VLAN offload configuration defines ethdev: remove deprecated maximum Rx MAC addresses define ethdev: remove deprecated metadata dynamic fields defines doc/guides/rel_notes/release_22_11.rst | 34 ++++ lib/ethdev/rte_ethdev.h | 242 ------------------------- lib/ethdev/rte_flow.h | 4 - 3 files changed, 34 insertions(+), 246 deletions(-) -- 2.30.2
Remove deprecated ``ETH_LINK_SPEED_``, ``ETH_SPEED_NUM_`` and ``ETH_LINK_`` defines. Use corresponding defines with ``RTE_`` prefix instead. Signed-off-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru> --- doc/guides/rel_notes/release_22_11.rst | 4 +++ lib/ethdev/rte_ethdev.h | 41 -------------------------- 2 files changed, 4 insertions(+), 41 deletions(-) diff --git a/doc/guides/rel_notes/release_22_11.rst b/doc/guides/rel_notes/release_22_11.rst index 8c021cf050..e5f9115c50 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -84,6 +84,10 @@ API Changes Also, make sure to start the actual text at the margin. ======================================================= +* ethdev: Removed deprecated ``ETH_LINK_SPEED_*``, ``ETH_SPEED_NUM_*`` and + ``ETH_LINK_*`` (duplex-related) defines. Use corresponding defines + with ``RTE_`` prefix instead. + ABI Changes ----------- diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h index de9e970d4d..0acaac0762 100644 --- a/lib/ethdev/rte_ethdev.h +++ b/lib/ethdev/rte_ethdev.h @@ -305,24 +305,6 @@ struct rte_eth_stats { #define RTE_ETH_LINK_SPEED_200G RTE_BIT32(15) /**< 200 Gbps */ /**@}*/ -#define ETH_LINK_SPEED_AUTONEG RTE_DEPRECATED(ETH_LINK_SPEED_AUTONEG) RTE_ETH_LINK_SPEED_AUTONEG -#define ETH_LINK_SPEED_FIXED RTE_DEPRECATED(ETH_LINK_SPEED_FIXED) RTE_ETH_LINK_SPEED_FIXED -#define ETH_LINK_SPEED_10M_HD RTE_DEPRECATED(ETH_LINK_SPEED_10M_HD) RTE_ETH_LINK_SPEED_10M_HD -#define ETH_LINK_SPEED_10M RTE_DEPRECATED(ETH_LINK_SPEED_10M) RTE_ETH_LINK_SPEED_10M -#define ETH_LINK_SPEED_100M_HD RTE_DEPRECATED(ETH_LINK_SPEED_100M_HD) RTE_ETH_LINK_SPEED_100M_HD -#define ETH_LINK_SPEED_100M RTE_DEPRECATED(ETH_LINK_SPEED_100M) RTE_ETH_LINK_SPEED_100M -#define ETH_LINK_SPEED_1G RTE_DEPRECATED(ETH_LINK_SPEED_1G) RTE_ETH_LINK_SPEED_1G -#define ETH_LINK_SPEED_2_5G RTE_DEPRECATED(ETH_LINK_SPEED_2_5G) RTE_ETH_LINK_SPEED_2_5G -#define ETH_LINK_SPEED_5G RTE_DEPRECATED(ETH_LINK_SPEED_5G) RTE_ETH_LINK_SPEED_5G -#define ETH_LINK_SPEED_10G RTE_DEPRECATED(ETH_LINK_SPEED_10G) RTE_ETH_LINK_SPEED_10G -#define ETH_LINK_SPEED_20G RTE_DEPRECATED(ETH_LINK_SPEED_20G) RTE_ETH_LINK_SPEED_20G -#define ETH_LINK_SPEED_25G RTE_DEPRECATED(ETH_LINK_SPEED_25G) RTE_ETH_LINK_SPEED_25G -#define ETH_LINK_SPEED_40G RTE_DEPRECATED(ETH_LINK_SPEED_40G) RTE_ETH_LINK_SPEED_40G -#define ETH_LINK_SPEED_50G RTE_DEPRECATED(ETH_LINK_SPEED_50G) RTE_ETH_LINK_SPEED_50G -#define ETH_LINK_SPEED_56G RTE_DEPRECATED(ETH_LINK_SPEED_56G) RTE_ETH_LINK_SPEED_56G -#define ETH_LINK_SPEED_100G RTE_DEPRECATED(ETH_LINK_SPEED_100G) RTE_ETH_LINK_SPEED_100G -#define ETH_LINK_SPEED_200G RTE_DEPRECATED(ETH_LINK_SPEED_200G) RTE_ETH_LINK_SPEED_200G - /**@{@name Link speed * Ethernet numeric link speeds in Mbps */ @@ -343,22 +325,6 @@ struct rte_eth_stats { #define RTE_ETH_SPEED_NUM_UNKNOWN UINT32_MAX /**< Unknown */ /**@}*/ -#define ETH_SPEED_NUM_NONE RTE_DEPRECATED(ETH_SPEED_NUM_NONE) RTE_ETH_SPEED_NUM_NONE -#define ETH_SPEED_NUM_10M RTE_DEPRECATED(ETH_SPEED_NUM_10M) RTE_ETH_SPEED_NUM_10M -#define ETH_SPEED_NUM_100M RTE_DEPRECATED(ETH_SPEED_NUM_100M) RTE_ETH_SPEED_NUM_100M -#define ETH_SPEED_NUM_1G RTE_DEPRECATED(ETH_SPEED_NUM_1G) RTE_ETH_SPEED_NUM_1G -#define ETH_SPEED_NUM_2_5G RTE_DEPRECATED(ETH_SPEED_NUM_2_5G) RTE_ETH_SPEED_NUM_2_5G -#define ETH_SPEED_NUM_5G RTE_DEPRECATED(ETH_SPEED_NUM_5G) RTE_ETH_SPEED_NUM_5G -#define ETH_SPEED_NUM_10G RTE_DEPRECATED(ETH_SPEED_NUM_10G) RTE_ETH_SPEED_NUM_10G -#define ETH_SPEED_NUM_20G RTE_DEPRECATED(ETH_SPEED_NUM_20G) RTE_ETH_SPEED_NUM_20G -#define ETH_SPEED_NUM_25G RTE_DEPRECATED(ETH_SPEED_NUM_25G) RTE_ETH_SPEED_NUM_25G -#define ETH_SPEED_NUM_40G RTE_DEPRECATED(ETH_SPEED_NUM_40G) RTE_ETH_SPEED_NUM_40G -#define ETH_SPEED_NUM_50G RTE_DEPRECATED(ETH_SPEED_NUM_50G) RTE_ETH_SPEED_NUM_50G -#define ETH_SPEED_NUM_56G RTE_DEPRECATED(ETH_SPEED_NUM_56G) RTE_ETH_SPEED_NUM_56G -#define ETH_SPEED_NUM_100G RTE_DEPRECATED(ETH_SPEED_NUM_100G) RTE_ETH_SPEED_NUM_100G -#define ETH_SPEED_NUM_200G RTE_DEPRECATED(ETH_SPEED_NUM_200G) RTE_ETH_SPEED_NUM_200G -#define ETH_SPEED_NUM_UNKNOWN RTE_DEPRECATED(ETH_SPEED_NUM_UNKNOWN) RTE_ETH_SPEED_NUM_UNKNOWN - /** * A structure used to retrieve link-level information of an Ethernet port. */ @@ -382,13 +348,6 @@ struct rte_eth_link { #define RTE_ETH_LINK_MAX_STR_LEN 40 /**< Max length of default link string. */ /**@}*/ -#define ETH_LINK_HALF_DUPLEX RTE_DEPRECATED(ETH_LINK_HALF_DUPLEX) RTE_ETH_LINK_HALF_DUPLEX -#define ETH_LINK_FULL_DUPLEX RTE_DEPRECATED(ETH_LINK_FULL_DUPLEX) RTE_ETH_LINK_FULL_DUPLEX -#define ETH_LINK_DOWN RTE_DEPRECATED(ETH_LINK_DOWN) RTE_ETH_LINK_DOWN -#define ETH_LINK_UP RTE_DEPRECATED(ETH_LINK_UP) RTE_ETH_LINK_UP -#define ETH_LINK_FIXED RTE_DEPRECATED(ETH_LINK_FIXED) RTE_ETH_LINK_FIXED -#define ETH_LINK_AUTONEG RTE_DEPRECATED(ETH_LINK_AUTONEG) RTE_ETH_LINK_AUTONEG - /** * A structure used to configure the ring threshold registers of an Rx/Tx * queue for an Ethernet port. -- 2.30.2
Remove deprecated ``ETH_MQ_RX_*`` and ``ETH_MQ_TX_*`` defines. Use corresponding defines with ``RTE_`` prefix instead. Signed-off-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru> --- doc/guides/rel_notes/release_22_11.rst | 3 +++ lib/ethdev/rte_ethdev.h | 18 ------------------ 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/doc/guides/rel_notes/release_22_11.rst b/doc/guides/rel_notes/release_22_11.rst index e5f9115c50..a1dcfc7e2b 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -88,6 +88,9 @@ API Changes ``ETH_LINK_*`` (duplex-related) defines. Use corresponding defines with ``RTE_`` prefix instead. +* ethdev: Removed deprecated ``ETH_MQ_RX_*`` and ``ETH_MQ_TX_*`` defines. + Use corresponding defines with ``RTE_`` prefix instead. + ABI Changes ----------- diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h index 0acaac0762..44ca2e6ad4 100644 --- a/lib/ethdev/rte_ethdev.h +++ b/lib/ethdev/rte_ethdev.h @@ -366,10 +366,6 @@ struct rte_eth_thresh { #define RTE_ETH_MQ_RX_VMDQ_FLAG RTE_BIT32(2) /**< Enable VMDq. */ /**@}*/ -#define ETH_MQ_RX_RSS_FLAG RTE_DEPRECATED(ETH_MQ_RX_RSS_FLAG) RTE_ETH_MQ_RX_RSS_FLAG -#define ETH_MQ_RX_DCB_FLAG RTE_DEPRECATED(ETH_MQ_RX_DCB_FLAG) RTE_ETH_MQ_RX_DCB_FLAG -#define ETH_MQ_RX_VMDQ_FLAG RTE_DEPRECATED(ETH_MQ_RX_VMDQ_FLAG) RTE_ETH_MQ_RX_VMDQ_FLAG - /** * A set of values to identify what method is to be used to route * packets to multiple queues. @@ -396,15 +392,6 @@ enum rte_eth_rx_mq_mode { RTE_ETH_MQ_RX_VMDQ_FLAG, }; -#define ETH_MQ_RX_NONE RTE_DEPRECATED(ETH_MQ_RX_NONE) RTE_ETH_MQ_RX_NONE -#define ETH_MQ_RX_RSS RTE_DEPRECATED(ETH_MQ_RX_RSS) RTE_ETH_MQ_RX_RSS -#define ETH_MQ_RX_DCB RTE_DEPRECATED(ETH_MQ_RX_DCB) RTE_ETH_MQ_RX_DCB -#define ETH_MQ_RX_DCB_RSS RTE_DEPRECATED(ETH_MQ_RX_DCB_RSS) RTE_ETH_MQ_RX_DCB_RSS -#define ETH_MQ_RX_VMDQ_ONLY RTE_DEPRECATED(ETH_MQ_RX_VMDQ_ONLY) RTE_ETH_MQ_RX_VMDQ_ONLY -#define ETH_MQ_RX_VMDQ_RSS RTE_DEPRECATED(ETH_MQ_RX_VMDQ_RSS) RTE_ETH_MQ_RX_VMDQ_RSS -#define ETH_MQ_RX_VMDQ_DCB RTE_DEPRECATED(ETH_MQ_RX_VMDQ_DCB) RTE_ETH_MQ_RX_VMDQ_DCB -#define ETH_MQ_RX_VMDQ_DCB_RSS RTE_DEPRECATED(ETH_MQ_RX_VMDQ_DCB_RSS) RTE_ETH_MQ_RX_VMDQ_DCB_RSS - /** * A set of values to identify what method is to be used to transmit * packets using multi-TCs. @@ -416,11 +403,6 @@ enum rte_eth_tx_mq_mode { RTE_ETH_MQ_TX_VMDQ_ONLY, /**< Only VT on, no DCB */ }; -#define ETH_MQ_TX_NONE RTE_DEPRECATED(ETH_MQ_TX_NONE) RTE_ETH_MQ_TX_NONE -#define ETH_MQ_TX_DCB RTE_DEPRECATED(ETH_MQ_TX_DCB) RTE_ETH_MQ_TX_DCB -#define ETH_MQ_TX_VMDQ_DCB RTE_DEPRECATED(ETH_MQ_TX_VMDQ_DCB) RTE_ETH_MQ_TX_VMDQ_DCB -#define ETH_MQ_TX_VMDQ_ONLY RTE_DEPRECATED(ETH_MQ_TX_VMDQ_ONLY) RTE_ETH_MQ_TX_VMDQ_ONLY - /** * A structure used to configure the Rx features of an Ethernet port. */ -- 2.30.2
Remove deprecated ``ETH_RSS_*`` defines used for hash function and RETA size specification. Use corresponding defines with ``RTE_`` prefix instead. Signed-off-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru> --- doc/guides/rel_notes/release_22_11.rst | 4 ++ lib/ethdev/rte_ethdev.h | 84 -------------------------- 2 files changed, 4 insertions(+), 84 deletions(-) diff --git a/doc/guides/rel_notes/release_22_11.rst b/doc/guides/rel_notes/release_22_11.rst index a1dcfc7e2b..c9fa16ceb2 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -91,6 +91,10 @@ API Changes * ethdev: Removed deprecated ``ETH_MQ_RX_*`` and ``ETH_MQ_TX_*`` defines. Use corresponding defines with ``RTE_`` prefix instead. +* ethdev: Removed deprecated ``ETH_RSS_*`` defines for hash function and + RETA size specification. Use corresponding defines with ``RTE_`` prefix + instead. + ABI Changes ----------- diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h index 44ca2e6ad4..b27cc744be 100644 --- a/lib/ethdev/rte_ethdev.h +++ b/lib/ethdev/rte_ethdev.h @@ -543,39 +543,6 @@ struct rte_eth_rss_conf { #define RTE_ETH_RSS_MPLS RTE_BIT64(33) #define RTE_ETH_RSS_IPV4_CHKSUM RTE_BIT64(34) -#define ETH_RSS_IPV4 RTE_DEPRECATED(ETH_RSS_IPV4) RTE_ETH_RSS_IPV4 -#define ETH_RSS_FRAG_IPV4 RTE_DEPRECATED(ETH_RSS_FRAG_IPV4) RTE_ETH_RSS_FRAG_IPV4 -#define ETH_RSS_NONFRAG_IPV4_TCP RTE_DEPRECATED(ETH_RSS_NONFRAG_IPV4_TCP) RTE_ETH_RSS_NONFRAG_IPV4_TCP -#define ETH_RSS_NONFRAG_IPV4_UDP RTE_DEPRECATED(ETH_RSS_NONFRAG_IPV4_UDP) RTE_ETH_RSS_NONFRAG_IPV4_UDP -#define ETH_RSS_NONFRAG_IPV4_SCTP RTE_DEPRECATED(ETH_RSS_NONFRAG_IPV4_SCTP) RTE_ETH_RSS_NONFRAG_IPV4_SCTP -#define ETH_RSS_NONFRAG_IPV4_OTHER RTE_DEPRECATED(ETH_RSS_NONFRAG_IPV4_OTHER) RTE_ETH_RSS_NONFRAG_IPV4_OTHER -#define ETH_RSS_IPV6 RTE_DEPRECATED(ETH_RSS_IPV6) RTE_ETH_RSS_IPV6 -#define ETH_RSS_FRAG_IPV6 RTE_DEPRECATED(ETH_RSS_FRAG_IPV6) RTE_ETH_RSS_FRAG_IPV6 -#define ETH_RSS_NONFRAG_IPV6_TCP RTE_DEPRECATED(ETH_RSS_NONFRAG_IPV6_TCP) RTE_ETH_RSS_NONFRAG_IPV6_TCP -#define ETH_RSS_NONFRAG_IPV6_UDP RTE_DEPRECATED(ETH_RSS_NONFRAG_IPV6_UDP) RTE_ETH_RSS_NONFRAG_IPV6_UDP -#define ETH_RSS_NONFRAG_IPV6_SCTP RTE_DEPRECATED(ETH_RSS_NONFRAG_IPV6_SCTP) RTE_ETH_RSS_NONFRAG_IPV6_SCTP -#define ETH_RSS_NONFRAG_IPV6_OTHER RTE_DEPRECATED(ETH_RSS_NONFRAG_IPV6_OTHER) RTE_ETH_RSS_NONFRAG_IPV6_OTHER -#define ETH_RSS_L2_PAYLOAD RTE_DEPRECATED(ETH_RSS_L2_PAYLOAD) RTE_ETH_RSS_L2_PAYLOAD -#define ETH_RSS_IPV6_EX RTE_DEPRECATED(ETH_RSS_IPV6_EX) RTE_ETH_RSS_IPV6_EX -#define ETH_RSS_IPV6_TCP_EX RTE_DEPRECATED(ETH_RSS_IPV6_TCP_EX) RTE_ETH_RSS_IPV6_TCP_EX -#define ETH_RSS_IPV6_UDP_EX RTE_DEPRECATED(ETH_RSS_IPV6_UDP_EX) RTE_ETH_RSS_IPV6_UDP_EX -#define ETH_RSS_PORT RTE_DEPRECATED(ETH_RSS_PORT) RTE_ETH_RSS_PORT -#define ETH_RSS_VXLAN RTE_DEPRECATED(ETH_RSS_VXLAN) RTE_ETH_RSS_VXLAN -#define ETH_RSS_GENEVE RTE_DEPRECATED(ETH_RSS_GENEVE) RTE_ETH_RSS_GENEVE -#define ETH_RSS_NVGRE RTE_DEPRECATED(ETH_RSS_NVGRE) RTE_ETH_RSS_NVGRE -#define ETH_RSS_GTPU RTE_DEPRECATED(ETH_RSS_GTPU) RTE_ETH_RSS_GTPU -#define ETH_RSS_ETH RTE_DEPRECATED(ETH_RSS_ETH) RTE_ETH_RSS_ETH -#define ETH_RSS_S_VLAN RTE_DEPRECATED(ETH_RSS_S_VLAN) RTE_ETH_RSS_S_VLAN -#define ETH_RSS_C_VLAN RTE_DEPRECATED(ETH_RSS_C_VLAN) RTE_ETH_RSS_C_VLAN -#define ETH_RSS_ESP RTE_DEPRECATED(ETH_RSS_ESP) RTE_ETH_RSS_ESP -#define ETH_RSS_AH RTE_DEPRECATED(ETH_RSS_AH) RTE_ETH_RSS_AH -#define ETH_RSS_L2TPV3 RTE_DEPRECATED(ETH_RSS_L2TPV3) RTE_ETH_RSS_L2TPV3 -#define ETH_RSS_PFCP RTE_DEPRECATED(ETH_RSS_PFCP) RTE_ETH_RSS_PFCP -#define ETH_RSS_PPPOE RTE_DEPRECATED(ETH_RSS_PPPOE) RTE_ETH_RSS_PPPOE -#define ETH_RSS_ECPRI RTE_DEPRECATED(ETH_RSS_ECPRI) RTE_ETH_RSS_ECPRI -#define ETH_RSS_MPLS RTE_DEPRECATED(ETH_RSS_MPLS) RTE_ETH_RSS_MPLS -#define ETH_RSS_IPV4_CHKSUM RTE_DEPRECATED(ETH_RSS_IPV4_CHKSUM) RTE_ETH_RSS_IPV4_CHKSUM - /** * The ETH_RSS_L4_CHKSUM works on checksum field of any L4 header. * It is similar to ETH_RSS_PORT that they don't specify the specific type of @@ -589,7 +556,6 @@ struct rte_eth_rss_conf { * it takes the reserved value 0 as input for the hash function. */ #define RTE_ETH_RSS_L4_CHKSUM RTE_BIT64(35) -#define ETH_RSS_L4_CHKSUM RTE_DEPRECATED(ETH_RSS_L4_CHKSUM) RTE_ETH_RSS_L4_CHKSUM #define RTE_ETH_RSS_L2TPV2 RTE_BIT64(36) @@ -609,13 +575,6 @@ struct rte_eth_rss_conf { #define RTE_ETH_RSS_L2_SRC_ONLY RTE_BIT64(59) #define RTE_ETH_RSS_L2_DST_ONLY RTE_BIT64(58) -#define ETH_RSS_L3_SRC_ONLY RTE_DEPRECATED(ETH_RSS_L3_SRC_ONLY) RTE_ETH_RSS_L3_SRC_ONLY -#define ETH_RSS_L3_DST_ONLY RTE_DEPRECATED(ETH_RSS_L3_DST_ONLY) RTE_ETH_RSS_L3_DST_ONLY -#define ETH_RSS_L4_SRC_ONLY RTE_DEPRECATED(ETH_RSS_L4_SRC_ONLY) RTE_ETH_RSS_L4_SRC_ONLY -#define ETH_RSS_L4_DST_ONLY RTE_DEPRECATED(ETH_RSS_L4_DST_ONLY) RTE_ETH_RSS_L4_DST_ONLY -#define ETH_RSS_L2_SRC_ONLY RTE_DEPRECATED(ETH_RSS_L2_SRC_ONLY) RTE_ETH_RSS_L2_SRC_ONLY -#define ETH_RSS_L2_DST_ONLY RTE_DEPRECATED(ETH_RSS_L2_DST_ONLY) RTE_ETH_RSS_L2_DST_ONLY - /* * Only select IPV6 address prefix as RSS input set according to * https://tools.ietf.org/html/rfc6052 @@ -643,14 +602,12 @@ struct rte_eth_rss_conf { * can be performed on according to PMD and device capabilities. */ #define RTE_ETH_RSS_LEVEL_PMD_DEFAULT (UINT64_C(0) << 50) -#define ETH_RSS_LEVEL_PMD_DEFAULT RTE_DEPRECATED(ETH_RSS_LEVEL_PMD_DEFAULT) RTE_ETH_RSS_LEVEL_PMD_DEFAULT /** * level 1, requests RSS to be performed on the outermost packet * encapsulation level. */ #define RTE_ETH_RSS_LEVEL_OUTERMOST (UINT64_C(1) << 50) -#define ETH_RSS_LEVEL_OUTERMOST RTE_DEPRECATED(ETH_RSS_LEVEL_OUTERMOST) RTE_ETH_RSS_LEVEL_OUTERMOST /** * level 2, requests RSS to be performed on the specified inner packet @@ -659,11 +616,7 @@ struct rte_eth_rss_conf { #define RTE_ETH_RSS_LEVEL_INNERMOST (UINT64_C(2) << 50) #define RTE_ETH_RSS_LEVEL_MASK (UINT64_C(3) << 50) -#define ETH_RSS_LEVEL_INNERMOST RTE_DEPRECATED(ETH_RSS_LEVEL_INNERMOST) RTE_ETH_RSS_LEVEL_INNERMOST -#define ETH_RSS_LEVEL_MASK RTE_DEPRECATED(ETH_RSS_LEVEL_MASK) RTE_ETH_RSS_LEVEL_MASK - #define RTE_ETH_RSS_LEVEL(rss_hf) ((rss_hf & RTE_ETH_RSS_LEVEL_MASK) >> 50) -#define ETH_RSS_LEVEL(rss_hf) RTE_DEPRECATED(ETH_RSS_LEVEL(rss_hf)) RTE_ETH_RSS_LEVEL(rss_hf) /** * For input set change of hash filter, if SRC_ONLY and DST_ONLY of @@ -690,122 +643,98 @@ rte_eth_rss_hf_refine(uint64_t rss_hf) #define RTE_ETH_RSS_IPV6_PRE32 ( \ RTE_ETH_RSS_IPV6 | \ RTE_ETH_RSS_L3_PRE32) -#define ETH_RSS_IPV6_PRE32 RTE_DEPRECATED(ETH_RSS_IPV6_PRE32) RTE_ETH_RSS_IPV6_PRE32 #define RTE_ETH_RSS_IPV6_PRE40 ( \ RTE_ETH_RSS_IPV6 | \ RTE_ETH_RSS_L3_PRE40) -#define ETH_RSS_IPV6_PRE40 RTE_DEPRECATED(ETH_RSS_IPV6_PRE40) RTE_ETH_RSS_IPV6_PRE40 #define RTE_ETH_RSS_IPV6_PRE48 ( \ RTE_ETH_RSS_IPV6 | \ RTE_ETH_RSS_L3_PRE48) -#define ETH_RSS_IPV6_PRE48 RTE_DEPRECATED(ETH_RSS_IPV6_PRE48) RTE_ETH_RSS_IPV6_PRE48 #define RTE_ETH_RSS_IPV6_PRE56 ( \ RTE_ETH_RSS_IPV6 | \ RTE_ETH_RSS_L3_PRE56) -#define ETH_RSS_IPV6_PRE56 RTE_DEPRECATED(ETH_RSS_IPV6_PRE56) RTE_ETH_RSS_IPV6_PRE56 #define RTE_ETH_RSS_IPV6_PRE64 ( \ RTE_ETH_RSS_IPV6 | \ RTE_ETH_RSS_L3_PRE64) -#define ETH_RSS_IPV6_PRE64 RTE_DEPRECATED(ETH_RSS_IPV6_PRE64) RTE_ETH_RSS_IPV6_PRE64 #define RTE_ETH_RSS_IPV6_PRE96 ( \ RTE_ETH_RSS_IPV6 | \ RTE_ETH_RSS_L3_PRE96) -#define ETH_RSS_IPV6_PRE96 RTE_DEPRECATED(ETH_RSS_IPV6_PRE96) RTE_ETH_RSS_IPV6_PRE96 #define RTE_ETH_RSS_IPV6_PRE32_UDP ( \ RTE_ETH_RSS_NONFRAG_IPV6_UDP | \ RTE_ETH_RSS_L3_PRE32) -#define ETH_RSS_IPV6_PRE32_UDP RTE_DEPRECATED(ETH_RSS_IPV6_PRE32_UDP) RTE_ETH_RSS_IPV6_PRE32_UDP #define RTE_ETH_RSS_IPV6_PRE40_UDP ( \ RTE_ETH_RSS_NONFRAG_IPV6_UDP | \ RTE_ETH_RSS_L3_PRE40) -#define ETH_RSS_IPV6_PRE40_UDP RTE_DEPRECATED(ETH_RSS_IPV6_PRE40_UDP) RTE_ETH_RSS_IPV6_PRE40_UDP #define RTE_ETH_RSS_IPV6_PRE48_UDP ( \ RTE_ETH_RSS_NONFRAG_IPV6_UDP | \ RTE_ETH_RSS_L3_PRE48) -#define ETH_RSS_IPV6_PRE48_UDP RTE_DEPRECATED(ETH_RSS_IPV6_PRE48_UDP) RTE_ETH_RSS_IPV6_PRE48_UDP #define RTE_ETH_RSS_IPV6_PRE56_UDP ( \ RTE_ETH_RSS_NONFRAG_IPV6_UDP | \ RTE_ETH_RSS_L3_PRE56) -#define ETH_RSS_IPV6_PRE56_UDP RTE_DEPRECATED(ETH_RSS_IPV6_PRE56_UDP) RTE_ETH_RSS_IPV6_PRE56_UDP #define RTE_ETH_RSS_IPV6_PRE64_UDP ( \ RTE_ETH_RSS_NONFRAG_IPV6_UDP | \ RTE_ETH_RSS_L3_PRE64) -#define ETH_RSS_IPV6_PRE64_UDP RTE_DEPRECATED(ETH_RSS_IPV6_PRE64_UDP) RTE_ETH_RSS_IPV6_PRE64_UDP #define RTE_ETH_RSS_IPV6_PRE96_UDP ( \ RTE_ETH_RSS_NONFRAG_IPV6_UDP | \ RTE_ETH_RSS_L3_PRE96) -#define ETH_RSS_IPV6_PRE96_UDP RTE_DEPRECATED(ETH_RSS_IPV6_PRE96_UDP) RTE_ETH_RSS_IPV6_PRE96_UDP #define RTE_ETH_RSS_IPV6_PRE32_TCP ( \ RTE_ETH_RSS_NONFRAG_IPV6_TCP | \ RTE_ETH_RSS_L3_PRE32) -#define ETH_RSS_IPV6_PRE32_TCP RTE_DEPRECATED(ETH_RSS_IPV6_PRE32_TCP) RTE_ETH_RSS_IPV6_PRE32_TCP #define RTE_ETH_RSS_IPV6_PRE40_TCP ( \ RTE_ETH_RSS_NONFRAG_IPV6_TCP | \ RTE_ETH_RSS_L3_PRE40) -#define ETH_RSS_IPV6_PRE40_TCP RTE_DEPRECATED(ETH_RSS_IPV6_PRE40_TCP) RTE_ETH_RSS_IPV6_PRE40_TCP #define RTE_ETH_RSS_IPV6_PRE48_TCP ( \ RTE_ETH_RSS_NONFRAG_IPV6_TCP | \ RTE_ETH_RSS_L3_PRE48) -#define ETH_RSS_IPV6_PRE48_TCP RTE_DEPRECATED(ETH_RSS_IPV6_PRE48_TCP) RTE_ETH_RSS_IPV6_PRE48_TCP #define RTE_ETH_RSS_IPV6_PRE56_TCP ( \ RTE_ETH_RSS_NONFRAG_IPV6_TCP | \ RTE_ETH_RSS_L3_PRE56) -#define ETH_RSS_IPV6_PRE56_TCP RTE_DEPRECATED(ETH_RSS_IPV6_PRE56_TCP) RTE_ETH_RSS_IPV6_PRE56_TCP #define RTE_ETH_RSS_IPV6_PRE64_TCP ( \ RTE_ETH_RSS_NONFRAG_IPV6_TCP | \ RTE_ETH_RSS_L3_PRE64) -#define ETH_RSS_IPV6_PRE64_TCP RTE_DEPRECATED(ETH_RSS_IPV6_PRE64_TCP) RTE_ETH_RSS_IPV6_PRE64_TCP #define RTE_ETH_RSS_IPV6_PRE96_TCP ( \ RTE_ETH_RSS_NONFRAG_IPV6_TCP | \ RTE_ETH_RSS_L3_PRE96) -#define ETH_RSS_IPV6_PRE96_TCP RTE_DEPRECATED(ETH_RSS_IPV6_PRE96_TCP) RTE_ETH_RSS_IPV6_PRE96_TCP #define RTE_ETH_RSS_IPV6_PRE32_SCTP ( \ RTE_ETH_RSS_NONFRAG_IPV6_SCTP | \ RTE_ETH_RSS_L3_PRE32) -#define ETH_RSS_IPV6_PRE32_SCTP RTE_DEPRECATED(ETH_RSS_IPV6_PRE32_SCTP) RTE_ETH_RSS_IPV6_PRE32_SCTP #define RTE_ETH_RSS_IPV6_PRE40_SCTP ( \ RTE_ETH_RSS_NONFRAG_IPV6_SCTP | \ RTE_ETH_RSS_L3_PRE40) -#define ETH_RSS_IPV6_PRE40_SCTP RTE_DEPRECATED(ETH_RSS_IPV6_PRE40_SCTP) RTE_ETH_RSS_IPV6_PRE40_SCTP #define RTE_ETH_RSS_IPV6_PRE48_SCTP ( \ RTE_ETH_RSS_NONFRAG_IPV6_SCTP | \ RTE_ETH_RSS_L3_PRE48) -#define ETH_RSS_IPV6_PRE48_SCTP RTE_DEPRECATED(ETH_RSS_IPV6_PRE48_SCTP) RTE_ETH_RSS_IPV6_PRE48_SCTP #define RTE_ETH_RSS_IPV6_PRE56_SCTP ( \ RTE_ETH_RSS_NONFRAG_IPV6_SCTP | \ RTE_ETH_RSS_L3_PRE56) -#define ETH_RSS_IPV6_PRE56_SCTP RTE_DEPRECATED(ETH_RSS_IPV6_PRE56_SCTP) RTE_ETH_RSS_IPV6_PRE56_SCTP #define RTE_ETH_RSS_IPV6_PRE64_SCTP ( \ RTE_ETH_RSS_NONFRAG_IPV6_SCTP | \ RTE_ETH_RSS_L3_PRE64) -#define ETH_RSS_IPV6_PRE64_SCTP RTE_DEPRECATED(ETH_RSS_IPV6_PRE64_SCTP) RTE_ETH_RSS_IPV6_PRE64_SCTP #define RTE_ETH_RSS_IPV6_PRE96_SCTP ( \ RTE_ETH_RSS_NONFRAG_IPV6_SCTP | \ RTE_ETH_RSS_L3_PRE96) -#define ETH_RSS_IPV6_PRE96_SCTP RTE_DEPRECATED(ETH_RSS_IPV6_PRE96_SCTP) RTE_ETH_RSS_IPV6_PRE96_SCTP #define RTE_ETH_RSS_IP ( \ RTE_ETH_RSS_IPV4 | \ @@ -815,35 +744,29 @@ rte_eth_rss_hf_refine(uint64_t rss_hf) RTE_ETH_RSS_FRAG_IPV6 | \ RTE_ETH_RSS_NONFRAG_IPV6_OTHER | \ RTE_ETH_RSS_IPV6_EX) -#define ETH_RSS_IP RTE_DEPRECATED(ETH_RSS_IP) RTE_ETH_RSS_IP #define RTE_ETH_RSS_UDP ( \ RTE_ETH_RSS_NONFRAG_IPV4_UDP | \ RTE_ETH_RSS_NONFRAG_IPV6_UDP | \ RTE_ETH_RSS_IPV6_UDP_EX) -#define ETH_RSS_UDP RTE_DEPRECATED(ETH_RSS_UDP) RTE_ETH_RSS_UDP #define RTE_ETH_RSS_TCP ( \ RTE_ETH_RSS_NONFRAG_IPV4_TCP | \ RTE_ETH_RSS_NONFRAG_IPV6_TCP | \ RTE_ETH_RSS_IPV6_TCP_EX) -#define ETH_RSS_TCP RTE_DEPRECATED(ETH_RSS_TCP) RTE_ETH_RSS_TCP #define RTE_ETH_RSS_SCTP ( \ RTE_ETH_RSS_NONFRAG_IPV4_SCTP | \ RTE_ETH_RSS_NONFRAG_IPV6_SCTP) -#define ETH_RSS_SCTP RTE_DEPRECATED(ETH_RSS_SCTP) RTE_ETH_RSS_SCTP #define RTE_ETH_RSS_TUNNEL ( \ RTE_ETH_RSS_VXLAN | \ RTE_ETH_RSS_GENEVE | \ RTE_ETH_RSS_NVGRE) -#define ETH_RSS_TUNNEL RTE_DEPRECATED(ETH_RSS_TUNNEL) RTE_ETH_RSS_TUNNEL #define RTE_ETH_RSS_VLAN ( \ RTE_ETH_RSS_S_VLAN | \ RTE_ETH_RSS_C_VLAN) -#define ETH_RSS_VLAN RTE_DEPRECATED(ETH_RSS_VLAN) RTE_ETH_RSS_VLAN /** Mask of valid RSS hash protocols */ #define RTE_ETH_RSS_PROTO_MASK ( \ @@ -868,7 +791,6 @@ rte_eth_rss_hf_refine(uint64_t rss_hf) RTE_ETH_RSS_GENEVE | \ RTE_ETH_RSS_NVGRE | \ RTE_ETH_RSS_MPLS) -#define ETH_RSS_PROTO_MASK RTE_DEPRECATED(ETH_RSS_PROTO_MASK) RTE_ETH_RSS_PROTO_MASK /* * Definitions used for redirection table entry size. @@ -881,12 +803,6 @@ rte_eth_rss_hf_refine(uint64_t rss_hf) #define RTE_ETH_RSS_RETA_SIZE_512 512 #define RTE_ETH_RETA_GROUP_SIZE 64 -#define ETH_RSS_RETA_SIZE_64 RTE_DEPRECATED(ETH_RSS_RETA_SIZE_64) RTE_ETH_RSS_RETA_SIZE_64 -#define ETH_RSS_RETA_SIZE_128 RTE_DEPRECATED(ETH_RSS_RETA_SIZE_128) RTE_ETH_RSS_RETA_SIZE_128 -#define ETH_RSS_RETA_SIZE_256 RTE_DEPRECATED(ETH_RSS_RETA_SIZE_256) RTE_ETH_RSS_RETA_SIZE_256 -#define ETH_RSS_RETA_SIZE_512 RTE_DEPRECATED(ETH_RSS_RETA_SIZE_512) RTE_ETH_RSS_RETA_SIZE_512 -#define RTE_RETA_GROUP_SIZE RTE_DEPRECATED(RTE_RETA_GROUP_SIZE) RTE_ETH_RETA_GROUP_SIZE - /**@{@name VMDq and DCB maximums */ #define RTE_ETH_VMDQ_MAX_VLAN_FILTERS 64 /**< Maximum nb. of VMDq VLAN filters. */ #define RTE_ETH_DCB_NUM_USER_PRIORITIES 8 /**< Maximum nb. of DCB priorities. */ -- 2.30.2
Remove deprecated ``DEV_RX_OFFLOAD_*`` and ``DEV_TX_OFFLOAD_`` defines. Use corresponding defines with ``RTE_ETH_RX_OFFLOAD_`` and ``RTE_ETH_TX_OFFLOAD_`` prefix instead. Signed-off-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru> --- doc/guides/rel_notes/release_22_11.rst | 4 +++ lib/ethdev/rte_ethdev.h | 44 -------------------------- 2 files changed, 4 insertions(+), 44 deletions(-) diff --git a/doc/guides/rel_notes/release_22_11.rst b/doc/guides/rel_notes/release_22_11.rst index c9fa16ceb2..0bed31cbaa 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -95,6 +95,10 @@ API Changes RETA size specification. Use corresponding defines with ``RTE_`` prefix instead. +* ethdev: Removed deprecated ``DEV_RX_OFFLOAD_*`` and ``DEV_TX_OFFLOAD_`` + defines. Use corresponding defines with ``RTE_ETH_RX_OFFLOAD_`` and + ``RTE_ETH_TX_OFFLOAD_`` prefix instead. + ABI Changes ----------- diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h index b27cc744be..3552535780 100644 --- a/lib/ethdev/rte_ethdev.h +++ b/lib/ethdev/rte_ethdev.h @@ -1491,34 +1491,13 @@ struct rte_eth_conf { #define RTE_ETH_RX_OFFLOAD_RSS_HASH RTE_BIT64(19) #define RTE_ETH_RX_OFFLOAD_BUFFER_SPLIT RTE_BIT64(20) -#define DEV_RX_OFFLOAD_VLAN_STRIP RTE_DEPRECATED(DEV_RX_OFFLOAD_VLAN_STRIP) RTE_ETH_RX_OFFLOAD_VLAN_STRIP -#define DEV_RX_OFFLOAD_IPV4_CKSUM RTE_DEPRECATED(DEV_RX_OFFLOAD_IPV4_CKSUM) RTE_ETH_RX_OFFLOAD_IPV4_CKSUM -#define DEV_RX_OFFLOAD_UDP_CKSUM RTE_DEPRECATED(DEV_RX_OFFLOAD_UDP_CKSUM) RTE_ETH_RX_OFFLOAD_UDP_CKSUM -#define DEV_RX_OFFLOAD_TCP_CKSUM RTE_DEPRECATED(DEV_RX_OFFLOAD_TCP_CKSUM) RTE_ETH_RX_OFFLOAD_TCP_CKSUM -#define DEV_RX_OFFLOAD_TCP_LRO RTE_DEPRECATED(DEV_RX_OFFLOAD_TCP_LRO) RTE_ETH_RX_OFFLOAD_TCP_LRO -#define DEV_RX_OFFLOAD_QINQ_STRIP RTE_DEPRECATED(DEV_RX_OFFLOAD_QINQ_STRIP) RTE_ETH_RX_OFFLOAD_QINQ_STRIP -#define DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM RTE_DEPRECATED(DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM) RTE_ETH_RX_OFFLOAD_OUTER_IPV4_CKSUM -#define DEV_RX_OFFLOAD_MACSEC_STRIP RTE_DEPRECATED(DEV_RX_OFFLOAD_MACSEC_STRIP) RTE_ETH_RX_OFFLOAD_MACSEC_STRIP -#define DEV_RX_OFFLOAD_HEADER_SPLIT RTE_DEPRECATED(DEV_RX_OFFLOAD_HEADER_SPLIT) RTE_ETH_RX_OFFLOAD_HEADER_SPLIT -#define DEV_RX_OFFLOAD_VLAN_FILTER RTE_DEPRECATED(DEV_RX_OFFLOAD_VLAN_FILTER) RTE_ETH_RX_OFFLOAD_VLAN_FILTER -#define DEV_RX_OFFLOAD_VLAN_EXTEND RTE_DEPRECATED(DEV_RX_OFFLOAD_VLAN_EXTEND) RTE_ETH_RX_OFFLOAD_VLAN_EXTEND -#define DEV_RX_OFFLOAD_SCATTER RTE_DEPRECATED(DEV_RX_OFFLOAD_SCATTER) RTE_ETH_RX_OFFLOAD_SCATTER -#define DEV_RX_OFFLOAD_TIMESTAMP RTE_DEPRECATED(DEV_RX_OFFLOAD_TIMESTAMP) RTE_ETH_RX_OFFLOAD_TIMESTAMP -#define DEV_RX_OFFLOAD_SECURITY RTE_DEPRECATED(DEV_RX_OFFLOAD_SECURITY) RTE_ETH_RX_OFFLOAD_SECURITY -#define DEV_RX_OFFLOAD_KEEP_CRC RTE_DEPRECATED(DEV_RX_OFFLOAD_KEEP_CRC) RTE_ETH_RX_OFFLOAD_KEEP_CRC -#define DEV_RX_OFFLOAD_SCTP_CKSUM RTE_DEPRECATED(DEV_RX_OFFLOAD_SCTP_CKSUM) RTE_ETH_RX_OFFLOAD_SCTP_CKSUM -#define DEV_RX_OFFLOAD_OUTER_UDP_CKSUM RTE_DEPRECATED(DEV_RX_OFFLOAD_OUTER_UDP_CKSUM) RTE_ETH_RX_OFFLOAD_OUTER_UDP_CKSUM -#define DEV_RX_OFFLOAD_RSS_HASH RTE_DEPRECATED(DEV_RX_OFFLOAD_RSS_HASH) RTE_ETH_RX_OFFLOAD_RSS_HASH - #define RTE_ETH_RX_OFFLOAD_CHECKSUM (RTE_ETH_RX_OFFLOAD_IPV4_CKSUM | \ RTE_ETH_RX_OFFLOAD_UDP_CKSUM | \ RTE_ETH_RX_OFFLOAD_TCP_CKSUM) -#define DEV_RX_OFFLOAD_CHECKSUM RTE_DEPRECATED(DEV_RX_OFFLOAD_CHECKSUM) RTE_ETH_RX_OFFLOAD_CHECKSUM #define RTE_ETH_RX_OFFLOAD_VLAN (RTE_ETH_RX_OFFLOAD_VLAN_STRIP | \ RTE_ETH_RX_OFFLOAD_VLAN_FILTER | \ RTE_ETH_RX_OFFLOAD_VLAN_EXTEND | \ RTE_ETH_RX_OFFLOAD_QINQ_STRIP) -#define DEV_RX_OFFLOAD_VLAN RTE_DEPRECATED(DEV_RX_OFFLOAD_VLAN) RTE_ETH_RX_OFFLOAD_VLAN /* * If new Rx offload capabilities are defined, they also must be @@ -1581,29 +1560,6 @@ struct rte_eth_conf { * mentioned in rte_tx_offload_names in rte_ethdev.c file. */ -#define DEV_TX_OFFLOAD_VLAN_INSERT RTE_DEPRECATED(DEV_TX_OFFLOAD_VLAN_INSERT) RTE_ETH_TX_OFFLOAD_VLAN_INSERT -#define DEV_TX_OFFLOAD_IPV4_CKSUM RTE_DEPRECATED(DEV_TX_OFFLOAD_IPV4_CKSUM) RTE_ETH_TX_OFFLOAD_IPV4_CKSUM -#define DEV_TX_OFFLOAD_UDP_CKSUM RTE_DEPRECATED(DEV_TX_OFFLOAD_UDP_CKSUM) RTE_ETH_TX_OFFLOAD_UDP_CKSUM -#define DEV_TX_OFFLOAD_TCP_CKSUM RTE_DEPRECATED(DEV_TX_OFFLOAD_TCP_CKSUM) RTE_ETH_TX_OFFLOAD_TCP_CKSUM -#define DEV_TX_OFFLOAD_SCTP_CKSUM RTE_DEPRECATED(DEV_TX_OFFLOAD_SCTP_CKSUM) RTE_ETH_TX_OFFLOAD_SCTP_CKSUM -#define DEV_TX_OFFLOAD_TCP_TSO RTE_DEPRECATED(DEV_TX_OFFLOAD_TCP_TSO) RTE_ETH_TX_OFFLOAD_TCP_TSO -#define DEV_TX_OFFLOAD_UDP_TSO RTE_DEPRECATED(DEV_TX_OFFLOAD_UDP_TSO) RTE_ETH_TX_OFFLOAD_UDP_TSO -#define DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM RTE_DEPRECATED(DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM) RTE_ETH_TX_OFFLOAD_OUTER_IPV4_CKSUM -#define DEV_TX_OFFLOAD_QINQ_INSERT RTE_DEPRECATED(DEV_TX_OFFLOAD_QINQ_INSERT) RTE_ETH_TX_OFFLOAD_QINQ_INSERT -#define DEV_TX_OFFLOAD_VXLAN_TNL_TSO RTE_DEPRECATED(DEV_TX_OFFLOAD_VXLAN_TNL_TSO) RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO -#define DEV_TX_OFFLOAD_GRE_TNL_TSO RTE_DEPRECATED(DEV_TX_OFFLOAD_GRE_TNL_TSO) RTE_ETH_TX_OFFLOAD_GRE_TNL_TSO -#define DEV_TX_OFFLOAD_IPIP_TNL_TSO RTE_DEPRECATED(DEV_TX_OFFLOAD_IPIP_TNL_TSO) RTE_ETH_TX_OFFLOAD_IPIP_TNL_TSO -#define DEV_TX_OFFLOAD_GENEVE_TNL_TSO RTE_DEPRECATED(DEV_TX_OFFLOAD_GENEVE_TNL_TSO) RTE_ETH_TX_OFFLOAD_GENEVE_TNL_TSO -#define DEV_TX_OFFLOAD_MACSEC_INSERT RTE_DEPRECATED(DEV_TX_OFFLOAD_MACSEC_INSERT) RTE_ETH_TX_OFFLOAD_MACSEC_INSERT -#define DEV_TX_OFFLOAD_MT_LOCKFREE RTE_DEPRECATED(DEV_TX_OFFLOAD_MT_LOCKFREE) RTE_ETH_TX_OFFLOAD_MT_LOCKFREE -#define DEV_TX_OFFLOAD_MULTI_SEGS RTE_DEPRECATED(DEV_TX_OFFLOAD_MULTI_SEGS) RTE_ETH_TX_OFFLOAD_MULTI_SEGS -#define DEV_TX_OFFLOAD_MBUF_FAST_FREE RTE_DEPRECATED(DEV_TX_OFFLOAD_MBUF_FAST_FREE) RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE -#define DEV_TX_OFFLOAD_SECURITY RTE_DEPRECATED(DEV_TX_OFFLOAD_SECURITY) RTE_ETH_TX_OFFLOAD_SECURITY -#define DEV_TX_OFFLOAD_UDP_TNL_TSO RTE_DEPRECATED(DEV_TX_OFFLOAD_UDP_TNL_TSO) RTE_ETH_TX_OFFLOAD_UDP_TNL_TSO -#define DEV_TX_OFFLOAD_IP_TNL_TSO RTE_DEPRECATED(DEV_TX_OFFLOAD_IP_TNL_TSO) RTE_ETH_TX_OFFLOAD_IP_TNL_TSO -#define DEV_TX_OFFLOAD_OUTER_UDP_CKSUM RTE_DEPRECATED(DEV_TX_OFFLOAD_OUTER_UDP_CKSUM) RTE_ETH_TX_OFFLOAD_OUTER_UDP_CKSUM -#define DEV_TX_OFFLOAD_SEND_ON_TIMESTAMP RTE_DEPRECATED(DEV_TX_OFFLOAD_SEND_ON_TIMESTAMP) RTE_ETH_TX_OFFLOAD_SEND_ON_TIMESTAMP - /**@{@name Device capabilities * Non-offload capabilities reported in rte_eth_dev_info.dev_capa. */ -- 2.30.2
Remove deprecated ``ETH_DCB_*``, ``ETH_VMDQ_``, ``ETH_*_TCS``, ``ETH_*_POOLS`` and ``ETH_MAX_VMDQ_POOL`` defines. Use corresponding defines with ``RTE_`` prefix instead. Signed-off-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru> --- doc/guides/rel_notes/release_22_11.rst | 4 ++++ lib/ethdev/rte_ethdev.h | 24 ------------------------ 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/doc/guides/rel_notes/release_22_11.rst b/doc/guides/rel_notes/release_22_11.rst index 0bed31cbaa..a2e3097d61 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -99,6 +99,10 @@ API Changes defines. Use corresponding defines with ``RTE_ETH_RX_OFFLOAD_`` and ``RTE_ETH_TX_OFFLOAD_`` prefix instead. +* ethdev: Removed deprecated ``ETH_DCB_*``, ``ETH_VMDQ_``, ``ETH_*_TCS``, + ``ETH_*_POOLS`` and ``ETH_MAX_VMDQ_POOL`` defines. Use corresponding + defines with ``RTE_`` prefix instead. + ABI Changes ----------- diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h index 3552535780..029582837c 100644 --- a/lib/ethdev/rte_ethdev.h +++ b/lib/ethdev/rte_ethdev.h @@ -810,19 +810,11 @@ rte_eth_rss_hf_refine(uint64_t rss_hf) #define RTE_ETH_DCB_NUM_QUEUES 128 /**< Maximum nb. of DCB queues. */ /**@}*/ -#define ETH_VMDQ_MAX_VLAN_FILTERS RTE_DEPRECATED(ETH_VMDQ_MAX_VLAN_FILTERS) RTE_ETH_VMDQ_MAX_VLAN_FILTERS -#define ETH_DCB_NUM_USER_PRIORITIES RTE_DEPRECATED(ETH_DCB_NUM_USER_PRIORITIES) RTE_ETH_DCB_NUM_USER_PRIORITIES -#define ETH_VMDQ_DCB_NUM_QUEUES RTE_DEPRECATED(ETH_VMDQ_DCB_NUM_QUEUES) RTE_ETH_VMDQ_DCB_NUM_QUEUES -#define ETH_DCB_NUM_QUEUES RTE_DEPRECATED(ETH_DCB_NUM_QUEUES) RTE_ETH_DCB_NUM_QUEUES - /**@{@name DCB capabilities */ #define RTE_ETH_DCB_PG_SUPPORT RTE_BIT32(0) /**< Priority Group(ETS) support. */ #define RTE_ETH_DCB_PFC_SUPPORT RTE_BIT32(1) /**< Priority Flow Control support. */ /**@}*/ -#define ETH_DCB_PG_SUPPORT RTE_DEPRECATED(ETH_DCB_PG_SUPPORT) RTE_ETH_DCB_PG_SUPPORT -#define ETH_DCB_PFC_SUPPORT RTE_DEPRECATED(ETH_DCB_PFC_SUPPORT) RTE_ETH_DCB_PFC_SUPPORT - /**@{@name VLAN offload bits */ #define RTE_ETH_VLAN_STRIP_OFFLOAD 0x0001 /**< VLAN Strip On/Off */ #define RTE_ETH_VLAN_FILTER_OFFLOAD 0x0002 /**< VLAN Filter On/Off */ @@ -853,7 +845,6 @@ rte_eth_rss_hf_refine(uint64_t rss_hf) /* Definitions used for unicast hash */ #define RTE_ETH_VMDQ_NUM_UC_HASH_ARRAY 128 /**< Maximum nb. of UC hash array. */ -#define ETH_VMDQ_NUM_UC_HASH_ARRAY RTE_DEPRECATED(ETH_VMDQ_NUM_UC_HASH_ARRAY) RTE_ETH_VMDQ_NUM_UC_HASH_ARRAY /**@{@name VMDq Rx mode * @see rte_eth_vmdq_rx_conf.rx_mode @@ -870,12 +861,6 @@ rte_eth_rss_hf_refine(uint64_t rss_hf) #define RTE_ETH_VMDQ_ACCEPT_MULTICAST RTE_BIT32(4) /**@}*/ -#define ETH_VMDQ_ACCEPT_UNTAG RTE_DEPRECATED(ETH_VMDQ_ACCEPT_UNTAG) RTE_ETH_VMDQ_ACCEPT_UNTAG -#define ETH_VMDQ_ACCEPT_HASH_MC RTE_DEPRECATED(ETH_VMDQ_ACCEPT_HASH_MC) RTE_ETH_VMDQ_ACCEPT_HASH_MC -#define ETH_VMDQ_ACCEPT_HASH_UC RTE_DEPRECATED(ETH_VMDQ_ACCEPT_HASH_UC) RTE_ETH_VMDQ_ACCEPT_HASH_UC -#define ETH_VMDQ_ACCEPT_BROADCAST RTE_DEPRECATED(ETH_VMDQ_ACCEPT_BROADCAST) RTE_ETH_VMDQ_ACCEPT_BROADCAST -#define ETH_VMDQ_ACCEPT_MULTICAST RTE_DEPRECATED(ETH_VMDQ_ACCEPT_MULTICAST) RTE_ETH_VMDQ_ACCEPT_MULTICAST - /** * A structure used to configure 64 entries of Redirection Table of the * Receive Side Scaling (RSS) feature of an Ethernet port. To configure @@ -897,8 +882,6 @@ enum rte_eth_nb_tcs { RTE_ETH_4_TCS = 4, /**< 4 TCs with DCB. */ RTE_ETH_8_TCS = 8 /**< 8 TCs with DCB. */ }; -#define ETH_4_TCS RTE_DEPRECATED(ETH_4_TCS) RTE_ETH_4_TCS -#define ETH_8_TCS RTE_DEPRECATED(ETH_8_TCS) RTE_ETH_8_TCS /** * This enum indicates the possible number of queue pools @@ -910,10 +893,6 @@ enum rte_eth_nb_pools { RTE_ETH_32_POOLS = 32, /**< 32 VMDq pools. */ RTE_ETH_64_POOLS = 64 /**< 64 VMDq pools. */ }; -#define ETH_8_POOLS RTE_DEPRECATED(ETH_8_POOLS) RTE_ETH_8_POOLS -#define ETH_16_POOLS RTE_DEPRECATED(ETH_16_POOLS) RTE_ETH_16_POOLS -#define ETH_32_POOLS RTE_DEPRECATED(ETH_32_POOLS) RTE_ETH_32_POOLS -#define ETH_64_POOLS RTE_DEPRECATED(ETH_64_POOLS) RTE_ETH_64_POOLS /* This structure may be extended in future. */ struct rte_eth_dcb_rx_conf { @@ -1820,9 +1799,6 @@ struct rte_eth_xstat_name { #define RTE_ETH_DCB_NUM_TCS 8 #define RTE_ETH_MAX_VMDQ_POOL 64 -#define ETH_DCB_NUM_TCS RTE_DEPRECATED(ETH_DCB_NUM_TCS) RTE_ETH_DCB_NUM_TCS -#define ETH_MAX_VMDQ_POOL RTE_DEPRECATED(ETH_MAX_VMDQ_POOL) RTE_ETH_MAX_VMDQ_POOL - /** * A structure used to get the information of queue and * TC mapping on both Tx and Rx paths. -- 2.30.2
Remove deprecated ``RTE_TUNNEL_*`` defines. Use corresponding defines with ``RTE_ETH_TUNNEL_`` prefix instead. Signed-off-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru> --- doc/guides/rel_notes/release_22_11.rst | 3 +++ lib/ethdev/rte_ethdev.h | 10 ---------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/doc/guides/rel_notes/release_22_11.rst b/doc/guides/rel_notes/release_22_11.rst index a2e3097d61..ca9a38e53c 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -103,6 +103,9 @@ API Changes ``ETH_*_POOLS`` and ``ETH_MAX_VMDQ_POOL`` defines. Use corresponding defines with ``RTE_`` prefix instead. +* ethdev: Removed deprecated ``RTE_TUNNEL_*`` defines. Use corresponding + defines with ``RTE_ETH_TUNNEL_`` prefix instead. + ABI Changes ----------- diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h index 029582837c..da050ad7f7 100644 --- a/lib/ethdev/rte_ethdev.h +++ b/lib/ethdev/rte_ethdev.h @@ -1314,16 +1314,6 @@ enum rte_eth_tunnel_type { RTE_ETH_TUNNEL_TYPE_ECPRI, RTE_ETH_TUNNEL_TYPE_MAX, }; -#define RTE_TUNNEL_TYPE_NONE RTE_DEPRECATED(RTE_TUNNEL_TYPE_NONE) RTE_ETH_TUNNEL_TYPE_NONE -#define RTE_TUNNEL_TYPE_VXLAN RTE_DEPRECATED(RTE_TUNNEL_TYPE_VXLAN) RTE_ETH_TUNNEL_TYPE_VXLAN -#define RTE_TUNNEL_TYPE_GENEVE RTE_DEPRECATED(RTE_TUNNEL_TYPE_GENEVE) RTE_ETH_TUNNEL_TYPE_GENEVE -#define RTE_TUNNEL_TYPE_TEREDO RTE_DEPRECATED(RTE_TUNNEL_TYPE_TEREDO) RTE_ETH_TUNNEL_TYPE_TEREDO -#define RTE_TUNNEL_TYPE_NVGRE RTE_DEPRECATED(RTE_TUNNEL_TYPE_NVGRE) RTE_ETH_TUNNEL_TYPE_NVGRE -#define RTE_TUNNEL_TYPE_IP_IN_GRE RTE_DEPRECATED(RTE_TUNNEL_TYPE_IP_IN_GRE) RTE_ETH_TUNNEL_TYPE_IP_IN_GRE -#define RTE_L2_TUNNEL_TYPE_E_TAG RTE_DEPRECATED(RTE_L2_TUNNEL_TYPE_E_TAG) RTE_ETH_L2_TUNNEL_TYPE_E_TAG -#define RTE_TUNNEL_TYPE_VXLAN_GPE RTE_DEPRECATED(RTE_TUNNEL_TYPE_VXLAN_GPE) RTE_ETH_TUNNEL_TYPE_VXLAN_GPE -#define RTE_TUNNEL_TYPE_ECPRI RTE_DEPRECATED(RTE_TUNNEL_TYPE_ECPRI) RTE_ETH_TUNNEL_TYPE_ECPRI -#define RTE_TUNNEL_TYPE_MAX RTE_DEPRECATED(RTE_TUNNEL_TYPE_MAX) RTE_ETH_TUNNEL_TYPE_MAX /* Deprecated API file for rte_eth_dev_filter_* functions */ #include "rte_eth_ctrl.h" -- 2.30.2
Remove deprecated ``RTE_FC_*`` defines. Use corresponding defines with ``RTE_ETH_FC_`` prefix instead. Signed-off-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru> --- doc/guides/rel_notes/release_22_11.rst | 3 +++ lib/ethdev/rte_ethdev.h | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/doc/guides/rel_notes/release_22_11.rst b/doc/guides/rel_notes/release_22_11.rst index ca9a38e53c..3cb306f185 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -106,6 +106,9 @@ API Changes * ethdev: Removed deprecated ``RTE_TUNNEL_*`` defines. Use corresponding defines with ``RTE_ETH_TUNNEL_`` prefix instead. +* ethdev: Removed deprecated ``RTE_FC_*`` defines. Use corresponding + defines with ``RTE_ETH_FC_`` prefix instead. + ABI Changes ----------- diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h index da050ad7f7..27a9fa83d2 100644 --- a/lib/ethdev/rte_ethdev.h +++ b/lib/ethdev/rte_ethdev.h @@ -1215,10 +1215,6 @@ enum rte_eth_fc_mode { RTE_ETH_FC_TX_PAUSE, /**< Tx pause frame, enable flowctrl on Rx side. */ RTE_ETH_FC_FULL /**< Enable flow control on both side. */ }; -#define RTE_FC_NONE RTE_DEPRECATED(RTE_FC_NONE) RTE_ETH_FC_NONE -#define RTE_FC_RX_PAUSE RTE_DEPRECATED(RTE_FC_RX_PAUSE) RTE_ETH_FC_RX_PAUSE -#define RTE_FC_TX_PAUSE RTE_DEPRECATED(RTE_FC_TX_PAUSE) RTE_ETH_FC_TX_PAUSE -#define RTE_FC_FULL RTE_DEPRECATED(RTE_FC_FULL) RTE_ETH_FC_FULL /** * A structure used to configure Ethernet flow control parameter. -- 2.30.2
Remove deprecated ``ETH_VLAN_*`` and ``ETH_QINQ_`` defines. Use corresponding defines with ``RTE_`` prefix instead. Signed-off-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru> --- doc/guides/rel_notes/release_22_11.rst | 3 +++ lib/ethdev/rte_ethdev.h | 16 ---------------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/doc/guides/rel_notes/release_22_11.rst b/doc/guides/rel_notes/release_22_11.rst index 3cb306f185..3c8aa2f4f6 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -109,6 +109,9 @@ API Changes * ethdev: Removed deprecated ``RTE_FC_*`` defines. Use corresponding defines with ``RTE_ETH_FC_`` prefix instead. +* ethdev: Removed deprecated ``ETH_VLAN_*`` and ``ETH_QINQ_`` defines. + Use corresponding defines with ``RTE_`` prefix instead. + ABI Changes ----------- diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h index 27a9fa83d2..77d6d8966d 100644 --- a/lib/ethdev/rte_ethdev.h +++ b/lib/ethdev/rte_ethdev.h @@ -435,11 +435,6 @@ enum rte_vlan_type { RTE_ETH_VLAN_TYPE_MAX, }; -#define ETH_VLAN_TYPE_UNKNOWN RTE_DEPRECATED(ETH_VLAN_TYPE_UNKNOWN) RTE_ETH_VLAN_TYPE_UNKNOWN -#define ETH_VLAN_TYPE_INNER RTE_DEPRECATED(ETH_VLAN_TYPE_INNER) RTE_ETH_VLAN_TYPE_INNER -#define ETH_VLAN_TYPE_OUTER RTE_DEPRECATED(ETH_VLAN_TYPE_OUTER) RTE_ETH_VLAN_TYPE_OUTER -#define ETH_VLAN_TYPE_MAX RTE_DEPRECATED(ETH_VLAN_TYPE_MAX) RTE_ETH_VLAN_TYPE_MAX - /** * A structure used to describe a VLAN filter. * If the bit corresponding to a VID is set, such VID is on. @@ -821,11 +816,6 @@ rte_eth_rss_hf_refine(uint64_t rss_hf) #define RTE_ETH_VLAN_EXTEND_OFFLOAD 0x0004 /**< VLAN Extend On/Off */ #define RTE_ETH_QINQ_STRIP_OFFLOAD 0x0008 /**< QINQ Strip On/Off */ -#define ETH_VLAN_STRIP_OFFLOAD RTE_DEPRECATED(ETH_VLAN_STRIP_OFFLOAD) RTE_ETH_VLAN_STRIP_OFFLOAD -#define ETH_VLAN_FILTER_OFFLOAD RTE_DEPRECATED(ETH_VLAN_FILTER_OFFLOAD) RTE_ETH_VLAN_FILTER_OFFLOAD -#define ETH_VLAN_EXTEND_OFFLOAD RTE_DEPRECATED(ETH_VLAN_EXTEND_OFFLOAD) RTE_ETH_VLAN_EXTEND_OFFLOAD -#define ETH_QINQ_STRIP_OFFLOAD RTE_DEPRECATED(ETH_QINQ_STRIP_OFFLOAD) RTE_ETH_QINQ_STRIP_OFFLOAD - #define RTE_ETH_VLAN_STRIP_MASK 0x0001 /**< VLAN Strip setting mask */ #define RTE_ETH_VLAN_FILTER_MASK 0x0002 /**< VLAN Filter setting mask*/ #define RTE_ETH_VLAN_EXTEND_MASK 0x0004 /**< VLAN Extend setting mask*/ @@ -833,12 +823,6 @@ rte_eth_rss_hf_refine(uint64_t rss_hf) #define RTE_ETH_VLAN_ID_MAX 0x0FFF /**< VLAN ID is in lower 12 bits*/ /**@}*/ -#define ETH_VLAN_STRIP_MASK RTE_DEPRECATED(ETH_VLAN_STRIP_MASK) RTE_ETH_VLAN_STRIP_MASK -#define ETH_VLAN_FILTER_MASK RTE_DEPRECATED(ETH_VLAN_FILTER_MASK) RTE_ETH_VLAN_FILTER_MASK -#define ETH_VLAN_EXTEND_MASK RTE_DEPRECATED(ETH_VLAN_EXTEND_MASK) RTE_ETH_VLAN_EXTEND_MASK -#define ETH_QINQ_STRIP_MASK RTE_DEPRECATED(ETH_QINQ_STRIP_MASK) RTE_ETH_QINQ_STRIP_MASK -#define ETH_VLAN_ID_MAX RTE_DEPRECATED(ETH_VLAN_ID_MAX) RTE_ETH_VLAN_ID_MAX - /* Definitions used for receive MAC address */ #define RTE_ETH_NUM_RECEIVE_MAC_ADDR 128 /**< Maximum nb. of receive mac addr. */ #define ETH_NUM_RECEIVE_MAC_ADDR RTE_DEPRECATED(ETH_NUM_RECEIVE_MAC_ADDR) RTE_ETH_NUM_RECEIVE_MAC_ADDR -- 2.30.2
Remove deprecated ``ETH_NUM_RECEIVE_MAC_ADDR`` define. Use corresponding define with ``RTE_`` prefix instead. Signed-off-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru> --- doc/guides/rel_notes/release_22_11.rst | 3 +++ lib/ethdev/rte_ethdev.h | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/guides/rel_notes/release_22_11.rst b/doc/guides/rel_notes/release_22_11.rst index 3c8aa2f4f6..81bfa2f34e 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -112,6 +112,9 @@ API Changes * ethdev: Removed deprecated ``ETH_VLAN_*`` and ``ETH_QINQ_`` defines. Use corresponding defines with ``RTE_`` prefix instead. +* ethdev: Removed deprecated ``ETH_NUM_RECEIVE_MAC_ADDR`` define. + Use corresponding define with ``RTE_`` prefix instead. + ABI Changes ----------- diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h index 77d6d8966d..39ede6804c 100644 --- a/lib/ethdev/rte_ethdev.h +++ b/lib/ethdev/rte_ethdev.h @@ -825,7 +825,6 @@ rte_eth_rss_hf_refine(uint64_t rss_hf) /* Definitions used for receive MAC address */ #define RTE_ETH_NUM_RECEIVE_MAC_ADDR 128 /**< Maximum nb. of receive mac addr. */ -#define ETH_NUM_RECEIVE_MAC_ADDR RTE_DEPRECATED(ETH_NUM_RECEIVE_MAC_ADDR) RTE_ETH_NUM_RECEIVE_MAC_ADDR /* Definitions used for unicast hash */ #define RTE_ETH_VMDQ_NUM_UC_HASH_ARRAY 128 /**< Maximum nb. of UC hash array. */ -- 2.30.2
Remove deprecated ``PKT_{R,T}X_DYNF_METADATA`` defines. Use corresponding defines ``RTE_MBUF_DYNFLAG_{R,T}X_METADATA`` instead. Signed-off-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru> --- doc/guides/rel_notes/release_22_11.rst | 3 +++ lib/ethdev/rte_flow.h | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/doc/guides/rel_notes/release_22_11.rst b/doc/guides/rel_notes/release_22_11.rst index 81bfa2f34e..6c444f89a5 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -115,6 +115,9 @@ API Changes * ethdev: Removed deprecated ``ETH_NUM_RECEIVE_MAC_ADDR`` define. Use corresponding define with ``RTE_`` prefix instead. +* ethdev: Removed deprecated ``PKT_{R,T}X_DYNF_METADATA`` defines. + Use corresponding defines ``RTE_MBUF_DYNFLAG_{R,T}X_METADATA`` instead. + ABI Changes ----------- diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h index a79f1e7ef0..017f690798 100644 --- a/lib/ethdev/rte_flow.h +++ b/lib/ethdev/rte_flow.h @@ -3761,11 +3761,7 @@ extern uint64_t rte_flow_dynf_metadata_mask; /* Mbuf dynamic flags for metadata. */ #define RTE_MBUF_DYNFLAG_RX_METADATA (rte_flow_dynf_metadata_mask) -#define PKT_RX_DYNF_METADATA RTE_DEPRECATED(PKT_RX_DYNF_METADATA) \ - RTE_MBUF_DYNFLAG_RX_METADATA #define RTE_MBUF_DYNFLAG_TX_METADATA (rte_flow_dynf_metadata_mask) -#define PKT_TX_DYNF_METADATA RTE_DEPRECATED(PKT_TX_DYNF_METADATA) \ - RTE_MBUF_DYNFLAG_TX_METADATA __rte_experimental static inline uint32_t -- 2.30.2
On Thu, 4 Aug 2022 22:05:52 +0300
Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru> wrote:
> Remove deprecated because of invalid namespace defines.
>
> Andrew Rybchenko (10):
> ethdev: remove deprecated link speed and duplex defines
> ethdev: remove deprecated Rx and Tx multi-queue mode defines
> ethdev: remove deprecated defines for RSS configuration
> ethdev: remove deprecated Rx and Tx offload defines
> ethdev: remove deprecated DCB and VMDq defines
> ethdev: remove deprecated tunnel type defines
> ethdev: remove deprecated flow control defines
> ethdev: remove deprecated VLAN offload configuration defines
> ethdev: remove deprecated maximum Rx MAC addresses define
> ethdev: remove deprecated metadata dynamic fields defines
>
> doc/guides/rel_notes/release_22_11.rst | 34 ++++
> lib/ethdev/rte_ethdev.h | 242 -------------------------
> lib/ethdev/rte_flow.h | 4 -
> 3 files changed, 34 insertions(+), 246 deletions(-)
>
Looks good. I assume the flow director (FDIR) defines should also
go away in this release when it is removed.
Series-Acked-by: Stephen Hemminger <stephen@networkplumber.org>
On 8/4/22 22:29, Stephen Hemminger wrote: > On Thu, 4 Aug 2022 22:05:52 +0300 > Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru> wrote: > >> Remove deprecated because of invalid namespace defines. >> >> Andrew Rybchenko (10): >> ethdev: remove deprecated link speed and duplex defines >> ethdev: remove deprecated Rx and Tx multi-queue mode defines >> ethdev: remove deprecated defines for RSS configuration >> ethdev: remove deprecated Rx and Tx offload defines >> ethdev: remove deprecated DCB and VMDq defines >> ethdev: remove deprecated tunnel type defines >> ethdev: remove deprecated flow control defines >> ethdev: remove deprecated VLAN offload configuration defines >> ethdev: remove deprecated maximum Rx MAC addresses define >> ethdev: remove deprecated metadata dynamic fields defines >> >> doc/guides/rel_notes/release_22_11.rst | 34 ++++ >> lib/ethdev/rte_ethdev.h | 242 ------------------------- >> lib/ethdev/rte_flow.h | 4 - >> 3 files changed, 34 insertions(+), 246 deletions(-) >> > > > Looks good. I assume the flow director (FDIR) defines should also > go away in this release when it is removed. Yes, I wanted but simply forgot to mention it in the cover letter. FDIR defines are covered by fdir cleanup patch series [1]. I decided that it does not deserve separate patch. [1] https://patches.dpdk.org/project/dpdk/patch/20220803111358.375544-4-andrew.rybchenko@oktetlabs.ru/ > > Series-Acked-by: Stephen Hemminger <stephen@networkplumber.org> Thanks for the review, Stephen.
On Thu, Aug 4, 2022 at 9:06 PM Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru> wrote: > > Remove deprecated ``ETH_RSS_*`` defines used for hash function and RETA > size specification. Use corresponding defines with ``RTE_`` prefix > instead. Nit: we still have some reference in comments in the publicly exposed header: HEAD~7:lib/ethdev/rte_ethdev.h: * The ETH_RSS_L4_CHKSUM works on checksum field of any L4 header. HEAD~7:lib/ethdev/rte_ethdev.h: * It is similar to ETH_RSS_PORT that they don't specify the specific type of > > Signed-off-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru> -- David Marchand
On Thu, Aug 4, 2022 at 9:06 PM Andrew Rybchenko
<andrew.rybchenko@oktetlabs.ru> wrote:
>
> Remove deprecated ``ETH_DCB_*``, ``ETH_VMDQ_``, ``ETH_*_TCS``,
> ``ETH_*_POOLS`` and ``ETH_MAX_VMDQ_POOL`` defines. Use corresponding
> defines with ``RTE_`` prefix instead.
>
> Signed-off-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
Nit: we still have some reference in comments in the publicly exposed header:
HEAD~5:lib/ethdev/rte_ethdev.h: uint32_t rx_mode; /**< Flags from
ETH_VMDQ_ACCEPT_* */
--
David Marchand
On Thu, Aug 4, 2022 at 9:06 PM Andrew Rybchenko
<andrew.rybchenko@oktetlabs.ru> wrote:
>
> Remove deprecated ``RTE_TUNNEL_*`` defines. Use corresponding defines
> with ``RTE_ETH_TUNNEL_`` prefix instead.
>
> Signed-off-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
We have some private RTE_TUNNEL_IPTYPE_* defines.
HEAD~4:lib/ethdev/ethdev_driver.h: RTE_TUNNEL_IPTYPE_IPV4 = 0, /**< IPv4 */
HEAD~4:lib/ethdev/ethdev_driver.h: RTE_TUNNEL_IPTYPE_IPV6, /**< IPv6 */
Those defines and the associated rte_tunnel_iptype type look strange to me.
Do you know what this is about and if this requires a followup cleanup?
--
David Marchand
On Thu, Aug 4, 2022 at 9:06 PM Andrew Rybchenko
<andrew.rybchenko@oktetlabs.ru> wrote:
>
> Remove deprecated because of invalid namespace defines.
>
> Andrew Rybchenko (10):
> ethdev: remove deprecated link speed and duplex defines
> ethdev: remove deprecated Rx and Tx multi-queue mode defines
> ethdev: remove deprecated defines for RSS configuration
> ethdev: remove deprecated Rx and Tx offload defines
> ethdev: remove deprecated DCB and VMDq defines
> ethdev: remove deprecated tunnel type defines
> ethdev: remove deprecated flow control defines
> ethdev: remove deprecated VLAN offload configuration defines
> ethdev: remove deprecated maximum Rx MAC addresses define
> ethdev: remove deprecated metadata dynamic fields defines
>
Same comment as for the mbuf flags patch, we have a cocci script to do
the migration to the "new" API: devtools/cocci/namespace_ethdev.cocci
We can reference it in the release notes.
I suspect the RN will grow quite big for 22.11.
Can we perhaps have a single entry for ethdev, listing all the
different defines in a sublist?
(and looking again at the other cleanups, this last comment applies to
the mempool series too).
I sent some comments, but otherwise, the series lgtm and you can add my ack.
Thanks Andrew!
--
David Marchand
On 8/23/2022 9:41 AM, David Marchand wrote: > CAUTION: This message has originated from an External Source. Please use proper judgment and caution when opening attachments, clicking links, or responding to this email. > > > On Thu, Aug 4, 2022 at 9:06 PM Andrew Rybchenko > <andrew.rybchenko@oktetlabs.ru> wrote: >> >> Remove deprecated ``ETH_RSS_*`` defines used for hash function and RETA >> size specification. Use corresponding defines with ``RTE_`` prefix >> instead. > > Nit: we still have some reference in comments in the publicly exposed header: > > HEAD~7:lib/ethdev/rte_ethdev.h: * The ETH_RSS_L4_CHKSUM works on > checksum field of any L4 header. > HEAD~7:lib/ethdev/rte_ethdev.h: * It is similar to ETH_RSS_PORT that > they don't specify the specific type of > Will fix while merging. >> >> Signed-off-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru> > > > -- > David Marchand >
On 8/23/2022 9:41 AM, David Marchand wrote: > CAUTION: This message has originated from an External Source. Please use proper judgment and caution when opening attachments, clicking links, or responding to this email. > > > On Thu, Aug 4, 2022 at 9:06 PM Andrew Rybchenko > <andrew.rybchenko@oktetlabs.ru> wrote: >> >> Remove deprecated ``ETH_DCB_*``, ``ETH_VMDQ_``, ``ETH_*_TCS``, >> ``ETH_*_POOLS`` and ``ETH_MAX_VMDQ_POOL`` defines. Use corresponding >> defines with ``RTE_`` prefix instead. >> >> Signed-off-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru> > > Nit: we still have some reference in comments in the publicly exposed header: > > HEAD~5:lib/ethdev/rte_ethdev.h: uint32_t rx_mode; /**< Flags from > ETH_VMDQ_ACCEPT_* */ > Will fix while merging. > > -- > David Marchand >
On 8/23/2022 9:41 AM, David Marchand wrote: > On Thu, Aug 4, 2022 at 9:06 PM Andrew Rybchenko > <andrew.rybchenko@oktetlabs.ru> wrote: >> >> Remove deprecated because of invalid namespace defines. >> >> Andrew Rybchenko (10): >> ethdev: remove deprecated link speed and duplex defines >> ethdev: remove deprecated Rx and Tx multi-queue mode defines >> ethdev: remove deprecated defines for RSS configuration >> ethdev: remove deprecated Rx and Tx offload defines >> ethdev: remove deprecated DCB and VMDq defines >> ethdev: remove deprecated tunnel type defines >> ethdev: remove deprecated flow control defines >> ethdev: remove deprecated VLAN offload configuration defines >> ethdev: remove deprecated maximum Rx MAC addresses define >> ethdev: remove deprecated metadata dynamic fields defines >> > > Same comment as for the mbuf flags patch, we have a cocci script to do > the migration to the "new" API: devtools/cocci/namespace_ethdev.cocci > We can reference it in the release notes. > Agreed. I will group release notes updates while merging. And note 'devtools/cocci/namespace_ethdev.cocci'. > I suspect the RN will grow quite big for 22.11. > Can we perhaps have a single entry for ethdev, listing all the > different defines in a sublist? I am also not sure about benefit of the multiple commits, I will keep as it is since it is already split. But maybe can be squashed while pulling from next-net. > (and looking again at the other cleanups, this last comment applies to > the mempool series too). > > > I sent some comments, but otherwise, the series lgtm and you can add my ack. Adding your explicit ack while merging: Acked-by: David Marchand <david.marchand@redhat.com> For series, Acked-by: Ferruh Yigit <ferruh.yigit@xilinx.com> Series applied to dpdk-next-net/main, thanks.
On Tue, Aug 23, 2022 at 8:08 PM Ferruh Yigit <ferruh.yigit@xilinx.com> wrote:
> Adding your explicit ack while merging:
> Acked-by: David Marchand <david.marchand@redhat.com>
>
> For series,
> Acked-by: Ferruh Yigit <ferruh.yigit@xilinx.com>
>
> Series applied to dpdk-next-net/main, thanks.
>
Thanks for the tweaks while merging.
Btw, Stephen also acked the series.
--
David Marchand
On 8/24/2022 7:46 AM, David Marchand wrote:
> On Tue, Aug 23, 2022 at 8:08 PM Ferruh Yigit <ferruh.yigit@xilinx.com> wrote:
>> Adding your explicit ack while merging:
>> Acked-by: David Marchand <david.marchand@redhat.com>
>>
>> For series,
>> Acked-by: Ferruh Yigit <ferruh.yigit@xilinx.com>
>>
>> Series applied to dpdk-next-net/main, thanks.
>>
>
> Thanks for the tweaks while merging.
> Btw, Stephen also acked the series.
>
Missed that, will add in the repo, thanks.