* [dpdk-dev] [RFC] ethdev: mark old ETH_LINK macros as deprecated
@ 2021-10-29 21:47 Stephen Hemminger
2021-11-01 12:30 ` Ferruh Yigit
2021-11-02 23:44 ` [dpdk-dev] [PATCH] ethdev: mark old " Ferruh Yigit
0 siblings, 2 replies; 21+ messages in thread
From: Stephen Hemminger @ 2021-10-29 21:47 UTC (permalink / raw)
To: ferruh.yigit; +Cc: dev, Stephen Hemminger
The new definitions should be favored and used by all new code.
Fixes: 295968d17407 ("ethdev: add namespace")
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
lib/ethdev/rte_ethdev.h | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h
index 24f30b4b2890..9709a944b752 100644
--- a/lib/ethdev/rte_ethdev.h
+++ b/lib/ethdev/rte_ethdev.h
@@ -367,17 +367,17 @@ struct rte_eth_link {
* Constants used in link management.
*/
#define RTE_ETH_LINK_HALF_DUPLEX 0 /**< Half-duplex connection (see link_duplex). */
-#define ETH_LINK_HALF_DUPLEX RTE_ETH_LINK_HALF_DUPLEX
+#define ETH_LINK_HALF_DUPLEX RTE_DEPRECATED(RTE_ETH_LINK_HALF_DUPLEX)
#define RTE_ETH_LINK_FULL_DUPLEX 1 /**< Full-duplex connection (see link_duplex). */
-#define ETH_LINK_FULL_DUPLEX RTE_ETH_LINK_FULL_DUPLEX
+#define ETH_LINK_FULL_DUPLEX RTE_DEPRECATED(RTE_ETH_LINK_FULL_DUPLEX)
#define RTE_ETH_LINK_DOWN 0 /**< Link is down (see link_status). */
-#define ETH_LINK_DOWN RTE_ETH_LINK_DOWN
+#define ETH_LINK_DOWN RTE_DEPRECATED(RTE_ETH_LINK_DOWN)
#define RTE_ETH_LINK_UP 1 /**< Link is up (see link_status). */
-#define ETH_LINK_UP RTE_ETH_LINK_UP
+#define ETH_LINK_UP RTE_DEPRECATED(RTE_ETH_LINK_UP)
#define RTE_ETH_LINK_FIXED 0 /**< No autonegotiation (see link_autoneg). */
-#define ETH_LINK_FIXED RTE_ETH_LINK_FIXED
+#define ETH_LINK_FIXED RTE_DEPRECATED(RTE_ETH_LINK_FIXED)
#define RTE_ETH_LINK_AUTONEG 1 /**< Autonegotiated (see link_autoneg). */
-#define ETH_LINK_AUTONEG RTE_ETH_LINK_AUTONEG
+#define ETH_LINK_AUTONEG RTE_DEPRECATED(RTE_ETH_LINK_AUTONEG)
#define RTE_ETH_LINK_MAX_STR_LEN 40 /**< Max length of default link string. */
/**@}*/
--
2.30.2
^ permalink raw reply [flat|nested] 21+ messages in thread* Re: [dpdk-dev] [RFC] ethdev: mark old ETH_LINK macros as deprecated 2021-10-29 21:47 [dpdk-dev] [RFC] ethdev: mark old ETH_LINK macros as deprecated Stephen Hemminger @ 2021-11-01 12:30 ` Ferruh Yigit 2021-11-02 23:44 ` [dpdk-dev] [PATCH] ethdev: mark old " Ferruh Yigit 1 sibling, 0 replies; 21+ messages in thread From: Ferruh Yigit @ 2021-11-01 12:30 UTC (permalink / raw) To: Stephen Hemminger, David Marchand, Thomas Monjalon, Andrew Rybchenko Cc: dev, Olivier Matz On 10/29/2021 10:47 PM, Stephen Hemminger wrote: > The new definitions should be favored and used by all new code. > > Fixes: 295968d17407 ("ethdev: add namespace") > Signed-off-by: Stephen Hemminger <stephen@networkplumber.org> > --- > lib/ethdev/rte_ethdev.h | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h > index 24f30b4b2890..9709a944b752 100644 > --- a/lib/ethdev/rte_ethdev.h > +++ b/lib/ethdev/rte_ethdev.h > @@ -367,17 +367,17 @@ struct rte_eth_link { > * Constants used in link management. > */ > #define RTE_ETH_LINK_HALF_DUPLEX 0 /**< Half-duplex connection (see link_duplex). */ > -#define ETH_LINK_HALF_DUPLEX RTE_ETH_LINK_HALF_DUPLEX > +#define ETH_LINK_HALF_DUPLEX RTE_DEPRECATED(RTE_ETH_LINK_HALF_DUPLEX) > #define RTE_ETH_LINK_FULL_DUPLEX 1 /**< Full-duplex connection (see link_duplex). */ > -#define ETH_LINK_FULL_DUPLEX RTE_ETH_LINK_FULL_DUPLEX > +#define ETH_LINK_FULL_DUPLEX RTE_DEPRECATED(RTE_ETH_LINK_FULL_DUPLEX) > #define RTE_ETH_LINK_DOWN 0 /**< Link is down (see link_status). */ > -#define ETH_LINK_DOWN RTE_ETH_LINK_DOWN > +#define ETH_LINK_DOWN RTE_DEPRECATED(RTE_ETH_LINK_DOWN) > #define RTE_ETH_LINK_UP 1 /**< Link is up (see link_status). */ > -#define ETH_LINK_UP RTE_ETH_LINK_UP > +#define ETH_LINK_UP RTE_DEPRECATED(RTE_ETH_LINK_UP) > #define RTE_ETH_LINK_FIXED 0 /**< No autonegotiation (see link_autoneg). */ > -#define ETH_LINK_FIXED RTE_ETH_LINK_FIXED > +#define ETH_LINK_FIXED RTE_DEPRECATED(RTE_ETH_LINK_FIXED) > #define RTE_ETH_LINK_AUTONEG 1 /**< Autonegotiated (see link_autoneg). */ > -#define ETH_LINK_AUTONEG RTE_ETH_LINK_AUTONEG > +#define ETH_LINK_AUTONEG RTE_DEPRECATED(RTE_ETH_LINK_AUTONEG) > #define RTE_ETH_LINK_MAX_STR_LEN 40 /**< Max length of default link string. */ > /**@}*/ > > This definitely prevents using old macros, btw there are bunch of them renamed in this release. My concern is if it cause too much noise, if we are OK with that I can send a patch that covers all renamed macros. ^ permalink raw reply [flat|nested] 21+ messages in thread
* [dpdk-dev] [PATCH] ethdev: mark old macros as deprecated 2021-10-29 21:47 [dpdk-dev] [RFC] ethdev: mark old ETH_LINK macros as deprecated Stephen Hemminger 2021-11-01 12:30 ` Ferruh Yigit @ 2021-11-02 23:44 ` Ferruh Yigit 2021-11-03 0:05 ` Stephen Hemminger ` (2 more replies) 1 sibling, 3 replies; 21+ messages in thread From: Ferruh Yigit @ 2021-11-02 23:44 UTC (permalink / raw) To: Thomas Monjalon, Andrew Rybchenko, Somnath Kotur, Hemant Agrawal, Chenbo Xia, Rosen Xu Cc: Ferruh Yigit, dev, Stephen Hemminger Old macros kept for backward compatibility, but this cause old macro usage to sneak in silently. Marking old macros as deprecated. Downside is this will cause some noise for applications that are using old macros. Fixes: 295968d17407 ("ethdev: add namespace") Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com> --- Cc: Stephen Hemminger <stephen@networkplumber.org> --- lib/ethdev/rte_ethdev.h | 474 +++++++++++++++++++++------------------- 1 file changed, 244 insertions(+), 230 deletions(-) diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h index 5f803ad1e6df..4900838b9eb6 100644 --- a/lib/ethdev/rte_ethdev.h +++ b/lib/ethdev/rte_ethdev.h @@ -288,76 +288,78 @@ struct rte_eth_stats { * Device supported speeds bitmap flags */ #define RTE_ETH_LINK_SPEED_AUTONEG 0 /**< Autonegotiate (all speeds) */ -#define ETH_LINK_SPEED_AUTONEG RTE_ETH_LINK_SPEED_AUTONEG #define RTE_ETH_LINK_SPEED_FIXED RTE_BIT32(0) /**< Disable autoneg (fixed speed) */ -#define ETH_LINK_SPEED_FIXED RTE_ETH_LINK_SPEED_FIXED #define RTE_ETH_LINK_SPEED_10M_HD RTE_BIT32(1) /**< 10 Mbps half-duplex */ -#define ETH_LINK_SPEED_10M_HD RTE_ETH_LINK_SPEED_10M_HD #define RTE_ETH_LINK_SPEED_10M RTE_BIT32(2) /**< 10 Mbps full-duplex */ -#define ETH_LINK_SPEED_10M RTE_ETH_LINK_SPEED_10M #define RTE_ETH_LINK_SPEED_100M_HD RTE_BIT32(3) /**< 100 Mbps half-duplex */ -#define ETH_LINK_SPEED_100M_HD RTE_ETH_LINK_SPEED_100M_HD #define RTE_ETH_LINK_SPEED_100M RTE_BIT32(4) /**< 100 Mbps full-duplex */ -#define ETH_LINK_SPEED_100M RTE_ETH_LINK_SPEED_100M #define RTE_ETH_LINK_SPEED_1G RTE_BIT32(5) /**< 1 Gbps */ -#define ETH_LINK_SPEED_1G RTE_ETH_LINK_SPEED_1G #define RTE_ETH_LINK_SPEED_2_5G RTE_BIT32(6) /**< 2.5 Gbps */ -#define ETH_LINK_SPEED_2_5G RTE_ETH_LINK_SPEED_2_5G #define RTE_ETH_LINK_SPEED_5G RTE_BIT32(7) /**< 5 Gbps */ -#define ETH_LINK_SPEED_5G RTE_ETH_LINK_SPEED_5G #define RTE_ETH_LINK_SPEED_10G RTE_BIT32(8) /**< 10 Gbps */ -#define ETH_LINK_SPEED_10G RTE_ETH_LINK_SPEED_10G #define RTE_ETH_LINK_SPEED_20G RTE_BIT32(9) /**< 20 Gbps */ -#define ETH_LINK_SPEED_20G RTE_ETH_LINK_SPEED_20G #define RTE_ETH_LINK_SPEED_25G RTE_BIT32(10) /**< 25 Gbps */ -#define ETH_LINK_SPEED_25G RTE_ETH_LINK_SPEED_25G #define RTE_ETH_LINK_SPEED_40G RTE_BIT32(11) /**< 40 Gbps */ -#define ETH_LINK_SPEED_40G RTE_ETH_LINK_SPEED_40G #define RTE_ETH_LINK_SPEED_50G RTE_BIT32(12) /**< 50 Gbps */ -#define ETH_LINK_SPEED_50G RTE_ETH_LINK_SPEED_50G #define RTE_ETH_LINK_SPEED_56G RTE_BIT32(13) /**< 56 Gbps */ -#define ETH_LINK_SPEED_56G RTE_ETH_LINK_SPEED_56G #define RTE_ETH_LINK_SPEED_100G RTE_BIT32(14) /**< 100 Gbps */ -#define ETH_LINK_SPEED_100G RTE_ETH_LINK_SPEED_100G #define RTE_ETH_LINK_SPEED_200G RTE_BIT32(15) /**< 200 Gbps */ -#define ETH_LINK_SPEED_200G RTE_ETH_LINK_SPEED_200G /**@}*/ +#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 */ #define RTE_ETH_SPEED_NUM_NONE 0 /**< Not defined */ -#define ETH_SPEED_NUM_NONE RTE_ETH_SPEED_NUM_NONE #define RTE_ETH_SPEED_NUM_10M 10 /**< 10 Mbps */ -#define ETH_SPEED_NUM_10M RTE_ETH_SPEED_NUM_10M #define RTE_ETH_SPEED_NUM_100M 100 /**< 100 Mbps */ -#define ETH_SPEED_NUM_100M RTE_ETH_SPEED_NUM_100M #define RTE_ETH_SPEED_NUM_1G 1000 /**< 1 Gbps */ -#define ETH_SPEED_NUM_1G RTE_ETH_SPEED_NUM_1G #define RTE_ETH_SPEED_NUM_2_5G 2500 /**< 2.5 Gbps */ -#define ETH_SPEED_NUM_2_5G RTE_ETH_SPEED_NUM_2_5G #define RTE_ETH_SPEED_NUM_5G 5000 /**< 5 Gbps */ -#define ETH_SPEED_NUM_5G RTE_ETH_SPEED_NUM_5G #define RTE_ETH_SPEED_NUM_10G 10000 /**< 10 Gbps */ -#define ETH_SPEED_NUM_10G RTE_ETH_SPEED_NUM_10G #define RTE_ETH_SPEED_NUM_20G 20000 /**< 20 Gbps */ -#define ETH_SPEED_NUM_20G RTE_ETH_SPEED_NUM_20G #define RTE_ETH_SPEED_NUM_25G 25000 /**< 25 Gbps */ -#define ETH_SPEED_NUM_25G RTE_ETH_SPEED_NUM_25G #define RTE_ETH_SPEED_NUM_40G 40000 /**< 40 Gbps */ -#define ETH_SPEED_NUM_40G RTE_ETH_SPEED_NUM_40G #define RTE_ETH_SPEED_NUM_50G 50000 /**< 50 Gbps */ -#define ETH_SPEED_NUM_50G RTE_ETH_SPEED_NUM_50G #define RTE_ETH_SPEED_NUM_56G 56000 /**< 56 Gbps */ -#define ETH_SPEED_NUM_56G RTE_ETH_SPEED_NUM_56G #define RTE_ETH_SPEED_NUM_100G 100000 /**< 100 Gbps */ -#define ETH_SPEED_NUM_100G RTE_ETH_SPEED_NUM_100G #define RTE_ETH_SPEED_NUM_200G 200000 /**< 200 Gbps */ -#define ETH_SPEED_NUM_200G RTE_ETH_SPEED_NUM_200G #define RTE_ETH_SPEED_NUM_UNKNOWN UINT32_MAX /**< Unknown */ -#define ETH_SPEED_NUM_UNKNOWN RTE_ETH_SPEED_NUM_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. */ @@ -373,20 +375,21 @@ struct rte_eth_link { * Constants used in link management. */ #define RTE_ETH_LINK_HALF_DUPLEX 0 /**< Half-duplex connection (see link_duplex). */ -#define ETH_LINK_HALF_DUPLEX RTE_ETH_LINK_HALF_DUPLEX #define RTE_ETH_LINK_FULL_DUPLEX 1 /**< Full-duplex connection (see link_duplex). */ -#define ETH_LINK_FULL_DUPLEX RTE_ETH_LINK_FULL_DUPLEX #define RTE_ETH_LINK_DOWN 0 /**< Link is down (see link_status). */ -#define ETH_LINK_DOWN RTE_ETH_LINK_DOWN #define RTE_ETH_LINK_UP 1 /**< Link is up (see link_status). */ -#define ETH_LINK_UP RTE_ETH_LINK_UP #define RTE_ETH_LINK_FIXED 0 /**< No autonegotiation (see link_autoneg). */ -#define ETH_LINK_FIXED RTE_ETH_LINK_FIXED #define RTE_ETH_LINK_AUTONEG 1 /**< Autonegotiated (see link_autoneg). */ -#define ETH_LINK_AUTONEG RTE_ETH_LINK_AUTONEG #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. @@ -401,13 +404,14 @@ struct rte_eth_thresh { * @see rte_eth_conf.rxmode.mq_mode. */ #define RTE_ETH_MQ_RX_RSS_FLAG RTE_BIT32(0) /**< Enable RSS. @see rte_eth_rss_conf */ -#define ETH_MQ_RX_RSS_FLAG RTE_ETH_MQ_RX_RSS_FLAG #define RTE_ETH_MQ_RX_DCB_FLAG RTE_BIT32(1) /**< Enable DCB. */ -#define ETH_MQ_RX_DCB_FLAG RTE_ETH_MQ_RX_DCB_FLAG #define RTE_ETH_MQ_RX_VMDQ_FLAG RTE_BIT32(2) /**< Enable VMDq. */ -#define ETH_MQ_RX_VMDQ_FLAG RTE_ETH_MQ_RX_VMDQ_FLAG /**@}*/ +#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. @@ -434,14 +438,14 @@ enum rte_eth_rx_mq_mode { RTE_ETH_MQ_RX_VMDQ_FLAG, }; -#define ETH_MQ_RX_NONE RTE_ETH_MQ_RX_NONE -#define ETH_MQ_RX_RSS RTE_ETH_MQ_RX_RSS -#define ETH_MQ_RX_DCB RTE_ETH_MQ_RX_DCB -#define ETH_MQ_RX_DCB_RSS RTE_ETH_MQ_RX_DCB_RSS -#define ETH_MQ_RX_VMDQ_ONLY RTE_ETH_MQ_RX_VMDQ_ONLY -#define ETH_MQ_RX_VMDQ_RSS RTE_ETH_MQ_RX_VMDQ_RSS -#define ETH_MQ_RX_VMDQ_DCB RTE_ETH_MQ_RX_VMDQ_DCB -#define ETH_MQ_RX_VMDQ_DCB_RSS RTE_ETH_MQ_RX_VMDQ_DCB_RSS +#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 @@ -453,10 +457,11 @@ enum rte_eth_tx_mq_mode { RTE_ETH_MQ_TX_VMDQ_DCB, /**< For Tx side,both DCB and VT is on. */ RTE_ETH_MQ_TX_VMDQ_ONLY, /**< Only VT on, no DCB */ }; -#define ETH_MQ_TX_NONE RTE_ETH_MQ_TX_NONE -#define ETH_MQ_TX_DCB RTE_ETH_MQ_TX_DCB -#define ETH_MQ_TX_VMDQ_DCB RTE_ETH_MQ_TX_VMDQ_DCB -#define ETH_MQ_TX_VMDQ_ONLY RTE_ETH_MQ_TX_VMDQ_ONLY + +#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. @@ -490,10 +495,10 @@ enum rte_vlan_type { RTE_ETH_VLAN_TYPE_MAX, }; -#define ETH_VLAN_TYPE_UNKNOWN RTE_ETH_VLAN_TYPE_UNKNOWN -#define ETH_VLAN_TYPE_INNER RTE_ETH_VLAN_TYPE_INNER -#define ETH_VLAN_TYPE_OUTER RTE_ETH_VLAN_TYPE_OUTER -#define ETH_VLAN_TYPE_MAX 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. @@ -566,69 +571,70 @@ struct rte_eth_rss_conf { * fill rte_eth_rss_conf.rss_hf or rte_flow_action_rss.types. */ #define RTE_ETH_RSS_IPV4 RTE_BIT64(2) -#define ETH_RSS_IPV4 RTE_ETH_RSS_IPV4 #define RTE_ETH_RSS_FRAG_IPV4 RTE_BIT64(3) -#define ETH_RSS_FRAG_IPV4 RTE_ETH_RSS_FRAG_IPV4 #define RTE_ETH_RSS_NONFRAG_IPV4_TCP RTE_BIT64(4) -#define ETH_RSS_NONFRAG_IPV4_TCP RTE_ETH_RSS_NONFRAG_IPV4_TCP #define RTE_ETH_RSS_NONFRAG_IPV4_UDP RTE_BIT64(5) -#define ETH_RSS_NONFRAG_IPV4_UDP RTE_ETH_RSS_NONFRAG_IPV4_UDP #define RTE_ETH_RSS_NONFRAG_IPV4_SCTP RTE_BIT64(6) -#define ETH_RSS_NONFRAG_IPV4_SCTP RTE_ETH_RSS_NONFRAG_IPV4_SCTP #define RTE_ETH_RSS_NONFRAG_IPV4_OTHER RTE_BIT64(7) -#define ETH_RSS_NONFRAG_IPV4_OTHER RTE_ETH_RSS_NONFRAG_IPV4_OTHER #define RTE_ETH_RSS_IPV6 RTE_BIT64(8) -#define ETH_RSS_IPV6 RTE_ETH_RSS_IPV6 #define RTE_ETH_RSS_FRAG_IPV6 RTE_BIT64(9) -#define ETH_RSS_FRAG_IPV6 RTE_ETH_RSS_FRAG_IPV6 #define RTE_ETH_RSS_NONFRAG_IPV6_TCP RTE_BIT64(10) -#define ETH_RSS_NONFRAG_IPV6_TCP RTE_ETH_RSS_NONFRAG_IPV6_TCP #define RTE_ETH_RSS_NONFRAG_IPV6_UDP RTE_BIT64(11) -#define ETH_RSS_NONFRAG_IPV6_UDP RTE_ETH_RSS_NONFRAG_IPV6_UDP #define RTE_ETH_RSS_NONFRAG_IPV6_SCTP RTE_BIT64(12) -#define ETH_RSS_NONFRAG_IPV6_SCTP RTE_ETH_RSS_NONFRAG_IPV6_SCTP #define RTE_ETH_RSS_NONFRAG_IPV6_OTHER RTE_BIT64(13) -#define ETH_RSS_NONFRAG_IPV6_OTHER RTE_ETH_RSS_NONFRAG_IPV6_OTHER #define RTE_ETH_RSS_L2_PAYLOAD RTE_BIT64(14) -#define ETH_RSS_L2_PAYLOAD RTE_ETH_RSS_L2_PAYLOAD #define RTE_ETH_RSS_IPV6_EX RTE_BIT64(15) -#define ETH_RSS_IPV6_EX RTE_ETH_RSS_IPV6_EX #define RTE_ETH_RSS_IPV6_TCP_EX RTE_BIT64(16) -#define ETH_RSS_IPV6_TCP_EX RTE_ETH_RSS_IPV6_TCP_EX #define RTE_ETH_RSS_IPV6_UDP_EX RTE_BIT64(17) -#define ETH_RSS_IPV6_UDP_EX RTE_ETH_RSS_IPV6_UDP_EX #define RTE_ETH_RSS_PORT RTE_BIT64(18) -#define ETH_RSS_PORT RTE_ETH_RSS_PORT #define RTE_ETH_RSS_VXLAN RTE_BIT64(19) -#define ETH_RSS_VXLAN RTE_ETH_RSS_VXLAN #define RTE_ETH_RSS_GENEVE RTE_BIT64(20) -#define ETH_RSS_GENEVE RTE_ETH_RSS_GENEVE #define RTE_ETH_RSS_NVGRE RTE_BIT64(21) -#define ETH_RSS_NVGRE RTE_ETH_RSS_NVGRE #define RTE_ETH_RSS_GTPU RTE_BIT64(23) -#define ETH_RSS_GTPU RTE_ETH_RSS_GTPU #define RTE_ETH_RSS_ETH RTE_BIT64(24) -#define ETH_RSS_ETH RTE_ETH_RSS_ETH #define RTE_ETH_RSS_S_VLAN RTE_BIT64(25) -#define ETH_RSS_S_VLAN RTE_ETH_RSS_S_VLAN #define RTE_ETH_RSS_C_VLAN RTE_BIT64(26) -#define ETH_RSS_C_VLAN RTE_ETH_RSS_C_VLAN #define RTE_ETH_RSS_ESP RTE_BIT64(27) -#define ETH_RSS_ESP RTE_ETH_RSS_ESP #define RTE_ETH_RSS_AH RTE_BIT64(28) -#define ETH_RSS_AH RTE_ETH_RSS_AH #define RTE_ETH_RSS_L2TPV3 RTE_BIT64(29) -#define ETH_RSS_L2TPV3 RTE_ETH_RSS_L2TPV3 #define RTE_ETH_RSS_PFCP RTE_BIT64(30) -#define ETH_RSS_PFCP RTE_ETH_RSS_PFCP #define RTE_ETH_RSS_PPPOE RTE_BIT64(31) -#define ETH_RSS_PPPOE RTE_ETH_RSS_PPPOE #define RTE_ETH_RSS_ECPRI RTE_BIT64(32) -#define ETH_RSS_ECPRI RTE_ETH_RSS_ECPRI #define RTE_ETH_RSS_MPLS RTE_BIT64(33) -#define ETH_RSS_MPLS RTE_ETH_RSS_MPLS #define RTE_ETH_RSS_IPV4_CHKSUM RTE_BIT64(34) -#define ETH_RSS_IPV4_CHKSUM RTE_ETH_RSS_IPV4_CHKSUM + +#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. @@ -643,7 +649,7 @@ 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_ETH_RSS_L4_CHKSUM +#define ETH_RSS_L4_CHKSUM RTE_DEPRECATED(ETH_RSS_L4_CHKSUM) RTE_ETH_RSS_L4_CHKSUM /* * We use the following macros to combine with above RTE_ETH_RSS_* for @@ -655,21 +661,22 @@ struct rte_eth_rss_conf { * them are added. */ #define RTE_ETH_RSS_L3_SRC_ONLY RTE_BIT64(63) -#define ETH_RSS_L3_SRC_ONLY RTE_ETH_RSS_L3_SRC_ONLY #define RTE_ETH_RSS_L3_DST_ONLY RTE_BIT64(62) -#define ETH_RSS_L3_DST_ONLY RTE_ETH_RSS_L3_DST_ONLY #define RTE_ETH_RSS_L4_SRC_ONLY RTE_BIT64(61) -#define ETH_RSS_L4_SRC_ONLY RTE_ETH_RSS_L4_SRC_ONLY #define RTE_ETH_RSS_L4_DST_ONLY RTE_BIT64(60) -#define ETH_RSS_L4_DST_ONLY RTE_ETH_RSS_L4_DST_ONLY #define RTE_ETH_RSS_L2_SRC_ONLY RTE_BIT64(59) -#define ETH_RSS_L2_SRC_ONLY RTE_ETH_RSS_L2_SRC_ONLY #define RTE_ETH_RSS_L2_DST_ONLY RTE_BIT64(58) -#define ETH_RSS_L2_DST_ONLY RTE_ETH_RSS_L2_DST_ONLY + +#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 + * https://tools.ietf.org/html/rfc6052 * Must be combined with RTE_ETH_RSS_IPV6, RTE_ETH_RSS_NONFRAG_IPV6_UDP, * RTE_ETH_RSS_NONFRAG_IPV6_TCP, RTE_ETH_RSS_NONFRAG_IPV6_SCTP. */ @@ -694,26 +701,27 @@ 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_ETH_RSS_LEVEL_PMD_DEFAULT +#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_ETH_RSS_LEVEL_OUTERMOST +#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 * encapsulation level, from outermost to innermost (lower to higher values). */ #define RTE_ETH_RSS_LEVEL_INNERMOST (UINT64_C(2) << 50) -#define ETH_RSS_LEVEL_INNERMOST RTE_ETH_RSS_LEVEL_INNERMOST #define RTE_ETH_RSS_LEVEL_MASK (UINT64_C(3) << 50) -#define ETH_RSS_LEVEL_MASK RTE_ETH_RSS_LEVEL_MASK + +#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_ETH_RSS_LEVEL(rss_hf) +#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 @@ -740,122 +748,122 @@ 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_ETH_RSS_IPV6_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_ETH_RSS_IPV6_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_ETH_RSS_IPV6_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_ETH_RSS_IPV6_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_ETH_RSS_IPV6_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_ETH_RSS_IPV6_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_ETH_RSS_IPV6_PRE32_UDP +#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_ETH_RSS_IPV6_PRE40_UDP +#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_ETH_RSS_IPV6_PRE48_UDP +#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_ETH_RSS_IPV6_PRE56_UDP +#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_ETH_RSS_IPV6_PRE64_UDP +#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_ETH_RSS_IPV6_PRE96_UDP +#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_ETH_RSS_IPV6_PRE32_TCP +#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_ETH_RSS_IPV6_PRE40_TCP +#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_ETH_RSS_IPV6_PRE48_TCP +#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_ETH_RSS_IPV6_PRE56_TCP +#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_ETH_RSS_IPV6_PRE64_TCP +#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_ETH_RSS_IPV6_PRE96_TCP +#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_ETH_RSS_IPV6_PRE32_SCTP +#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_ETH_RSS_IPV6_PRE40_SCTP +#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_ETH_RSS_IPV6_PRE48_SCTP +#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_ETH_RSS_IPV6_PRE56_SCTP +#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_ETH_RSS_IPV6_PRE64_SCTP +#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_ETH_RSS_IPV6_PRE96_SCTP +#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 | \ @@ -865,35 +873,35 @@ 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_ETH_RSS_IP +#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_ETH_RSS_UDP +#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_ETH_RSS_TCP +#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_ETH_RSS_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_ETH_RSS_TUNNEL +#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_ETH_RSS_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 ( \ @@ -918,7 +926,7 @@ 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_ETH_RSS_PROTO_MASK +#define ETH_RSS_PROTO_MASK RTE_DEPRECATED(ETH_RSS_PROTO_MASK) RTE_ETH_RSS_PROTO_MASK /* * Definitions used for redirection table entry size. @@ -926,84 +934,90 @@ rte_eth_rss_hf_refine(uint64_t rss_hf) * documentation or the description of relevant functions for more details. */ #define RTE_ETH_RSS_RETA_SIZE_64 64 -#define ETH_RSS_RETA_SIZE_64 RTE_ETH_RSS_RETA_SIZE_64 #define RTE_ETH_RSS_RETA_SIZE_128 128 -#define ETH_RSS_RETA_SIZE_128 RTE_ETH_RSS_RETA_SIZE_128 #define RTE_ETH_RSS_RETA_SIZE_256 256 -#define ETH_RSS_RETA_SIZE_256 RTE_ETH_RSS_RETA_SIZE_256 #define RTE_ETH_RSS_RETA_SIZE_512 512 -#define ETH_RSS_RETA_SIZE_512 RTE_ETH_RSS_RETA_SIZE_512 #define RTE_ETH_RETA_GROUP_SIZE 64 -#define RTE_RETA_GROUP_SIZE RTE_ETH_RETA_GROUP_SIZE + +#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 ETH_VMDQ_MAX_VLAN_FILTERS RTE_ETH_VMDQ_MAX_VLAN_FILTERS #define RTE_ETH_DCB_NUM_USER_PRIORITIES 8 /**< Maximum nb. of DCB priorities. */ -#define ETH_DCB_NUM_USER_PRIORITIES RTE_ETH_DCB_NUM_USER_PRIORITIES #define RTE_ETH_VMDQ_DCB_NUM_QUEUES 128 /**< Maximum nb. of VMDq DCB queues. */ -#define ETH_VMDQ_DCB_NUM_QUEUES RTE_ETH_VMDQ_DCB_NUM_QUEUES #define RTE_ETH_DCB_NUM_QUEUES 128 /**< Maximum nb. of DCB queues. */ -#define ETH_DCB_NUM_QUEUES RTE_ETH_DCB_NUM_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 ETH_DCB_PG_SUPPORT RTE_ETH_DCB_PG_SUPPORT #define RTE_ETH_DCB_PFC_SUPPORT RTE_BIT32(1) /**< Priority Flow Control support. */ -#define ETH_DCB_PFC_SUPPORT RTE_ETH_DCB_PFC_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 ETH_VLAN_STRIP_OFFLOAD RTE_ETH_VLAN_STRIP_OFFLOAD #define RTE_ETH_VLAN_FILTER_OFFLOAD 0x0002 /**< VLAN Filter On/Off */ -#define ETH_VLAN_FILTER_OFFLOAD RTE_ETH_VLAN_FILTER_OFFLOAD #define RTE_ETH_VLAN_EXTEND_OFFLOAD 0x0004 /**< VLAN Extend On/Off */ -#define ETH_VLAN_EXTEND_OFFLOAD RTE_ETH_VLAN_EXTEND_OFFLOAD #define RTE_ETH_QINQ_STRIP_OFFLOAD 0x0008 /**< QINQ Strip On/Off */ -#define ETH_QINQ_STRIP_OFFLOAD RTE_ETH_QINQ_STRIP_OFFLOAD + +#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 ETH_VLAN_STRIP_MASK RTE_ETH_VLAN_STRIP_MASK #define RTE_ETH_VLAN_FILTER_MASK 0x0002 /**< VLAN Filter setting mask*/ -#define ETH_VLAN_FILTER_MASK RTE_ETH_VLAN_FILTER_MASK #define RTE_ETH_VLAN_EXTEND_MASK 0x0004 /**< VLAN Extend setting mask*/ -#define ETH_VLAN_EXTEND_MASK RTE_ETH_VLAN_EXTEND_MASK #define RTE_ETH_QINQ_STRIP_MASK 0x0008 /**< QINQ Strip setting mask */ -#define ETH_QINQ_STRIP_MASK RTE_ETH_QINQ_STRIP_MASK #define RTE_ETH_VLAN_ID_MAX 0x0FFF /**< VLAN ID is in lower 12 bits*/ -#define ETH_VLAN_ID_MAX RTE_ETH_VLAN_ID_MAX /**@}*/ +#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_ETH_NUM_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. */ -#define ETH_VMDQ_NUM_UC_HASH_ARRAY RTE_ETH_VMDQ_NUM_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 */ /** Accept untagged packets. */ #define RTE_ETH_VMDQ_ACCEPT_UNTAG RTE_BIT32(0) -#define ETH_VMDQ_ACCEPT_UNTAG RTE_ETH_VMDQ_ACCEPT_UNTAG /** Accept packets in multicast table. */ #define RTE_ETH_VMDQ_ACCEPT_HASH_MC RTE_BIT32(1) -#define ETH_VMDQ_ACCEPT_HASH_MC RTE_ETH_VMDQ_ACCEPT_HASH_MC /** Accept packets in unicast table. */ #define RTE_ETH_VMDQ_ACCEPT_HASH_UC RTE_BIT32(2) -#define ETH_VMDQ_ACCEPT_HASH_UC RTE_ETH_VMDQ_ACCEPT_HASH_UC /** Accept broadcast packets. */ #define RTE_ETH_VMDQ_ACCEPT_BROADCAST RTE_BIT32(3) -#define ETH_VMDQ_ACCEPT_BROADCAST RTE_ETH_VMDQ_ACCEPT_BROADCAST /** Multicast promiscuous. */ #define RTE_ETH_VMDQ_ACCEPT_MULTICAST RTE_BIT32(4) -#define ETH_VMDQ_ACCEPT_MULTICAST RTE_ETH_VMDQ_ACCEPT_MULTICAST /**@}*/ +#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 @@ -1025,8 +1039,8 @@ 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_ETH_4_TCS -#define ETH_8_TCS RTE_ETH_8_TCS +#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 @@ -1038,10 +1052,10 @@ 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_ETH_8_POOLS -#define ETH_16_POOLS RTE_ETH_16_POOLS -#define ETH_32_POOLS RTE_ETH_32_POOLS -#define ETH_64_POOLS RTE_ETH_64_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 { @@ -1364,11 +1378,10 @@ 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_ETH_FC_NONE -#define RTE_FC_RX_PAUSE RTE_ETH_FC_RX_PAUSE -#define RTE_FC_TX_PAUSE RTE_ETH_FC_TX_PAUSE -#define RTE_FC_FULL RTE_ETH_FC_FULL +#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. @@ -1411,17 +1424,16 @@ enum rte_eth_tunnel_type { RTE_ETH_TUNNEL_TYPE_ECPRI, RTE_ETH_TUNNEL_TYPE_MAX, }; - -#define RTE_TUNNEL_TYPE_NONE RTE_ETH_TUNNEL_TYPE_NONE -#define RTE_TUNNEL_TYPE_VXLAN RTE_ETH_TUNNEL_TYPE_VXLAN -#define RTE_TUNNEL_TYPE_GENEVE RTE_ETH_TUNNEL_TYPE_GENEVE -#define RTE_TUNNEL_TYPE_TEREDO RTE_ETH_TUNNEL_TYPE_TEREDO -#define RTE_TUNNEL_TYPE_NVGRE RTE_ETH_TUNNEL_TYPE_NVGRE -#define RTE_TUNNEL_TYPE_IP_IN_GRE RTE_ETH_TUNNEL_TYPE_IP_IN_GRE -#define RTE_L2_TUNNEL_TYPE_E_TAG RTE_ETH_L2_TUNNEL_TYPE_E_TAG -#define RTE_TUNNEL_TYPE_VXLAN_GPE RTE_ETH_TUNNEL_TYPE_VXLAN_GPE -#define RTE_TUNNEL_TYPE_ECPRI RTE_ETH_TUNNEL_TYPE_ECPRI -#define RTE_TUNNEL_TYPE_MAX 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" @@ -1437,9 +1449,9 @@ enum rte_eth_fdir_pballoc_type { }; #define rte_fdir_pballoc_type rte_eth_fdir_pballoc_type -#define RTE_FDIR_PBALLOC_64K RTE_ETH_FDIR_PBALLOC_64K -#define RTE_FDIR_PBALLOC_128K RTE_ETH_FDIR_PBALLOC_128K -#define RTE_FDIR_PBALLOC_256K RTE_ETH_FDIR_PBALLOC_256K +#define RTE_FDIR_PBALLOC_64K RTE_DEPRECATED(RTE_FDIR_PBALLOC_64K) RTE_ETH_FDIR_PBALLOC_64K +#define RTE_FDIR_PBALLOC_128K RTE_DEPRECATED(RTE_FDIR_PBALLOC_128K) RTE_ETH_FDIR_PBALLOC_128K +#define RTE_FDIR_PBALLOC_256K RTE_DEPRECATED(RTE_FDIR_PBALLOC_256K) RTE_ETH_FDIR_PBALLOC_256K /** * Select report mode of FDIR hash information in Rx descriptors. @@ -1466,7 +1478,6 @@ struct rte_eth_fdir_conf { /** Flex payload configuration. */ struct rte_eth_fdir_flex_conf flex_conf; }; - #define rte_fdir_conf rte_eth_fdir_conf /** @@ -1545,57 +1556,58 @@ struct rte_eth_conf { * Rx offload capabilities of a device. */ #define RTE_ETH_RX_OFFLOAD_VLAN_STRIP RTE_BIT64(0) -#define DEV_RX_OFFLOAD_VLAN_STRIP RTE_ETH_RX_OFFLOAD_VLAN_STRIP #define RTE_ETH_RX_OFFLOAD_IPV4_CKSUM RTE_BIT64(1) -#define DEV_RX_OFFLOAD_IPV4_CKSUM RTE_ETH_RX_OFFLOAD_IPV4_CKSUM #define RTE_ETH_RX_OFFLOAD_UDP_CKSUM RTE_BIT64(2) -#define DEV_RX_OFFLOAD_UDP_CKSUM RTE_ETH_RX_OFFLOAD_UDP_CKSUM #define RTE_ETH_RX_OFFLOAD_TCP_CKSUM RTE_BIT64(3) -#define DEV_RX_OFFLOAD_TCP_CKSUM RTE_ETH_RX_OFFLOAD_TCP_CKSUM #define RTE_ETH_RX_OFFLOAD_TCP_LRO RTE_BIT64(4) -#define DEV_RX_OFFLOAD_TCP_LRO RTE_ETH_RX_OFFLOAD_TCP_LRO #define RTE_ETH_RX_OFFLOAD_QINQ_STRIP RTE_BIT64(5) -#define DEV_RX_OFFLOAD_QINQ_STRIP RTE_ETH_RX_OFFLOAD_QINQ_STRIP #define RTE_ETH_RX_OFFLOAD_OUTER_IPV4_CKSUM RTE_BIT64(6) -#define DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM RTE_ETH_RX_OFFLOAD_OUTER_IPV4_CKSUM #define RTE_ETH_RX_OFFLOAD_MACSEC_STRIP RTE_BIT64(7) -#define DEV_RX_OFFLOAD_MACSEC_STRIP RTE_ETH_RX_OFFLOAD_MACSEC_STRIP #define RTE_ETH_RX_OFFLOAD_HEADER_SPLIT RTE_BIT64(8) -#define DEV_RX_OFFLOAD_HEADER_SPLIT RTE_ETH_RX_OFFLOAD_HEADER_SPLIT #define RTE_ETH_RX_OFFLOAD_VLAN_FILTER RTE_BIT64(9) -#define DEV_RX_OFFLOAD_VLAN_FILTER RTE_ETH_RX_OFFLOAD_VLAN_FILTER #define RTE_ETH_RX_OFFLOAD_VLAN_EXTEND RTE_BIT64(10) -#define DEV_RX_OFFLOAD_VLAN_EXTEND RTE_ETH_RX_OFFLOAD_VLAN_EXTEND #define RTE_ETH_RX_OFFLOAD_SCATTER RTE_BIT64(13) -#define DEV_RX_OFFLOAD_SCATTER RTE_ETH_RX_OFFLOAD_SCATTER /** * Timestamp is set by the driver in RTE_MBUF_DYNFIELD_TIMESTAMP_NAME * and RTE_MBUF_DYNFLAG_RX_TIMESTAMP_NAME is set in ol_flags. * The mbuf field and flag are registered when the offload is configured. */ #define RTE_ETH_RX_OFFLOAD_TIMESTAMP RTE_BIT64(14) -#define DEV_RX_OFFLOAD_TIMESTAMP RTE_ETH_RX_OFFLOAD_TIMESTAMP #define RTE_ETH_RX_OFFLOAD_SECURITY RTE_BIT64(15) -#define DEV_RX_OFFLOAD_SECURITY RTE_ETH_RX_OFFLOAD_SECURITY #define RTE_ETH_RX_OFFLOAD_KEEP_CRC RTE_BIT64(16) -#define DEV_RX_OFFLOAD_KEEP_CRC RTE_ETH_RX_OFFLOAD_KEEP_CRC #define RTE_ETH_RX_OFFLOAD_SCTP_CKSUM RTE_BIT64(17) -#define DEV_RX_OFFLOAD_SCTP_CKSUM RTE_ETH_RX_OFFLOAD_SCTP_CKSUM #define RTE_ETH_RX_OFFLOAD_OUTER_UDP_CKSUM RTE_BIT64(18) -#define DEV_RX_OFFLOAD_OUTER_UDP_CKSUM RTE_ETH_RX_OFFLOAD_OUTER_UDP_CKSUM #define RTE_ETH_RX_OFFLOAD_RSS_HASH RTE_BIT64(19) -#define DEV_RX_OFFLOAD_RSS_HASH RTE_ETH_RX_OFFLOAD_RSS_HASH #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_ETH_RX_OFFLOAD_CHECKSUM +#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_ETH_RX_OFFLOAD_VLAN +#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 @@ -1606,80 +1618,81 @@ struct rte_eth_conf { * Tx offload capabilities of a device. */ #define RTE_ETH_TX_OFFLOAD_VLAN_INSERT RTE_BIT64(0) -#define DEV_TX_OFFLOAD_VLAN_INSERT RTE_ETH_TX_OFFLOAD_VLAN_INSERT #define RTE_ETH_TX_OFFLOAD_IPV4_CKSUM RTE_BIT64(1) -#define DEV_TX_OFFLOAD_IPV4_CKSUM RTE_ETH_TX_OFFLOAD_IPV4_CKSUM #define RTE_ETH_TX_OFFLOAD_UDP_CKSUM RTE_BIT64(2) -#define DEV_TX_OFFLOAD_UDP_CKSUM RTE_ETH_TX_OFFLOAD_UDP_CKSUM #define RTE_ETH_TX_OFFLOAD_TCP_CKSUM RTE_BIT64(3) -#define DEV_TX_OFFLOAD_TCP_CKSUM RTE_ETH_TX_OFFLOAD_TCP_CKSUM #define RTE_ETH_TX_OFFLOAD_SCTP_CKSUM RTE_BIT64(4) -#define DEV_TX_OFFLOAD_SCTP_CKSUM RTE_ETH_TX_OFFLOAD_SCTP_CKSUM #define RTE_ETH_TX_OFFLOAD_TCP_TSO RTE_BIT64(5) -#define DEV_TX_OFFLOAD_TCP_TSO RTE_ETH_TX_OFFLOAD_TCP_TSO #define RTE_ETH_TX_OFFLOAD_UDP_TSO RTE_BIT64(6) -#define DEV_TX_OFFLOAD_UDP_TSO RTE_ETH_TX_OFFLOAD_UDP_TSO #define RTE_ETH_TX_OFFLOAD_OUTER_IPV4_CKSUM RTE_BIT64(7) /**< Used for tunneling packet. */ -#define DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM RTE_ETH_TX_OFFLOAD_OUTER_IPV4_CKSUM #define RTE_ETH_TX_OFFLOAD_QINQ_INSERT RTE_BIT64(8) -#define DEV_TX_OFFLOAD_QINQ_INSERT RTE_ETH_TX_OFFLOAD_QINQ_INSERT #define RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO RTE_BIT64(9) /**< Used for tunneling packet. */ -#define DEV_TX_OFFLOAD_VXLAN_TNL_TSO RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO #define RTE_ETH_TX_OFFLOAD_GRE_TNL_TSO RTE_BIT64(10) /**< Used for tunneling packet. */ -#define DEV_TX_OFFLOAD_GRE_TNL_TSO RTE_ETH_TX_OFFLOAD_GRE_TNL_TSO #define RTE_ETH_TX_OFFLOAD_IPIP_TNL_TSO RTE_BIT64(11) /**< Used for tunneling packet. */ -#define DEV_TX_OFFLOAD_IPIP_TNL_TSO RTE_ETH_TX_OFFLOAD_IPIP_TNL_TSO #define RTE_ETH_TX_OFFLOAD_GENEVE_TNL_TSO RTE_BIT64(12) /**< Used for tunneling packet. */ -#define DEV_TX_OFFLOAD_GENEVE_TNL_TSO RTE_ETH_TX_OFFLOAD_GENEVE_TNL_TSO #define RTE_ETH_TX_OFFLOAD_MACSEC_INSERT RTE_BIT64(13) -#define DEV_TX_OFFLOAD_MACSEC_INSERT RTE_ETH_TX_OFFLOAD_MACSEC_INSERT /** * Multiple threads can invoke rte_eth_tx_burst() concurrently on the same * Tx queue without SW lock. */ #define RTE_ETH_TX_OFFLOAD_MT_LOCKFREE RTE_BIT64(14) -#define DEV_TX_OFFLOAD_MT_LOCKFREE RTE_ETH_TX_OFFLOAD_MT_LOCKFREE /** Device supports multi segment send. */ #define RTE_ETH_TX_OFFLOAD_MULTI_SEGS RTE_BIT64(15) -#define DEV_TX_OFFLOAD_MULTI_SEGS RTE_ETH_TX_OFFLOAD_MULTI_SEGS /** * Device supports optimization for fast release of mbufs. * When set application must guarantee that per-queue all mbufs comes from * the same mempool and has refcnt = 1. */ #define RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE RTE_BIT64(16) -#define DEV_TX_OFFLOAD_MBUF_FAST_FREE RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE #define RTE_ETH_TX_OFFLOAD_SECURITY RTE_BIT64(17) -#define DEV_TX_OFFLOAD_SECURITY RTE_ETH_TX_OFFLOAD_SECURITY /** * Device supports generic UDP tunneled packet TSO. * Application must set RTE_MBUF_F_TX_TUNNEL_UDP and other mbuf fields required * for tunnel TSO. */ #define RTE_ETH_TX_OFFLOAD_UDP_TNL_TSO RTE_BIT64(18) -#define DEV_TX_OFFLOAD_UDP_TNL_TSO RTE_ETH_TX_OFFLOAD_UDP_TNL_TSO /** * Device supports generic IP tunneled packet TSO. * Application must set RTE_MBUF_F_TX_TUNNEL_IP and other mbuf fields required * for tunnel TSO. */ #define RTE_ETH_TX_OFFLOAD_IP_TNL_TSO RTE_BIT64(19) -#define DEV_TX_OFFLOAD_IP_TNL_TSO RTE_ETH_TX_OFFLOAD_IP_TNL_TSO /** Device supports outer UDP checksum */ #define RTE_ETH_TX_OFFLOAD_OUTER_UDP_CKSUM RTE_BIT64(20) -#define DEV_TX_OFFLOAD_OUTER_UDP_CKSUM RTE_ETH_TX_OFFLOAD_OUTER_UDP_CKSUM /** * Device sends on time read from RTE_MBUF_DYNFIELD_TIMESTAMP_NAME * if RTE_MBUF_DYNFLAG_TX_TIMESTAMP_NAME is set in ol_flags. * The mbuf field and flag are registered when the offload is configured. */ #define RTE_ETH_TX_OFFLOAD_SEND_ON_TIMESTAMP RTE_BIT64(21) -#define DEV_TX_OFFLOAD_SEND_ON_TIMESTAMP RTE_ETH_TX_OFFLOAD_SEND_ON_TIMESTAMP /* * If new Tx offload capabilities are defined, they also must be * 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. */ @@ -1931,9 +1944,10 @@ struct rte_eth_xstat_name { }; #define RTE_ETH_DCB_NUM_TCS 8 -#define ETH_DCB_NUM_TCS RTE_ETH_DCB_NUM_TCS #define RTE_ETH_MAX_VMDQ_POOL 64 -#define ETH_MAX_VMDQ_POOL RTE_ETH_MAX_VMDQ_POOL + +#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 -- 2.31.1 ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [dpdk-dev] [PATCH] ethdev: mark old macros as deprecated 2021-11-02 23:44 ` [dpdk-dev] [PATCH] ethdev: mark old " Ferruh Yigit @ 2021-11-03 0:05 ` Stephen Hemminger 2021-11-03 9:00 ` Ferruh Yigit 2021-11-03 22:48 ` [dpdk-dev] [PATCH v2] " Ferruh Yigit 2021-11-04 11:04 ` [dpdk-dev] [PATCH] ethdev: fix crash on owner delete Ferruh Yigit 2 siblings, 1 reply; 21+ messages in thread From: Stephen Hemminger @ 2021-11-03 0:05 UTC (permalink / raw) To: Ferruh Yigit Cc: Thomas Monjalon, Andrew Rybchenko, Somnath Kotur, Hemant Agrawal, Chenbo Xia, Rosen Xu, dev On Tue, 2 Nov 2021 23:44:34 +0000 Ferruh Yigit <ferruh.yigit@intel.com> wrote: > Old macros kept for backward compatibility, but this cause old macro > usage to sneak in silently. > > Marking old macros as deprecated. Downside is this will cause some noise > for applications that are using old macros. > > Fixes: 295968d17407 ("ethdev: add namespace") > > Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com> > --- > Cc: Stephen Hemminger <stephen@networkplumber.org> > --- > lib/ethdev/rte_ethdev.h | 474 +++++++++++++++++++++------------------- > 1 file changed, 244 insertions(+), 230 deletions(-) > I assume all of current tree compiles cleanly. Should there be a release note? Acked-by: Stephen Hemminger <stephen@networkplumber.org> ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [dpdk-dev] [PATCH] ethdev: mark old macros as deprecated 2021-11-03 0:05 ` Stephen Hemminger @ 2021-11-03 9:00 ` Ferruh Yigit 0 siblings, 0 replies; 21+ messages in thread From: Ferruh Yigit @ 2021-11-03 9:00 UTC (permalink / raw) To: Stephen Hemminger Cc: Thomas Monjalon, Andrew Rybchenko, Somnath Kotur, Hemant Agrawal, Chenbo Xia, Rosen Xu, dev On 11/3/2021 12:05 AM, Stephen Hemminger wrote: > On Tue, 2 Nov 2021 23:44:34 +0000 > Ferruh Yigit <ferruh.yigit@intel.com> wrote: > >> Old macros kept for backward compatibility, but this cause old macro >> usage to sneak in silently. >> >> Marking old macros as deprecated. Downside is this will cause some noise >> for applications that are using old macros. >> >> Fixes: 295968d17407 ("ethdev: add namespace") >> >> Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com> >> --- >> Cc: Stephen Hemminger <stephen@networkplumber.org> >> --- >> lib/ethdev/rte_ethdev.h | 474 +++++++++++++++++++++------------------- >> 1 file changed, 244 insertions(+), 230 deletions(-) >> > > I assume all of current tree compiles cleanly. Yes. > Should there be a release note? > Ack, I will add in v2. > Acked-by: Stephen Hemminger <stephen@networkplumber.org> > ^ permalink raw reply [flat|nested] 21+ messages in thread
* [dpdk-dev] [PATCH v2] ethdev: mark old macros as deprecated 2021-11-02 23:44 ` [dpdk-dev] [PATCH] ethdev: mark old " Ferruh Yigit 2021-11-03 0:05 ` Stephen Hemminger @ 2021-11-03 22:48 ` Ferruh Yigit 2021-11-04 11:03 ` Ferruh Yigit 2022-01-12 14:36 ` [PATCH v3] " Ferruh Yigit 2021-11-04 11:04 ` [dpdk-dev] [PATCH] ethdev: fix crash on owner delete Ferruh Yigit 2 siblings, 2 replies; 21+ messages in thread From: Ferruh Yigit @ 2021-11-03 22:48 UTC (permalink / raw) To: Thomas Monjalon, Andrew Rybchenko; +Cc: Ferruh Yigit, dev, Stephen Hemminger Old macros kept for backward compatibility, but this cause old macro usage to sneak in silently. Marking old macros as deprecated. Downside is this will cause some noise for applications that are using old macros. Fixes: 295968d17407 ("ethdev: add namespace") Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com> Acked-by: Stephen Hemminger <stephen@networkplumber.org> --- v2: * Release notes updated --- doc/guides/rel_notes/release_21_11.rst | 3 + lib/ethdev/rte_ethdev.h | 474 +++++++++++++------------ 2 files changed, 247 insertions(+), 230 deletions(-) diff --git a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst index 76791f870f73..9f2991f2c474 100644 --- a/doc/guides/rel_notes/release_21_11.rst +++ b/doc/guides/rel_notes/release_21_11.rst @@ -455,6 +455,9 @@ API Changes should be provided, and offset for immediate source bitfield is assigned from destination one. +* ethdev: All public macros and enumeration constants are prefixed with + ``RTE_ETH_`` in a backward compatible way. + * cryptodev: The API rte_cryptodev_pmd_is_valid_dev is modified to rte_cryptodev_is_valid_dev as it can be used by the application as well as PMD to check whether the device is valid or not. diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h index 5f803ad1e6df..4900838b9eb6 100644 --- a/lib/ethdev/rte_ethdev.h +++ b/lib/ethdev/rte_ethdev.h @@ -288,76 +288,78 @@ struct rte_eth_stats { * Device supported speeds bitmap flags */ #define RTE_ETH_LINK_SPEED_AUTONEG 0 /**< Autonegotiate (all speeds) */ -#define ETH_LINK_SPEED_AUTONEG RTE_ETH_LINK_SPEED_AUTONEG #define RTE_ETH_LINK_SPEED_FIXED RTE_BIT32(0) /**< Disable autoneg (fixed speed) */ -#define ETH_LINK_SPEED_FIXED RTE_ETH_LINK_SPEED_FIXED #define RTE_ETH_LINK_SPEED_10M_HD RTE_BIT32(1) /**< 10 Mbps half-duplex */ -#define ETH_LINK_SPEED_10M_HD RTE_ETH_LINK_SPEED_10M_HD #define RTE_ETH_LINK_SPEED_10M RTE_BIT32(2) /**< 10 Mbps full-duplex */ -#define ETH_LINK_SPEED_10M RTE_ETH_LINK_SPEED_10M #define RTE_ETH_LINK_SPEED_100M_HD RTE_BIT32(3) /**< 100 Mbps half-duplex */ -#define ETH_LINK_SPEED_100M_HD RTE_ETH_LINK_SPEED_100M_HD #define RTE_ETH_LINK_SPEED_100M RTE_BIT32(4) /**< 100 Mbps full-duplex */ -#define ETH_LINK_SPEED_100M RTE_ETH_LINK_SPEED_100M #define RTE_ETH_LINK_SPEED_1G RTE_BIT32(5) /**< 1 Gbps */ -#define ETH_LINK_SPEED_1G RTE_ETH_LINK_SPEED_1G #define RTE_ETH_LINK_SPEED_2_5G RTE_BIT32(6) /**< 2.5 Gbps */ -#define ETH_LINK_SPEED_2_5G RTE_ETH_LINK_SPEED_2_5G #define RTE_ETH_LINK_SPEED_5G RTE_BIT32(7) /**< 5 Gbps */ -#define ETH_LINK_SPEED_5G RTE_ETH_LINK_SPEED_5G #define RTE_ETH_LINK_SPEED_10G RTE_BIT32(8) /**< 10 Gbps */ -#define ETH_LINK_SPEED_10G RTE_ETH_LINK_SPEED_10G #define RTE_ETH_LINK_SPEED_20G RTE_BIT32(9) /**< 20 Gbps */ -#define ETH_LINK_SPEED_20G RTE_ETH_LINK_SPEED_20G #define RTE_ETH_LINK_SPEED_25G RTE_BIT32(10) /**< 25 Gbps */ -#define ETH_LINK_SPEED_25G RTE_ETH_LINK_SPEED_25G #define RTE_ETH_LINK_SPEED_40G RTE_BIT32(11) /**< 40 Gbps */ -#define ETH_LINK_SPEED_40G RTE_ETH_LINK_SPEED_40G #define RTE_ETH_LINK_SPEED_50G RTE_BIT32(12) /**< 50 Gbps */ -#define ETH_LINK_SPEED_50G RTE_ETH_LINK_SPEED_50G #define RTE_ETH_LINK_SPEED_56G RTE_BIT32(13) /**< 56 Gbps */ -#define ETH_LINK_SPEED_56G RTE_ETH_LINK_SPEED_56G #define RTE_ETH_LINK_SPEED_100G RTE_BIT32(14) /**< 100 Gbps */ -#define ETH_LINK_SPEED_100G RTE_ETH_LINK_SPEED_100G #define RTE_ETH_LINK_SPEED_200G RTE_BIT32(15) /**< 200 Gbps */ -#define ETH_LINK_SPEED_200G RTE_ETH_LINK_SPEED_200G /**@}*/ +#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 */ #define RTE_ETH_SPEED_NUM_NONE 0 /**< Not defined */ -#define ETH_SPEED_NUM_NONE RTE_ETH_SPEED_NUM_NONE #define RTE_ETH_SPEED_NUM_10M 10 /**< 10 Mbps */ -#define ETH_SPEED_NUM_10M RTE_ETH_SPEED_NUM_10M #define RTE_ETH_SPEED_NUM_100M 100 /**< 100 Mbps */ -#define ETH_SPEED_NUM_100M RTE_ETH_SPEED_NUM_100M #define RTE_ETH_SPEED_NUM_1G 1000 /**< 1 Gbps */ -#define ETH_SPEED_NUM_1G RTE_ETH_SPEED_NUM_1G #define RTE_ETH_SPEED_NUM_2_5G 2500 /**< 2.5 Gbps */ -#define ETH_SPEED_NUM_2_5G RTE_ETH_SPEED_NUM_2_5G #define RTE_ETH_SPEED_NUM_5G 5000 /**< 5 Gbps */ -#define ETH_SPEED_NUM_5G RTE_ETH_SPEED_NUM_5G #define RTE_ETH_SPEED_NUM_10G 10000 /**< 10 Gbps */ -#define ETH_SPEED_NUM_10G RTE_ETH_SPEED_NUM_10G #define RTE_ETH_SPEED_NUM_20G 20000 /**< 20 Gbps */ -#define ETH_SPEED_NUM_20G RTE_ETH_SPEED_NUM_20G #define RTE_ETH_SPEED_NUM_25G 25000 /**< 25 Gbps */ -#define ETH_SPEED_NUM_25G RTE_ETH_SPEED_NUM_25G #define RTE_ETH_SPEED_NUM_40G 40000 /**< 40 Gbps */ -#define ETH_SPEED_NUM_40G RTE_ETH_SPEED_NUM_40G #define RTE_ETH_SPEED_NUM_50G 50000 /**< 50 Gbps */ -#define ETH_SPEED_NUM_50G RTE_ETH_SPEED_NUM_50G #define RTE_ETH_SPEED_NUM_56G 56000 /**< 56 Gbps */ -#define ETH_SPEED_NUM_56G RTE_ETH_SPEED_NUM_56G #define RTE_ETH_SPEED_NUM_100G 100000 /**< 100 Gbps */ -#define ETH_SPEED_NUM_100G RTE_ETH_SPEED_NUM_100G #define RTE_ETH_SPEED_NUM_200G 200000 /**< 200 Gbps */ -#define ETH_SPEED_NUM_200G RTE_ETH_SPEED_NUM_200G #define RTE_ETH_SPEED_NUM_UNKNOWN UINT32_MAX /**< Unknown */ -#define ETH_SPEED_NUM_UNKNOWN RTE_ETH_SPEED_NUM_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. */ @@ -373,20 +375,21 @@ struct rte_eth_link { * Constants used in link management. */ #define RTE_ETH_LINK_HALF_DUPLEX 0 /**< Half-duplex connection (see link_duplex). */ -#define ETH_LINK_HALF_DUPLEX RTE_ETH_LINK_HALF_DUPLEX #define RTE_ETH_LINK_FULL_DUPLEX 1 /**< Full-duplex connection (see link_duplex). */ -#define ETH_LINK_FULL_DUPLEX RTE_ETH_LINK_FULL_DUPLEX #define RTE_ETH_LINK_DOWN 0 /**< Link is down (see link_status). */ -#define ETH_LINK_DOWN RTE_ETH_LINK_DOWN #define RTE_ETH_LINK_UP 1 /**< Link is up (see link_status). */ -#define ETH_LINK_UP RTE_ETH_LINK_UP #define RTE_ETH_LINK_FIXED 0 /**< No autonegotiation (see link_autoneg). */ -#define ETH_LINK_FIXED RTE_ETH_LINK_FIXED #define RTE_ETH_LINK_AUTONEG 1 /**< Autonegotiated (see link_autoneg). */ -#define ETH_LINK_AUTONEG RTE_ETH_LINK_AUTONEG #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. @@ -401,13 +404,14 @@ struct rte_eth_thresh { * @see rte_eth_conf.rxmode.mq_mode. */ #define RTE_ETH_MQ_RX_RSS_FLAG RTE_BIT32(0) /**< Enable RSS. @see rte_eth_rss_conf */ -#define ETH_MQ_RX_RSS_FLAG RTE_ETH_MQ_RX_RSS_FLAG #define RTE_ETH_MQ_RX_DCB_FLAG RTE_BIT32(1) /**< Enable DCB. */ -#define ETH_MQ_RX_DCB_FLAG RTE_ETH_MQ_RX_DCB_FLAG #define RTE_ETH_MQ_RX_VMDQ_FLAG RTE_BIT32(2) /**< Enable VMDq. */ -#define ETH_MQ_RX_VMDQ_FLAG RTE_ETH_MQ_RX_VMDQ_FLAG /**@}*/ +#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. @@ -434,14 +438,14 @@ enum rte_eth_rx_mq_mode { RTE_ETH_MQ_RX_VMDQ_FLAG, }; -#define ETH_MQ_RX_NONE RTE_ETH_MQ_RX_NONE -#define ETH_MQ_RX_RSS RTE_ETH_MQ_RX_RSS -#define ETH_MQ_RX_DCB RTE_ETH_MQ_RX_DCB -#define ETH_MQ_RX_DCB_RSS RTE_ETH_MQ_RX_DCB_RSS -#define ETH_MQ_RX_VMDQ_ONLY RTE_ETH_MQ_RX_VMDQ_ONLY -#define ETH_MQ_RX_VMDQ_RSS RTE_ETH_MQ_RX_VMDQ_RSS -#define ETH_MQ_RX_VMDQ_DCB RTE_ETH_MQ_RX_VMDQ_DCB -#define ETH_MQ_RX_VMDQ_DCB_RSS RTE_ETH_MQ_RX_VMDQ_DCB_RSS +#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 @@ -453,10 +457,11 @@ enum rte_eth_tx_mq_mode { RTE_ETH_MQ_TX_VMDQ_DCB, /**< For Tx side,both DCB and VT is on. */ RTE_ETH_MQ_TX_VMDQ_ONLY, /**< Only VT on, no DCB */ }; -#define ETH_MQ_TX_NONE RTE_ETH_MQ_TX_NONE -#define ETH_MQ_TX_DCB RTE_ETH_MQ_TX_DCB -#define ETH_MQ_TX_VMDQ_DCB RTE_ETH_MQ_TX_VMDQ_DCB -#define ETH_MQ_TX_VMDQ_ONLY RTE_ETH_MQ_TX_VMDQ_ONLY + +#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. @@ -490,10 +495,10 @@ enum rte_vlan_type { RTE_ETH_VLAN_TYPE_MAX, }; -#define ETH_VLAN_TYPE_UNKNOWN RTE_ETH_VLAN_TYPE_UNKNOWN -#define ETH_VLAN_TYPE_INNER RTE_ETH_VLAN_TYPE_INNER -#define ETH_VLAN_TYPE_OUTER RTE_ETH_VLAN_TYPE_OUTER -#define ETH_VLAN_TYPE_MAX 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. @@ -566,69 +571,70 @@ struct rte_eth_rss_conf { * fill rte_eth_rss_conf.rss_hf or rte_flow_action_rss.types. */ #define RTE_ETH_RSS_IPV4 RTE_BIT64(2) -#define ETH_RSS_IPV4 RTE_ETH_RSS_IPV4 #define RTE_ETH_RSS_FRAG_IPV4 RTE_BIT64(3) -#define ETH_RSS_FRAG_IPV4 RTE_ETH_RSS_FRAG_IPV4 #define RTE_ETH_RSS_NONFRAG_IPV4_TCP RTE_BIT64(4) -#define ETH_RSS_NONFRAG_IPV4_TCP RTE_ETH_RSS_NONFRAG_IPV4_TCP #define RTE_ETH_RSS_NONFRAG_IPV4_UDP RTE_BIT64(5) -#define ETH_RSS_NONFRAG_IPV4_UDP RTE_ETH_RSS_NONFRAG_IPV4_UDP #define RTE_ETH_RSS_NONFRAG_IPV4_SCTP RTE_BIT64(6) -#define ETH_RSS_NONFRAG_IPV4_SCTP RTE_ETH_RSS_NONFRAG_IPV4_SCTP #define RTE_ETH_RSS_NONFRAG_IPV4_OTHER RTE_BIT64(7) -#define ETH_RSS_NONFRAG_IPV4_OTHER RTE_ETH_RSS_NONFRAG_IPV4_OTHER #define RTE_ETH_RSS_IPV6 RTE_BIT64(8) -#define ETH_RSS_IPV6 RTE_ETH_RSS_IPV6 #define RTE_ETH_RSS_FRAG_IPV6 RTE_BIT64(9) -#define ETH_RSS_FRAG_IPV6 RTE_ETH_RSS_FRAG_IPV6 #define RTE_ETH_RSS_NONFRAG_IPV6_TCP RTE_BIT64(10) -#define ETH_RSS_NONFRAG_IPV6_TCP RTE_ETH_RSS_NONFRAG_IPV6_TCP #define RTE_ETH_RSS_NONFRAG_IPV6_UDP RTE_BIT64(11) -#define ETH_RSS_NONFRAG_IPV6_UDP RTE_ETH_RSS_NONFRAG_IPV6_UDP #define RTE_ETH_RSS_NONFRAG_IPV6_SCTP RTE_BIT64(12) -#define ETH_RSS_NONFRAG_IPV6_SCTP RTE_ETH_RSS_NONFRAG_IPV6_SCTP #define RTE_ETH_RSS_NONFRAG_IPV6_OTHER RTE_BIT64(13) -#define ETH_RSS_NONFRAG_IPV6_OTHER RTE_ETH_RSS_NONFRAG_IPV6_OTHER #define RTE_ETH_RSS_L2_PAYLOAD RTE_BIT64(14) -#define ETH_RSS_L2_PAYLOAD RTE_ETH_RSS_L2_PAYLOAD #define RTE_ETH_RSS_IPV6_EX RTE_BIT64(15) -#define ETH_RSS_IPV6_EX RTE_ETH_RSS_IPV6_EX #define RTE_ETH_RSS_IPV6_TCP_EX RTE_BIT64(16) -#define ETH_RSS_IPV6_TCP_EX RTE_ETH_RSS_IPV6_TCP_EX #define RTE_ETH_RSS_IPV6_UDP_EX RTE_BIT64(17) -#define ETH_RSS_IPV6_UDP_EX RTE_ETH_RSS_IPV6_UDP_EX #define RTE_ETH_RSS_PORT RTE_BIT64(18) -#define ETH_RSS_PORT RTE_ETH_RSS_PORT #define RTE_ETH_RSS_VXLAN RTE_BIT64(19) -#define ETH_RSS_VXLAN RTE_ETH_RSS_VXLAN #define RTE_ETH_RSS_GENEVE RTE_BIT64(20) -#define ETH_RSS_GENEVE RTE_ETH_RSS_GENEVE #define RTE_ETH_RSS_NVGRE RTE_BIT64(21) -#define ETH_RSS_NVGRE RTE_ETH_RSS_NVGRE #define RTE_ETH_RSS_GTPU RTE_BIT64(23) -#define ETH_RSS_GTPU RTE_ETH_RSS_GTPU #define RTE_ETH_RSS_ETH RTE_BIT64(24) -#define ETH_RSS_ETH RTE_ETH_RSS_ETH #define RTE_ETH_RSS_S_VLAN RTE_BIT64(25) -#define ETH_RSS_S_VLAN RTE_ETH_RSS_S_VLAN #define RTE_ETH_RSS_C_VLAN RTE_BIT64(26) -#define ETH_RSS_C_VLAN RTE_ETH_RSS_C_VLAN #define RTE_ETH_RSS_ESP RTE_BIT64(27) -#define ETH_RSS_ESP RTE_ETH_RSS_ESP #define RTE_ETH_RSS_AH RTE_BIT64(28) -#define ETH_RSS_AH RTE_ETH_RSS_AH #define RTE_ETH_RSS_L2TPV3 RTE_BIT64(29) -#define ETH_RSS_L2TPV3 RTE_ETH_RSS_L2TPV3 #define RTE_ETH_RSS_PFCP RTE_BIT64(30) -#define ETH_RSS_PFCP RTE_ETH_RSS_PFCP #define RTE_ETH_RSS_PPPOE RTE_BIT64(31) -#define ETH_RSS_PPPOE RTE_ETH_RSS_PPPOE #define RTE_ETH_RSS_ECPRI RTE_BIT64(32) -#define ETH_RSS_ECPRI RTE_ETH_RSS_ECPRI #define RTE_ETH_RSS_MPLS RTE_BIT64(33) -#define ETH_RSS_MPLS RTE_ETH_RSS_MPLS #define RTE_ETH_RSS_IPV4_CHKSUM RTE_BIT64(34) -#define ETH_RSS_IPV4_CHKSUM RTE_ETH_RSS_IPV4_CHKSUM + +#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. @@ -643,7 +649,7 @@ 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_ETH_RSS_L4_CHKSUM +#define ETH_RSS_L4_CHKSUM RTE_DEPRECATED(ETH_RSS_L4_CHKSUM) RTE_ETH_RSS_L4_CHKSUM /* * We use the following macros to combine with above RTE_ETH_RSS_* for @@ -655,21 +661,22 @@ struct rte_eth_rss_conf { * them are added. */ #define RTE_ETH_RSS_L3_SRC_ONLY RTE_BIT64(63) -#define ETH_RSS_L3_SRC_ONLY RTE_ETH_RSS_L3_SRC_ONLY #define RTE_ETH_RSS_L3_DST_ONLY RTE_BIT64(62) -#define ETH_RSS_L3_DST_ONLY RTE_ETH_RSS_L3_DST_ONLY #define RTE_ETH_RSS_L4_SRC_ONLY RTE_BIT64(61) -#define ETH_RSS_L4_SRC_ONLY RTE_ETH_RSS_L4_SRC_ONLY #define RTE_ETH_RSS_L4_DST_ONLY RTE_BIT64(60) -#define ETH_RSS_L4_DST_ONLY RTE_ETH_RSS_L4_DST_ONLY #define RTE_ETH_RSS_L2_SRC_ONLY RTE_BIT64(59) -#define ETH_RSS_L2_SRC_ONLY RTE_ETH_RSS_L2_SRC_ONLY #define RTE_ETH_RSS_L2_DST_ONLY RTE_BIT64(58) -#define ETH_RSS_L2_DST_ONLY RTE_ETH_RSS_L2_DST_ONLY + +#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 + * https://tools.ietf.org/html/rfc6052 * Must be combined with RTE_ETH_RSS_IPV6, RTE_ETH_RSS_NONFRAG_IPV6_UDP, * RTE_ETH_RSS_NONFRAG_IPV6_TCP, RTE_ETH_RSS_NONFRAG_IPV6_SCTP. */ @@ -694,26 +701,27 @@ 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_ETH_RSS_LEVEL_PMD_DEFAULT +#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_ETH_RSS_LEVEL_OUTERMOST +#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 * encapsulation level, from outermost to innermost (lower to higher values). */ #define RTE_ETH_RSS_LEVEL_INNERMOST (UINT64_C(2) << 50) -#define ETH_RSS_LEVEL_INNERMOST RTE_ETH_RSS_LEVEL_INNERMOST #define RTE_ETH_RSS_LEVEL_MASK (UINT64_C(3) << 50) -#define ETH_RSS_LEVEL_MASK RTE_ETH_RSS_LEVEL_MASK + +#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_ETH_RSS_LEVEL(rss_hf) +#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 @@ -740,122 +748,122 @@ 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_ETH_RSS_IPV6_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_ETH_RSS_IPV6_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_ETH_RSS_IPV6_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_ETH_RSS_IPV6_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_ETH_RSS_IPV6_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_ETH_RSS_IPV6_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_ETH_RSS_IPV6_PRE32_UDP +#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_ETH_RSS_IPV6_PRE40_UDP +#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_ETH_RSS_IPV6_PRE48_UDP +#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_ETH_RSS_IPV6_PRE56_UDP +#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_ETH_RSS_IPV6_PRE64_UDP +#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_ETH_RSS_IPV6_PRE96_UDP +#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_ETH_RSS_IPV6_PRE32_TCP +#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_ETH_RSS_IPV6_PRE40_TCP +#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_ETH_RSS_IPV6_PRE48_TCP +#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_ETH_RSS_IPV6_PRE56_TCP +#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_ETH_RSS_IPV6_PRE64_TCP +#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_ETH_RSS_IPV6_PRE96_TCP +#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_ETH_RSS_IPV6_PRE32_SCTP +#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_ETH_RSS_IPV6_PRE40_SCTP +#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_ETH_RSS_IPV6_PRE48_SCTP +#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_ETH_RSS_IPV6_PRE56_SCTP +#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_ETH_RSS_IPV6_PRE64_SCTP +#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_ETH_RSS_IPV6_PRE96_SCTP +#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 | \ @@ -865,35 +873,35 @@ 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_ETH_RSS_IP +#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_ETH_RSS_UDP +#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_ETH_RSS_TCP +#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_ETH_RSS_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_ETH_RSS_TUNNEL +#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_ETH_RSS_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 ( \ @@ -918,7 +926,7 @@ 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_ETH_RSS_PROTO_MASK +#define ETH_RSS_PROTO_MASK RTE_DEPRECATED(ETH_RSS_PROTO_MASK) RTE_ETH_RSS_PROTO_MASK /* * Definitions used for redirection table entry size. @@ -926,84 +934,90 @@ rte_eth_rss_hf_refine(uint64_t rss_hf) * documentation or the description of relevant functions for more details. */ #define RTE_ETH_RSS_RETA_SIZE_64 64 -#define ETH_RSS_RETA_SIZE_64 RTE_ETH_RSS_RETA_SIZE_64 #define RTE_ETH_RSS_RETA_SIZE_128 128 -#define ETH_RSS_RETA_SIZE_128 RTE_ETH_RSS_RETA_SIZE_128 #define RTE_ETH_RSS_RETA_SIZE_256 256 -#define ETH_RSS_RETA_SIZE_256 RTE_ETH_RSS_RETA_SIZE_256 #define RTE_ETH_RSS_RETA_SIZE_512 512 -#define ETH_RSS_RETA_SIZE_512 RTE_ETH_RSS_RETA_SIZE_512 #define RTE_ETH_RETA_GROUP_SIZE 64 -#define RTE_RETA_GROUP_SIZE RTE_ETH_RETA_GROUP_SIZE + +#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 ETH_VMDQ_MAX_VLAN_FILTERS RTE_ETH_VMDQ_MAX_VLAN_FILTERS #define RTE_ETH_DCB_NUM_USER_PRIORITIES 8 /**< Maximum nb. of DCB priorities. */ -#define ETH_DCB_NUM_USER_PRIORITIES RTE_ETH_DCB_NUM_USER_PRIORITIES #define RTE_ETH_VMDQ_DCB_NUM_QUEUES 128 /**< Maximum nb. of VMDq DCB queues. */ -#define ETH_VMDQ_DCB_NUM_QUEUES RTE_ETH_VMDQ_DCB_NUM_QUEUES #define RTE_ETH_DCB_NUM_QUEUES 128 /**< Maximum nb. of DCB queues. */ -#define ETH_DCB_NUM_QUEUES RTE_ETH_DCB_NUM_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 ETH_DCB_PG_SUPPORT RTE_ETH_DCB_PG_SUPPORT #define RTE_ETH_DCB_PFC_SUPPORT RTE_BIT32(1) /**< Priority Flow Control support. */ -#define ETH_DCB_PFC_SUPPORT RTE_ETH_DCB_PFC_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 ETH_VLAN_STRIP_OFFLOAD RTE_ETH_VLAN_STRIP_OFFLOAD #define RTE_ETH_VLAN_FILTER_OFFLOAD 0x0002 /**< VLAN Filter On/Off */ -#define ETH_VLAN_FILTER_OFFLOAD RTE_ETH_VLAN_FILTER_OFFLOAD #define RTE_ETH_VLAN_EXTEND_OFFLOAD 0x0004 /**< VLAN Extend On/Off */ -#define ETH_VLAN_EXTEND_OFFLOAD RTE_ETH_VLAN_EXTEND_OFFLOAD #define RTE_ETH_QINQ_STRIP_OFFLOAD 0x0008 /**< QINQ Strip On/Off */ -#define ETH_QINQ_STRIP_OFFLOAD RTE_ETH_QINQ_STRIP_OFFLOAD + +#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 ETH_VLAN_STRIP_MASK RTE_ETH_VLAN_STRIP_MASK #define RTE_ETH_VLAN_FILTER_MASK 0x0002 /**< VLAN Filter setting mask*/ -#define ETH_VLAN_FILTER_MASK RTE_ETH_VLAN_FILTER_MASK #define RTE_ETH_VLAN_EXTEND_MASK 0x0004 /**< VLAN Extend setting mask*/ -#define ETH_VLAN_EXTEND_MASK RTE_ETH_VLAN_EXTEND_MASK #define RTE_ETH_QINQ_STRIP_MASK 0x0008 /**< QINQ Strip setting mask */ -#define ETH_QINQ_STRIP_MASK RTE_ETH_QINQ_STRIP_MASK #define RTE_ETH_VLAN_ID_MAX 0x0FFF /**< VLAN ID is in lower 12 bits*/ -#define ETH_VLAN_ID_MAX RTE_ETH_VLAN_ID_MAX /**@}*/ +#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_ETH_NUM_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. */ -#define ETH_VMDQ_NUM_UC_HASH_ARRAY RTE_ETH_VMDQ_NUM_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 */ /** Accept untagged packets. */ #define RTE_ETH_VMDQ_ACCEPT_UNTAG RTE_BIT32(0) -#define ETH_VMDQ_ACCEPT_UNTAG RTE_ETH_VMDQ_ACCEPT_UNTAG /** Accept packets in multicast table. */ #define RTE_ETH_VMDQ_ACCEPT_HASH_MC RTE_BIT32(1) -#define ETH_VMDQ_ACCEPT_HASH_MC RTE_ETH_VMDQ_ACCEPT_HASH_MC /** Accept packets in unicast table. */ #define RTE_ETH_VMDQ_ACCEPT_HASH_UC RTE_BIT32(2) -#define ETH_VMDQ_ACCEPT_HASH_UC RTE_ETH_VMDQ_ACCEPT_HASH_UC /** Accept broadcast packets. */ #define RTE_ETH_VMDQ_ACCEPT_BROADCAST RTE_BIT32(3) -#define ETH_VMDQ_ACCEPT_BROADCAST RTE_ETH_VMDQ_ACCEPT_BROADCAST /** Multicast promiscuous. */ #define RTE_ETH_VMDQ_ACCEPT_MULTICAST RTE_BIT32(4) -#define ETH_VMDQ_ACCEPT_MULTICAST RTE_ETH_VMDQ_ACCEPT_MULTICAST /**@}*/ +#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 @@ -1025,8 +1039,8 @@ 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_ETH_4_TCS -#define ETH_8_TCS RTE_ETH_8_TCS +#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 @@ -1038,10 +1052,10 @@ 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_ETH_8_POOLS -#define ETH_16_POOLS RTE_ETH_16_POOLS -#define ETH_32_POOLS RTE_ETH_32_POOLS -#define ETH_64_POOLS RTE_ETH_64_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 { @@ -1364,11 +1378,10 @@ 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_ETH_FC_NONE -#define RTE_FC_RX_PAUSE RTE_ETH_FC_RX_PAUSE -#define RTE_FC_TX_PAUSE RTE_ETH_FC_TX_PAUSE -#define RTE_FC_FULL RTE_ETH_FC_FULL +#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. @@ -1411,17 +1424,16 @@ enum rte_eth_tunnel_type { RTE_ETH_TUNNEL_TYPE_ECPRI, RTE_ETH_TUNNEL_TYPE_MAX, }; - -#define RTE_TUNNEL_TYPE_NONE RTE_ETH_TUNNEL_TYPE_NONE -#define RTE_TUNNEL_TYPE_VXLAN RTE_ETH_TUNNEL_TYPE_VXLAN -#define RTE_TUNNEL_TYPE_GENEVE RTE_ETH_TUNNEL_TYPE_GENEVE -#define RTE_TUNNEL_TYPE_TEREDO RTE_ETH_TUNNEL_TYPE_TEREDO -#define RTE_TUNNEL_TYPE_NVGRE RTE_ETH_TUNNEL_TYPE_NVGRE -#define RTE_TUNNEL_TYPE_IP_IN_GRE RTE_ETH_TUNNEL_TYPE_IP_IN_GRE -#define RTE_L2_TUNNEL_TYPE_E_TAG RTE_ETH_L2_TUNNEL_TYPE_E_TAG -#define RTE_TUNNEL_TYPE_VXLAN_GPE RTE_ETH_TUNNEL_TYPE_VXLAN_GPE -#define RTE_TUNNEL_TYPE_ECPRI RTE_ETH_TUNNEL_TYPE_ECPRI -#define RTE_TUNNEL_TYPE_MAX 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" @@ -1437,9 +1449,9 @@ enum rte_eth_fdir_pballoc_type { }; #define rte_fdir_pballoc_type rte_eth_fdir_pballoc_type -#define RTE_FDIR_PBALLOC_64K RTE_ETH_FDIR_PBALLOC_64K -#define RTE_FDIR_PBALLOC_128K RTE_ETH_FDIR_PBALLOC_128K -#define RTE_FDIR_PBALLOC_256K RTE_ETH_FDIR_PBALLOC_256K +#define RTE_FDIR_PBALLOC_64K RTE_DEPRECATED(RTE_FDIR_PBALLOC_64K) RTE_ETH_FDIR_PBALLOC_64K +#define RTE_FDIR_PBALLOC_128K RTE_DEPRECATED(RTE_FDIR_PBALLOC_128K) RTE_ETH_FDIR_PBALLOC_128K +#define RTE_FDIR_PBALLOC_256K RTE_DEPRECATED(RTE_FDIR_PBALLOC_256K) RTE_ETH_FDIR_PBALLOC_256K /** * Select report mode of FDIR hash information in Rx descriptors. @@ -1466,7 +1478,6 @@ struct rte_eth_fdir_conf { /** Flex payload configuration. */ struct rte_eth_fdir_flex_conf flex_conf; }; - #define rte_fdir_conf rte_eth_fdir_conf /** @@ -1545,57 +1556,58 @@ struct rte_eth_conf { * Rx offload capabilities of a device. */ #define RTE_ETH_RX_OFFLOAD_VLAN_STRIP RTE_BIT64(0) -#define DEV_RX_OFFLOAD_VLAN_STRIP RTE_ETH_RX_OFFLOAD_VLAN_STRIP #define RTE_ETH_RX_OFFLOAD_IPV4_CKSUM RTE_BIT64(1) -#define DEV_RX_OFFLOAD_IPV4_CKSUM RTE_ETH_RX_OFFLOAD_IPV4_CKSUM #define RTE_ETH_RX_OFFLOAD_UDP_CKSUM RTE_BIT64(2) -#define DEV_RX_OFFLOAD_UDP_CKSUM RTE_ETH_RX_OFFLOAD_UDP_CKSUM #define RTE_ETH_RX_OFFLOAD_TCP_CKSUM RTE_BIT64(3) -#define DEV_RX_OFFLOAD_TCP_CKSUM RTE_ETH_RX_OFFLOAD_TCP_CKSUM #define RTE_ETH_RX_OFFLOAD_TCP_LRO RTE_BIT64(4) -#define DEV_RX_OFFLOAD_TCP_LRO RTE_ETH_RX_OFFLOAD_TCP_LRO #define RTE_ETH_RX_OFFLOAD_QINQ_STRIP RTE_BIT64(5) -#define DEV_RX_OFFLOAD_QINQ_STRIP RTE_ETH_RX_OFFLOAD_QINQ_STRIP #define RTE_ETH_RX_OFFLOAD_OUTER_IPV4_CKSUM RTE_BIT64(6) -#define DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM RTE_ETH_RX_OFFLOAD_OUTER_IPV4_CKSUM #define RTE_ETH_RX_OFFLOAD_MACSEC_STRIP RTE_BIT64(7) -#define DEV_RX_OFFLOAD_MACSEC_STRIP RTE_ETH_RX_OFFLOAD_MACSEC_STRIP #define RTE_ETH_RX_OFFLOAD_HEADER_SPLIT RTE_BIT64(8) -#define DEV_RX_OFFLOAD_HEADER_SPLIT RTE_ETH_RX_OFFLOAD_HEADER_SPLIT #define RTE_ETH_RX_OFFLOAD_VLAN_FILTER RTE_BIT64(9) -#define DEV_RX_OFFLOAD_VLAN_FILTER RTE_ETH_RX_OFFLOAD_VLAN_FILTER #define RTE_ETH_RX_OFFLOAD_VLAN_EXTEND RTE_BIT64(10) -#define DEV_RX_OFFLOAD_VLAN_EXTEND RTE_ETH_RX_OFFLOAD_VLAN_EXTEND #define RTE_ETH_RX_OFFLOAD_SCATTER RTE_BIT64(13) -#define DEV_RX_OFFLOAD_SCATTER RTE_ETH_RX_OFFLOAD_SCATTER /** * Timestamp is set by the driver in RTE_MBUF_DYNFIELD_TIMESTAMP_NAME * and RTE_MBUF_DYNFLAG_RX_TIMESTAMP_NAME is set in ol_flags. * The mbuf field and flag are registered when the offload is configured. */ #define RTE_ETH_RX_OFFLOAD_TIMESTAMP RTE_BIT64(14) -#define DEV_RX_OFFLOAD_TIMESTAMP RTE_ETH_RX_OFFLOAD_TIMESTAMP #define RTE_ETH_RX_OFFLOAD_SECURITY RTE_BIT64(15) -#define DEV_RX_OFFLOAD_SECURITY RTE_ETH_RX_OFFLOAD_SECURITY #define RTE_ETH_RX_OFFLOAD_KEEP_CRC RTE_BIT64(16) -#define DEV_RX_OFFLOAD_KEEP_CRC RTE_ETH_RX_OFFLOAD_KEEP_CRC #define RTE_ETH_RX_OFFLOAD_SCTP_CKSUM RTE_BIT64(17) -#define DEV_RX_OFFLOAD_SCTP_CKSUM RTE_ETH_RX_OFFLOAD_SCTP_CKSUM #define RTE_ETH_RX_OFFLOAD_OUTER_UDP_CKSUM RTE_BIT64(18) -#define DEV_RX_OFFLOAD_OUTER_UDP_CKSUM RTE_ETH_RX_OFFLOAD_OUTER_UDP_CKSUM #define RTE_ETH_RX_OFFLOAD_RSS_HASH RTE_BIT64(19) -#define DEV_RX_OFFLOAD_RSS_HASH RTE_ETH_RX_OFFLOAD_RSS_HASH #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_ETH_RX_OFFLOAD_CHECKSUM +#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_ETH_RX_OFFLOAD_VLAN +#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 @@ -1606,80 +1618,81 @@ struct rte_eth_conf { * Tx offload capabilities of a device. */ #define RTE_ETH_TX_OFFLOAD_VLAN_INSERT RTE_BIT64(0) -#define DEV_TX_OFFLOAD_VLAN_INSERT RTE_ETH_TX_OFFLOAD_VLAN_INSERT #define RTE_ETH_TX_OFFLOAD_IPV4_CKSUM RTE_BIT64(1) -#define DEV_TX_OFFLOAD_IPV4_CKSUM RTE_ETH_TX_OFFLOAD_IPV4_CKSUM #define RTE_ETH_TX_OFFLOAD_UDP_CKSUM RTE_BIT64(2) -#define DEV_TX_OFFLOAD_UDP_CKSUM RTE_ETH_TX_OFFLOAD_UDP_CKSUM #define RTE_ETH_TX_OFFLOAD_TCP_CKSUM RTE_BIT64(3) -#define DEV_TX_OFFLOAD_TCP_CKSUM RTE_ETH_TX_OFFLOAD_TCP_CKSUM #define RTE_ETH_TX_OFFLOAD_SCTP_CKSUM RTE_BIT64(4) -#define DEV_TX_OFFLOAD_SCTP_CKSUM RTE_ETH_TX_OFFLOAD_SCTP_CKSUM #define RTE_ETH_TX_OFFLOAD_TCP_TSO RTE_BIT64(5) -#define DEV_TX_OFFLOAD_TCP_TSO RTE_ETH_TX_OFFLOAD_TCP_TSO #define RTE_ETH_TX_OFFLOAD_UDP_TSO RTE_BIT64(6) -#define DEV_TX_OFFLOAD_UDP_TSO RTE_ETH_TX_OFFLOAD_UDP_TSO #define RTE_ETH_TX_OFFLOAD_OUTER_IPV4_CKSUM RTE_BIT64(7) /**< Used for tunneling packet. */ -#define DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM RTE_ETH_TX_OFFLOAD_OUTER_IPV4_CKSUM #define RTE_ETH_TX_OFFLOAD_QINQ_INSERT RTE_BIT64(8) -#define DEV_TX_OFFLOAD_QINQ_INSERT RTE_ETH_TX_OFFLOAD_QINQ_INSERT #define RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO RTE_BIT64(9) /**< Used for tunneling packet. */ -#define DEV_TX_OFFLOAD_VXLAN_TNL_TSO RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO #define RTE_ETH_TX_OFFLOAD_GRE_TNL_TSO RTE_BIT64(10) /**< Used for tunneling packet. */ -#define DEV_TX_OFFLOAD_GRE_TNL_TSO RTE_ETH_TX_OFFLOAD_GRE_TNL_TSO #define RTE_ETH_TX_OFFLOAD_IPIP_TNL_TSO RTE_BIT64(11) /**< Used for tunneling packet. */ -#define DEV_TX_OFFLOAD_IPIP_TNL_TSO RTE_ETH_TX_OFFLOAD_IPIP_TNL_TSO #define RTE_ETH_TX_OFFLOAD_GENEVE_TNL_TSO RTE_BIT64(12) /**< Used for tunneling packet. */ -#define DEV_TX_OFFLOAD_GENEVE_TNL_TSO RTE_ETH_TX_OFFLOAD_GENEVE_TNL_TSO #define RTE_ETH_TX_OFFLOAD_MACSEC_INSERT RTE_BIT64(13) -#define DEV_TX_OFFLOAD_MACSEC_INSERT RTE_ETH_TX_OFFLOAD_MACSEC_INSERT /** * Multiple threads can invoke rte_eth_tx_burst() concurrently on the same * Tx queue without SW lock. */ #define RTE_ETH_TX_OFFLOAD_MT_LOCKFREE RTE_BIT64(14) -#define DEV_TX_OFFLOAD_MT_LOCKFREE RTE_ETH_TX_OFFLOAD_MT_LOCKFREE /** Device supports multi segment send. */ #define RTE_ETH_TX_OFFLOAD_MULTI_SEGS RTE_BIT64(15) -#define DEV_TX_OFFLOAD_MULTI_SEGS RTE_ETH_TX_OFFLOAD_MULTI_SEGS /** * Device supports optimization for fast release of mbufs. * When set application must guarantee that per-queue all mbufs comes from * the same mempool and has refcnt = 1. */ #define RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE RTE_BIT64(16) -#define DEV_TX_OFFLOAD_MBUF_FAST_FREE RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE #define RTE_ETH_TX_OFFLOAD_SECURITY RTE_BIT64(17) -#define DEV_TX_OFFLOAD_SECURITY RTE_ETH_TX_OFFLOAD_SECURITY /** * Device supports generic UDP tunneled packet TSO. * Application must set RTE_MBUF_F_TX_TUNNEL_UDP and other mbuf fields required * for tunnel TSO. */ #define RTE_ETH_TX_OFFLOAD_UDP_TNL_TSO RTE_BIT64(18) -#define DEV_TX_OFFLOAD_UDP_TNL_TSO RTE_ETH_TX_OFFLOAD_UDP_TNL_TSO /** * Device supports generic IP tunneled packet TSO. * Application must set RTE_MBUF_F_TX_TUNNEL_IP and other mbuf fields required * for tunnel TSO. */ #define RTE_ETH_TX_OFFLOAD_IP_TNL_TSO RTE_BIT64(19) -#define DEV_TX_OFFLOAD_IP_TNL_TSO RTE_ETH_TX_OFFLOAD_IP_TNL_TSO /** Device supports outer UDP checksum */ #define RTE_ETH_TX_OFFLOAD_OUTER_UDP_CKSUM RTE_BIT64(20) -#define DEV_TX_OFFLOAD_OUTER_UDP_CKSUM RTE_ETH_TX_OFFLOAD_OUTER_UDP_CKSUM /** * Device sends on time read from RTE_MBUF_DYNFIELD_TIMESTAMP_NAME * if RTE_MBUF_DYNFLAG_TX_TIMESTAMP_NAME is set in ol_flags. * The mbuf field and flag are registered when the offload is configured. */ #define RTE_ETH_TX_OFFLOAD_SEND_ON_TIMESTAMP RTE_BIT64(21) -#define DEV_TX_OFFLOAD_SEND_ON_TIMESTAMP RTE_ETH_TX_OFFLOAD_SEND_ON_TIMESTAMP /* * If new Tx offload capabilities are defined, they also must be * 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. */ @@ -1931,9 +1944,10 @@ struct rte_eth_xstat_name { }; #define RTE_ETH_DCB_NUM_TCS 8 -#define ETH_DCB_NUM_TCS RTE_ETH_DCB_NUM_TCS #define RTE_ETH_MAX_VMDQ_POOL 64 -#define ETH_MAX_VMDQ_POOL RTE_ETH_MAX_VMDQ_POOL + +#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 -- 2.31.1 ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [dpdk-dev] [PATCH v2] ethdev: mark old macros as deprecated 2021-11-03 22:48 ` [dpdk-dev] [PATCH v2] " Ferruh Yigit @ 2021-11-04 11:03 ` Ferruh Yigit 2021-11-04 12:59 ` Thomas Monjalon 2022-01-12 14:36 ` [PATCH v3] " Ferruh Yigit 1 sibling, 1 reply; 21+ messages in thread From: Ferruh Yigit @ 2021-11-04 11:03 UTC (permalink / raw) To: Thomas Monjalon, Andrew Rybchenko Cc: dev, Stephen Hemminger, David Marchand, Olivier Matz On 11/3/2021 10:48 PM, Ferruh Yigit wrote: > Old macros kept for backward compatibility, but this cause old macro > usage to sneak in silently. > > Marking old macros as deprecated. Downside is this will cause some noise > for applications that are using old macros. > > Fixes: 295968d17407 ("ethdev: add namespace") > > Signed-off-by: Ferruh Yigit<ferruh.yigit@intel.com> > Acked-by: Stephen Hemminger<stephen@networkplumber.org> Hi Thomas, Andrew, What do you think about marking old macros as deprecated? This will cause warning in application code that is using old macros, but shouldn't fail their build (unless -Werror is issued). ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [dpdk-dev] [PATCH v2] ethdev: mark old macros as deprecated 2021-11-04 11:03 ` Ferruh Yigit @ 2021-11-04 12:59 ` Thomas Monjalon 2021-11-05 13:40 ` Andrew Rybchenko 0 siblings, 1 reply; 21+ messages in thread From: Thomas Monjalon @ 2021-11-04 12:59 UTC (permalink / raw) To: Andrew Rybchenko, Ferruh Yigit Cc: dev, Stephen Hemminger, David Marchand, Olivier Matz 04/11/2021 12:03, Ferruh Yigit: > On 11/3/2021 10:48 PM, Ferruh Yigit wrote: > > Old macros kept for backward compatibility, but this cause old macro > > usage to sneak in silently. > > > > Marking old macros as deprecated. Downside is this will cause some noise > > for applications that are using old macros. > > > > Fixes: 295968d17407 ("ethdev: add namespace") > > > > Signed-off-by: Ferruh Yigit<ferruh.yigit@intel.com> > > Acked-by: Stephen Hemminger<stephen@networkplumber.org> > > Hi Thomas, Andrew, > > What do you think about marking old macros as deprecated? > > This will cause warning in application code that is using > old macros, but shouldn't fail their build (unless -Werror > is issued). It looks to be the right thing to do. I wonder whether we could wait 22.02 to apply it, so users of LTS are not annoyed by it. ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [dpdk-dev] [PATCH v2] ethdev: mark old macros as deprecated 2021-11-04 12:59 ` Thomas Monjalon @ 2021-11-05 13:40 ` Andrew Rybchenko 2021-11-05 15:05 ` Thomas Monjalon 0 siblings, 1 reply; 21+ messages in thread From: Andrew Rybchenko @ 2021-11-05 13:40 UTC (permalink / raw) To: Thomas Monjalon, Ferruh Yigit Cc: dev, Stephen Hemminger, David Marchand, Olivier Matz On 11/4/21 3:59 PM, Thomas Monjalon wrote: > 04/11/2021 12:03, Ferruh Yigit: >> On 11/3/2021 10:48 PM, Ferruh Yigit wrote: >>> Old macros kept for backward compatibility, but this cause old macro >>> usage to sneak in silently. >>> >>> Marking old macros as deprecated. Downside is this will cause some noise >>> for applications that are using old macros. >>> >>> Fixes: 295968d17407 ("ethdev: add namespace") >>> >>> Signed-off-by: Ferruh Yigit<ferruh.yigit@intel.com> >>> Acked-by: Stephen Hemminger<stephen@networkplumber.org> >> >> Hi Thomas, Andrew, >> >> What do you think about marking old macros as deprecated? >> >> This will cause warning in application code that is using >> old macros, but shouldn't fail their build (unless -Werror >> is issued). > > It looks to be the right thing to do. > I wonder whether we could wait 22.02 to apply it, > so users of LTS are not annoyed by it. > I have no strong opinion, but tend to agree with Thomas. However, if an application jumps from LTS to LTS, these defines will be available in 21.11 without any warnings and simply disappear in 22.11. So, may be it is more friendly to deprecate in 21.11. ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [dpdk-dev] [PATCH v2] ethdev: mark old macros as deprecated 2021-11-05 13:40 ` Andrew Rybchenko @ 2021-11-05 15:05 ` Thomas Monjalon 2021-11-05 16:26 ` Stephen Hemminger 0 siblings, 1 reply; 21+ messages in thread From: Thomas Monjalon @ 2021-11-05 15:05 UTC (permalink / raw) To: Ferruh Yigit, Andrew Rybchenko Cc: dev, Stephen Hemminger, David Marchand, Olivier Matz 05/11/2021 14:40, Andrew Rybchenko: > On 11/4/21 3:59 PM, Thomas Monjalon wrote: > > 04/11/2021 12:03, Ferruh Yigit: > >> On 11/3/2021 10:48 PM, Ferruh Yigit wrote: > >>> Old macros kept for backward compatibility, but this cause old macro > >>> usage to sneak in silently. > >>> > >>> Marking old macros as deprecated. Downside is this will cause some noise > >>> for applications that are using old macros. > >>> > >>> Fixes: 295968d17407 ("ethdev: add namespace") > >>> > >>> Signed-off-by: Ferruh Yigit<ferruh.yigit@intel.com> > >>> Acked-by: Stephen Hemminger<stephen@networkplumber.org> > >> > >> Hi Thomas, Andrew, > >> > >> What do you think about marking old macros as deprecated? > >> > >> This will cause warning in application code that is using > >> old macros, but shouldn't fail their build (unless -Werror > >> is issued). > > > > It looks to be the right thing to do. > > I wonder whether we could wait 22.02 to apply it, > > so users of LTS are not annoyed by it. > > I have no strong opinion, but tend to agree with Thomas. > However, if an application jumps from LTS to LTS, these > defines will be available in 21.11 without any warnings > and simply disappear in 22.11. So, may be it is more > friendly to deprecate in 21.11. That's true for a lot of deprecations done in the year. Jumping from LTS to LTS is for production. Intermediate releases should help in the upgrade preparation process. ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [dpdk-dev] [PATCH v2] ethdev: mark old macros as deprecated 2021-11-05 15:05 ` Thomas Monjalon @ 2021-11-05 16:26 ` Stephen Hemminger 2021-11-05 21:33 ` Ferruh Yigit 0 siblings, 1 reply; 21+ messages in thread From: Stephen Hemminger @ 2021-11-05 16:26 UTC (permalink / raw) To: Thomas Monjalon Cc: Ferruh Yigit, Andrew Rybchenko, dev, David Marchand, Olivier Matz On Fri, 05 Nov 2021 16:05:14 +0100 Thomas Monjalon <thomas@monjalon.net> wrote: > > >> > > >> What do you think about marking old macros as deprecated? > > >> > > >> This will cause warning in application code that is using > > >> old macros, but shouldn't fail their build (unless -Werror > > >> is issued). > > > > > > It looks to be the right thing to do. > > > I wonder whether we could wait 22.02 to apply it, > > > so users of LTS are not annoyed by it. > > > > I have no strong opinion, but tend to agree with Thomas. > > However, if an application jumps from LTS to LTS, these > > defines will be available in 21.11 without any warnings > > and simply disappear in 22.11. So, may be it is more > > friendly to deprecate in 21.11. > > That's true for a lot of deprecations done in the year. > Jumping from LTS to LTS is for production. > Intermediate releases should help in the upgrade preparation process. Agree, the deprecation cycle is long enough and it is just a trivial warning easy to fix, or for those that ignore warnings they just won't care. ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [dpdk-dev] [PATCH v2] ethdev: mark old macros as deprecated 2021-11-05 16:26 ` Stephen Hemminger @ 2021-11-05 21:33 ` Ferruh Yigit 2021-11-06 7:46 ` Thomas Monjalon 0 siblings, 1 reply; 21+ messages in thread From: Ferruh Yigit @ 2021-11-05 21:33 UTC (permalink / raw) To: Stephen Hemminger, Thomas Monjalon Cc: Andrew Rybchenko, dev, David Marchand, Olivier Matz On 11/5/2021 4:26 PM, Stephen Hemminger wrote: > On Fri, 05 Nov 2021 16:05:14 +0100 > Thomas Monjalon <thomas@monjalon.net> wrote: > >>>>> >>>>> What do you think about marking old macros as deprecated? >>>>> >>>>> This will cause warning in application code that is using >>>>> old macros, but shouldn't fail their build (unless -Werror >>>>> is issued). >>>> >>>> It looks to be the right thing to do. >>>> I wonder whether we could wait 22.02 to apply it, >>>> so users of LTS are not annoyed by it. >>> >>> I have no strong opinion, but tend to agree with Thomas. >>> However, if an application jumps from LTS to LTS, these >>> defines will be available in 21.11 without any warnings >>> and simply disappear in 22.11. So, may be it is more >>> friendly to deprecate in 21.11. >> >> That's true for a lot of deprecations done in the year. >> Jumping from LTS to LTS is for production. >> Intermediate releases should help in the upgrade preparation process. > > Agree, the deprecation cycle is long enough and it is just a > trivial warning easy to fix, or for those that ignore warnings > they just won't care. > I think Thomas is suggesting to postpone the patch to v22.02, is it what you agree? If so, plan is: - Have v21.11 without this patch. So backward compatibility macros won't be deprecated in v21.11, and end users won't be affected from the rename at all. - v22.02 will have this patch that deprecates the old macros. End user will get build warnings after this point. - Remove deprecated macros on v22.11. If this time is agreed on, I will send a deprecation notice patch for it. ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [dpdk-dev] [PATCH v2] ethdev: mark old macros as deprecated 2021-11-05 21:33 ` Ferruh Yigit @ 2021-11-06 7:46 ` Thomas Monjalon 0 siblings, 0 replies; 21+ messages in thread From: Thomas Monjalon @ 2021-11-06 7:46 UTC (permalink / raw) To: Stephen Hemminger, Ferruh Yigit, Andrew Rybchenko Cc: dev, David Marchand, Olivier Matz 05/11/2021 22:33, Ferruh Yigit: > On 11/5/2021 4:26 PM, Stephen Hemminger wrote: > > On Fri, 05 Nov 2021 16:05:14 +0100 > > Thomas Monjalon <thomas@monjalon.net> wrote: > > > >>>>> > >>>>> What do you think about marking old macros as deprecated? > >>>>> > >>>>> This will cause warning in application code that is using > >>>>> old macros, but shouldn't fail their build (unless -Werror > >>>>> is issued). > >>>> > >>>> It looks to be the right thing to do. > >>>> I wonder whether we could wait 22.02 to apply it, > >>>> so users of LTS are not annoyed by it. > >>> > >>> I have no strong opinion, but tend to agree with Thomas. > >>> However, if an application jumps from LTS to LTS, these > >>> defines will be available in 21.11 without any warnings > >>> and simply disappear in 22.11. So, may be it is more > >>> friendly to deprecate in 21.11. > >> > >> That's true for a lot of deprecations done in the year. > >> Jumping from LTS to LTS is for production. > >> Intermediate releases should help in the upgrade preparation process. > > > > Agree, the deprecation cycle is long enough and it is just a > > trivial warning easy to fix, or for those that ignore warnings > > they just won't care. > > > > I think Thomas is suggesting to postpone the patch to v22.02, is it > what you agree? > > If so, plan is: > - Have v21.11 without this patch. So backward compatibility macros > won't be deprecated in v21.11, and end users won't be affected > from the rename at all. > - v22.02 will have this patch that deprecates the old macros. End > user will get build warnings after this point. > - Remove deprecated macros on v22.11. If this time is agreed on, > I will send a deprecation notice patch for it. That's exactly my thinking. ^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH v3] ethdev: mark old macros as deprecated 2021-11-03 22:48 ` [dpdk-dev] [PATCH v2] " Ferruh Yigit 2021-11-04 11:03 ` Ferruh Yigit @ 2022-01-12 14:36 ` Ferruh Yigit 2022-01-14 6:45 ` Xia, Chenbo 1 sibling, 1 reply; 21+ messages in thread From: Ferruh Yigit @ 2022-01-12 14:36 UTC (permalink / raw) To: Thomas Monjalon, Andrew Rybchenko, Hemant Agrawal, Tyler Retzlaff, Chenbo Xia, Jerin Jacob Cc: dev, Ferruh Yigit, Stephen Hemminger Old macros kept for backward compatibility, but this cause old macro usage to sneak in silently. Marking old macros as deprecated. Downside is this will cause some noise for applications that are using old macros. Fixes: 295968d17407 ("ethdev: add namespace") Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com> Acked-by: Stephen Hemminger <stephen@networkplumber.org> --- v2: * Release notes updated v3: * Update 22.03 release note --- doc/guides/rel_notes/release_22_03.rst | 3 + lib/ethdev/rte_ethdev.h | 474 +++++++++++++------------ 2 files changed, 247 insertions(+), 230 deletions(-) diff --git a/doc/guides/rel_notes/release_22_03.rst b/doc/guides/rel_notes/release_22_03.rst index 6d99d1eaa94a..16c66c0641d4 100644 --- a/doc/guides/rel_notes/release_22_03.rst +++ b/doc/guides/rel_notes/release_22_03.rst @@ -84,6 +84,9 @@ API Changes Also, make sure to start the actual text at the margin. ======================================================= +* ethdev: Old public macros and enumeration constants without ``RTE_ETH_`` prefix, + which are kept for backward compatibility, are marked as deprecated. + ABI Changes ----------- diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h index fa299c8ad70e..147cc1ced36a 100644 --- a/lib/ethdev/rte_ethdev.h +++ b/lib/ethdev/rte_ethdev.h @@ -288,76 +288,78 @@ struct rte_eth_stats { * Device supported speeds bitmap flags */ #define RTE_ETH_LINK_SPEED_AUTONEG 0 /**< Autonegotiate (all speeds) */ -#define ETH_LINK_SPEED_AUTONEG RTE_ETH_LINK_SPEED_AUTONEG #define RTE_ETH_LINK_SPEED_FIXED RTE_BIT32(0) /**< Disable autoneg (fixed speed) */ -#define ETH_LINK_SPEED_FIXED RTE_ETH_LINK_SPEED_FIXED #define RTE_ETH_LINK_SPEED_10M_HD RTE_BIT32(1) /**< 10 Mbps half-duplex */ -#define ETH_LINK_SPEED_10M_HD RTE_ETH_LINK_SPEED_10M_HD #define RTE_ETH_LINK_SPEED_10M RTE_BIT32(2) /**< 10 Mbps full-duplex */ -#define ETH_LINK_SPEED_10M RTE_ETH_LINK_SPEED_10M #define RTE_ETH_LINK_SPEED_100M_HD RTE_BIT32(3) /**< 100 Mbps half-duplex */ -#define ETH_LINK_SPEED_100M_HD RTE_ETH_LINK_SPEED_100M_HD #define RTE_ETH_LINK_SPEED_100M RTE_BIT32(4) /**< 100 Mbps full-duplex */ -#define ETH_LINK_SPEED_100M RTE_ETH_LINK_SPEED_100M #define RTE_ETH_LINK_SPEED_1G RTE_BIT32(5) /**< 1 Gbps */ -#define ETH_LINK_SPEED_1G RTE_ETH_LINK_SPEED_1G #define RTE_ETH_LINK_SPEED_2_5G RTE_BIT32(6) /**< 2.5 Gbps */ -#define ETH_LINK_SPEED_2_5G RTE_ETH_LINK_SPEED_2_5G #define RTE_ETH_LINK_SPEED_5G RTE_BIT32(7) /**< 5 Gbps */ -#define ETH_LINK_SPEED_5G RTE_ETH_LINK_SPEED_5G #define RTE_ETH_LINK_SPEED_10G RTE_BIT32(8) /**< 10 Gbps */ -#define ETH_LINK_SPEED_10G RTE_ETH_LINK_SPEED_10G #define RTE_ETH_LINK_SPEED_20G RTE_BIT32(9) /**< 20 Gbps */ -#define ETH_LINK_SPEED_20G RTE_ETH_LINK_SPEED_20G #define RTE_ETH_LINK_SPEED_25G RTE_BIT32(10) /**< 25 Gbps */ -#define ETH_LINK_SPEED_25G RTE_ETH_LINK_SPEED_25G #define RTE_ETH_LINK_SPEED_40G RTE_BIT32(11) /**< 40 Gbps */ -#define ETH_LINK_SPEED_40G RTE_ETH_LINK_SPEED_40G #define RTE_ETH_LINK_SPEED_50G RTE_BIT32(12) /**< 50 Gbps */ -#define ETH_LINK_SPEED_50G RTE_ETH_LINK_SPEED_50G #define RTE_ETH_LINK_SPEED_56G RTE_BIT32(13) /**< 56 Gbps */ -#define ETH_LINK_SPEED_56G RTE_ETH_LINK_SPEED_56G #define RTE_ETH_LINK_SPEED_100G RTE_BIT32(14) /**< 100 Gbps */ -#define ETH_LINK_SPEED_100G RTE_ETH_LINK_SPEED_100G #define RTE_ETH_LINK_SPEED_200G RTE_BIT32(15) /**< 200 Gbps */ -#define ETH_LINK_SPEED_200G RTE_ETH_LINK_SPEED_200G /**@}*/ +#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 */ #define RTE_ETH_SPEED_NUM_NONE 0 /**< Not defined */ -#define ETH_SPEED_NUM_NONE RTE_ETH_SPEED_NUM_NONE #define RTE_ETH_SPEED_NUM_10M 10 /**< 10 Mbps */ -#define ETH_SPEED_NUM_10M RTE_ETH_SPEED_NUM_10M #define RTE_ETH_SPEED_NUM_100M 100 /**< 100 Mbps */ -#define ETH_SPEED_NUM_100M RTE_ETH_SPEED_NUM_100M #define RTE_ETH_SPEED_NUM_1G 1000 /**< 1 Gbps */ -#define ETH_SPEED_NUM_1G RTE_ETH_SPEED_NUM_1G #define RTE_ETH_SPEED_NUM_2_5G 2500 /**< 2.5 Gbps */ -#define ETH_SPEED_NUM_2_5G RTE_ETH_SPEED_NUM_2_5G #define RTE_ETH_SPEED_NUM_5G 5000 /**< 5 Gbps */ -#define ETH_SPEED_NUM_5G RTE_ETH_SPEED_NUM_5G #define RTE_ETH_SPEED_NUM_10G 10000 /**< 10 Gbps */ -#define ETH_SPEED_NUM_10G RTE_ETH_SPEED_NUM_10G #define RTE_ETH_SPEED_NUM_20G 20000 /**< 20 Gbps */ -#define ETH_SPEED_NUM_20G RTE_ETH_SPEED_NUM_20G #define RTE_ETH_SPEED_NUM_25G 25000 /**< 25 Gbps */ -#define ETH_SPEED_NUM_25G RTE_ETH_SPEED_NUM_25G #define RTE_ETH_SPEED_NUM_40G 40000 /**< 40 Gbps */ -#define ETH_SPEED_NUM_40G RTE_ETH_SPEED_NUM_40G #define RTE_ETH_SPEED_NUM_50G 50000 /**< 50 Gbps */ -#define ETH_SPEED_NUM_50G RTE_ETH_SPEED_NUM_50G #define RTE_ETH_SPEED_NUM_56G 56000 /**< 56 Gbps */ -#define ETH_SPEED_NUM_56G RTE_ETH_SPEED_NUM_56G #define RTE_ETH_SPEED_NUM_100G 100000 /**< 100 Gbps */ -#define ETH_SPEED_NUM_100G RTE_ETH_SPEED_NUM_100G #define RTE_ETH_SPEED_NUM_200G 200000 /**< 200 Gbps */ -#define ETH_SPEED_NUM_200G RTE_ETH_SPEED_NUM_200G #define RTE_ETH_SPEED_NUM_UNKNOWN UINT32_MAX /**< Unknown */ -#define ETH_SPEED_NUM_UNKNOWN RTE_ETH_SPEED_NUM_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. */ @@ -373,20 +375,21 @@ struct rte_eth_link { * Constants used in link management. */ #define RTE_ETH_LINK_HALF_DUPLEX 0 /**< Half-duplex connection (see link_duplex). */ -#define ETH_LINK_HALF_DUPLEX RTE_ETH_LINK_HALF_DUPLEX #define RTE_ETH_LINK_FULL_DUPLEX 1 /**< Full-duplex connection (see link_duplex). */ -#define ETH_LINK_FULL_DUPLEX RTE_ETH_LINK_FULL_DUPLEX #define RTE_ETH_LINK_DOWN 0 /**< Link is down (see link_status). */ -#define ETH_LINK_DOWN RTE_ETH_LINK_DOWN #define RTE_ETH_LINK_UP 1 /**< Link is up (see link_status). */ -#define ETH_LINK_UP RTE_ETH_LINK_UP #define RTE_ETH_LINK_FIXED 0 /**< No autonegotiation (see link_autoneg). */ -#define ETH_LINK_FIXED RTE_ETH_LINK_FIXED #define RTE_ETH_LINK_AUTONEG 1 /**< Autonegotiated (see link_autoneg). */ -#define ETH_LINK_AUTONEG RTE_ETH_LINK_AUTONEG #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. @@ -401,13 +404,14 @@ struct rte_eth_thresh { * @see rte_eth_conf.rxmode.mq_mode. */ #define RTE_ETH_MQ_RX_RSS_FLAG RTE_BIT32(0) /**< Enable RSS. @see rte_eth_rss_conf */ -#define ETH_MQ_RX_RSS_FLAG RTE_ETH_MQ_RX_RSS_FLAG #define RTE_ETH_MQ_RX_DCB_FLAG RTE_BIT32(1) /**< Enable DCB. */ -#define ETH_MQ_RX_DCB_FLAG RTE_ETH_MQ_RX_DCB_FLAG #define RTE_ETH_MQ_RX_VMDQ_FLAG RTE_BIT32(2) /**< Enable VMDq. */ -#define ETH_MQ_RX_VMDQ_FLAG RTE_ETH_MQ_RX_VMDQ_FLAG /**@}*/ +#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. @@ -434,14 +438,14 @@ enum rte_eth_rx_mq_mode { RTE_ETH_MQ_RX_VMDQ_FLAG, }; -#define ETH_MQ_RX_NONE RTE_ETH_MQ_RX_NONE -#define ETH_MQ_RX_RSS RTE_ETH_MQ_RX_RSS -#define ETH_MQ_RX_DCB RTE_ETH_MQ_RX_DCB -#define ETH_MQ_RX_DCB_RSS RTE_ETH_MQ_RX_DCB_RSS -#define ETH_MQ_RX_VMDQ_ONLY RTE_ETH_MQ_RX_VMDQ_ONLY -#define ETH_MQ_RX_VMDQ_RSS RTE_ETH_MQ_RX_VMDQ_RSS -#define ETH_MQ_RX_VMDQ_DCB RTE_ETH_MQ_RX_VMDQ_DCB -#define ETH_MQ_RX_VMDQ_DCB_RSS RTE_ETH_MQ_RX_VMDQ_DCB_RSS +#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 @@ -453,10 +457,11 @@ enum rte_eth_tx_mq_mode { RTE_ETH_MQ_TX_VMDQ_DCB, /**< For Tx side,both DCB and VT is on. */ RTE_ETH_MQ_TX_VMDQ_ONLY, /**< Only VT on, no DCB */ }; -#define ETH_MQ_TX_NONE RTE_ETH_MQ_TX_NONE -#define ETH_MQ_TX_DCB RTE_ETH_MQ_TX_DCB -#define ETH_MQ_TX_VMDQ_DCB RTE_ETH_MQ_TX_VMDQ_DCB -#define ETH_MQ_TX_VMDQ_ONLY RTE_ETH_MQ_TX_VMDQ_ONLY + +#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. @@ -490,10 +495,10 @@ enum rte_vlan_type { RTE_ETH_VLAN_TYPE_MAX, }; -#define ETH_VLAN_TYPE_UNKNOWN RTE_ETH_VLAN_TYPE_UNKNOWN -#define ETH_VLAN_TYPE_INNER RTE_ETH_VLAN_TYPE_INNER -#define ETH_VLAN_TYPE_OUTER RTE_ETH_VLAN_TYPE_OUTER -#define ETH_VLAN_TYPE_MAX 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. @@ -566,69 +571,70 @@ struct rte_eth_rss_conf { * fill rte_eth_rss_conf.rss_hf or rte_flow_action_rss.types. */ #define RTE_ETH_RSS_IPV4 RTE_BIT64(2) -#define ETH_RSS_IPV4 RTE_ETH_RSS_IPV4 #define RTE_ETH_RSS_FRAG_IPV4 RTE_BIT64(3) -#define ETH_RSS_FRAG_IPV4 RTE_ETH_RSS_FRAG_IPV4 #define RTE_ETH_RSS_NONFRAG_IPV4_TCP RTE_BIT64(4) -#define ETH_RSS_NONFRAG_IPV4_TCP RTE_ETH_RSS_NONFRAG_IPV4_TCP #define RTE_ETH_RSS_NONFRAG_IPV4_UDP RTE_BIT64(5) -#define ETH_RSS_NONFRAG_IPV4_UDP RTE_ETH_RSS_NONFRAG_IPV4_UDP #define RTE_ETH_RSS_NONFRAG_IPV4_SCTP RTE_BIT64(6) -#define ETH_RSS_NONFRAG_IPV4_SCTP RTE_ETH_RSS_NONFRAG_IPV4_SCTP #define RTE_ETH_RSS_NONFRAG_IPV4_OTHER RTE_BIT64(7) -#define ETH_RSS_NONFRAG_IPV4_OTHER RTE_ETH_RSS_NONFRAG_IPV4_OTHER #define RTE_ETH_RSS_IPV6 RTE_BIT64(8) -#define ETH_RSS_IPV6 RTE_ETH_RSS_IPV6 #define RTE_ETH_RSS_FRAG_IPV6 RTE_BIT64(9) -#define ETH_RSS_FRAG_IPV6 RTE_ETH_RSS_FRAG_IPV6 #define RTE_ETH_RSS_NONFRAG_IPV6_TCP RTE_BIT64(10) -#define ETH_RSS_NONFRAG_IPV6_TCP RTE_ETH_RSS_NONFRAG_IPV6_TCP #define RTE_ETH_RSS_NONFRAG_IPV6_UDP RTE_BIT64(11) -#define ETH_RSS_NONFRAG_IPV6_UDP RTE_ETH_RSS_NONFRAG_IPV6_UDP #define RTE_ETH_RSS_NONFRAG_IPV6_SCTP RTE_BIT64(12) -#define ETH_RSS_NONFRAG_IPV6_SCTP RTE_ETH_RSS_NONFRAG_IPV6_SCTP #define RTE_ETH_RSS_NONFRAG_IPV6_OTHER RTE_BIT64(13) -#define ETH_RSS_NONFRAG_IPV6_OTHER RTE_ETH_RSS_NONFRAG_IPV6_OTHER #define RTE_ETH_RSS_L2_PAYLOAD RTE_BIT64(14) -#define ETH_RSS_L2_PAYLOAD RTE_ETH_RSS_L2_PAYLOAD #define RTE_ETH_RSS_IPV6_EX RTE_BIT64(15) -#define ETH_RSS_IPV6_EX RTE_ETH_RSS_IPV6_EX #define RTE_ETH_RSS_IPV6_TCP_EX RTE_BIT64(16) -#define ETH_RSS_IPV6_TCP_EX RTE_ETH_RSS_IPV6_TCP_EX #define RTE_ETH_RSS_IPV6_UDP_EX RTE_BIT64(17) -#define ETH_RSS_IPV6_UDP_EX RTE_ETH_RSS_IPV6_UDP_EX #define RTE_ETH_RSS_PORT RTE_BIT64(18) -#define ETH_RSS_PORT RTE_ETH_RSS_PORT #define RTE_ETH_RSS_VXLAN RTE_BIT64(19) -#define ETH_RSS_VXLAN RTE_ETH_RSS_VXLAN #define RTE_ETH_RSS_GENEVE RTE_BIT64(20) -#define ETH_RSS_GENEVE RTE_ETH_RSS_GENEVE #define RTE_ETH_RSS_NVGRE RTE_BIT64(21) -#define ETH_RSS_NVGRE RTE_ETH_RSS_NVGRE #define RTE_ETH_RSS_GTPU RTE_BIT64(23) -#define ETH_RSS_GTPU RTE_ETH_RSS_GTPU #define RTE_ETH_RSS_ETH RTE_BIT64(24) -#define ETH_RSS_ETH RTE_ETH_RSS_ETH #define RTE_ETH_RSS_S_VLAN RTE_BIT64(25) -#define ETH_RSS_S_VLAN RTE_ETH_RSS_S_VLAN #define RTE_ETH_RSS_C_VLAN RTE_BIT64(26) -#define ETH_RSS_C_VLAN RTE_ETH_RSS_C_VLAN #define RTE_ETH_RSS_ESP RTE_BIT64(27) -#define ETH_RSS_ESP RTE_ETH_RSS_ESP #define RTE_ETH_RSS_AH RTE_BIT64(28) -#define ETH_RSS_AH RTE_ETH_RSS_AH #define RTE_ETH_RSS_L2TPV3 RTE_BIT64(29) -#define ETH_RSS_L2TPV3 RTE_ETH_RSS_L2TPV3 #define RTE_ETH_RSS_PFCP RTE_BIT64(30) -#define ETH_RSS_PFCP RTE_ETH_RSS_PFCP #define RTE_ETH_RSS_PPPOE RTE_BIT64(31) -#define ETH_RSS_PPPOE RTE_ETH_RSS_PPPOE #define RTE_ETH_RSS_ECPRI RTE_BIT64(32) -#define ETH_RSS_ECPRI RTE_ETH_RSS_ECPRI #define RTE_ETH_RSS_MPLS RTE_BIT64(33) -#define ETH_RSS_MPLS RTE_ETH_RSS_MPLS #define RTE_ETH_RSS_IPV4_CHKSUM RTE_BIT64(34) -#define ETH_RSS_IPV4_CHKSUM RTE_ETH_RSS_IPV4_CHKSUM + +#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. @@ -643,7 +649,7 @@ 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_ETH_RSS_L4_CHKSUM +#define ETH_RSS_L4_CHKSUM RTE_DEPRECATED(ETH_RSS_L4_CHKSUM) RTE_ETH_RSS_L4_CHKSUM /* * We use the following macros to combine with above RTE_ETH_RSS_* for @@ -655,21 +661,22 @@ struct rte_eth_rss_conf { * them are added. */ #define RTE_ETH_RSS_L3_SRC_ONLY RTE_BIT64(63) -#define ETH_RSS_L3_SRC_ONLY RTE_ETH_RSS_L3_SRC_ONLY #define RTE_ETH_RSS_L3_DST_ONLY RTE_BIT64(62) -#define ETH_RSS_L3_DST_ONLY RTE_ETH_RSS_L3_DST_ONLY #define RTE_ETH_RSS_L4_SRC_ONLY RTE_BIT64(61) -#define ETH_RSS_L4_SRC_ONLY RTE_ETH_RSS_L4_SRC_ONLY #define RTE_ETH_RSS_L4_DST_ONLY RTE_BIT64(60) -#define ETH_RSS_L4_DST_ONLY RTE_ETH_RSS_L4_DST_ONLY #define RTE_ETH_RSS_L2_SRC_ONLY RTE_BIT64(59) -#define ETH_RSS_L2_SRC_ONLY RTE_ETH_RSS_L2_SRC_ONLY #define RTE_ETH_RSS_L2_DST_ONLY RTE_BIT64(58) -#define ETH_RSS_L2_DST_ONLY RTE_ETH_RSS_L2_DST_ONLY + +#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 + * https://tools.ietf.org/html/rfc6052 * Must be combined with RTE_ETH_RSS_IPV6, RTE_ETH_RSS_NONFRAG_IPV6_UDP, * RTE_ETH_RSS_NONFRAG_IPV6_TCP, RTE_ETH_RSS_NONFRAG_IPV6_SCTP. */ @@ -694,26 +701,27 @@ 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_ETH_RSS_LEVEL_PMD_DEFAULT +#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_ETH_RSS_LEVEL_OUTERMOST +#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 * encapsulation level, from outermost to innermost (lower to higher values). */ #define RTE_ETH_RSS_LEVEL_INNERMOST (UINT64_C(2) << 50) -#define ETH_RSS_LEVEL_INNERMOST RTE_ETH_RSS_LEVEL_INNERMOST #define RTE_ETH_RSS_LEVEL_MASK (UINT64_C(3) << 50) -#define ETH_RSS_LEVEL_MASK RTE_ETH_RSS_LEVEL_MASK + +#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_ETH_RSS_LEVEL(rss_hf) +#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 @@ -740,122 +748,122 @@ 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_ETH_RSS_IPV6_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_ETH_RSS_IPV6_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_ETH_RSS_IPV6_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_ETH_RSS_IPV6_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_ETH_RSS_IPV6_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_ETH_RSS_IPV6_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_ETH_RSS_IPV6_PRE32_UDP +#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_ETH_RSS_IPV6_PRE40_UDP +#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_ETH_RSS_IPV6_PRE48_UDP +#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_ETH_RSS_IPV6_PRE56_UDP +#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_ETH_RSS_IPV6_PRE64_UDP +#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_ETH_RSS_IPV6_PRE96_UDP +#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_ETH_RSS_IPV6_PRE32_TCP +#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_ETH_RSS_IPV6_PRE40_TCP +#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_ETH_RSS_IPV6_PRE48_TCP +#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_ETH_RSS_IPV6_PRE56_TCP +#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_ETH_RSS_IPV6_PRE64_TCP +#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_ETH_RSS_IPV6_PRE96_TCP +#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_ETH_RSS_IPV6_PRE32_SCTP +#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_ETH_RSS_IPV6_PRE40_SCTP +#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_ETH_RSS_IPV6_PRE48_SCTP +#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_ETH_RSS_IPV6_PRE56_SCTP +#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_ETH_RSS_IPV6_PRE64_SCTP +#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_ETH_RSS_IPV6_PRE96_SCTP +#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 | \ @@ -865,35 +873,35 @@ 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_ETH_RSS_IP +#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_ETH_RSS_UDP +#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_ETH_RSS_TCP +#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_ETH_RSS_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_ETH_RSS_TUNNEL +#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_ETH_RSS_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 ( \ @@ -918,7 +926,7 @@ 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_ETH_RSS_PROTO_MASK +#define ETH_RSS_PROTO_MASK RTE_DEPRECATED(ETH_RSS_PROTO_MASK) RTE_ETH_RSS_PROTO_MASK /* * Definitions used for redirection table entry size. @@ -926,84 +934,90 @@ rte_eth_rss_hf_refine(uint64_t rss_hf) * documentation or the description of relevant functions for more details. */ #define RTE_ETH_RSS_RETA_SIZE_64 64 -#define ETH_RSS_RETA_SIZE_64 RTE_ETH_RSS_RETA_SIZE_64 #define RTE_ETH_RSS_RETA_SIZE_128 128 -#define ETH_RSS_RETA_SIZE_128 RTE_ETH_RSS_RETA_SIZE_128 #define RTE_ETH_RSS_RETA_SIZE_256 256 -#define ETH_RSS_RETA_SIZE_256 RTE_ETH_RSS_RETA_SIZE_256 #define RTE_ETH_RSS_RETA_SIZE_512 512 -#define ETH_RSS_RETA_SIZE_512 RTE_ETH_RSS_RETA_SIZE_512 #define RTE_ETH_RETA_GROUP_SIZE 64 -#define RTE_RETA_GROUP_SIZE RTE_ETH_RETA_GROUP_SIZE + +#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 ETH_VMDQ_MAX_VLAN_FILTERS RTE_ETH_VMDQ_MAX_VLAN_FILTERS #define RTE_ETH_DCB_NUM_USER_PRIORITIES 8 /**< Maximum nb. of DCB priorities. */ -#define ETH_DCB_NUM_USER_PRIORITIES RTE_ETH_DCB_NUM_USER_PRIORITIES #define RTE_ETH_VMDQ_DCB_NUM_QUEUES 128 /**< Maximum nb. of VMDq DCB queues. */ -#define ETH_VMDQ_DCB_NUM_QUEUES RTE_ETH_VMDQ_DCB_NUM_QUEUES #define RTE_ETH_DCB_NUM_QUEUES 128 /**< Maximum nb. of DCB queues. */ -#define ETH_DCB_NUM_QUEUES RTE_ETH_DCB_NUM_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 ETH_DCB_PG_SUPPORT RTE_ETH_DCB_PG_SUPPORT #define RTE_ETH_DCB_PFC_SUPPORT RTE_BIT32(1) /**< Priority Flow Control support. */ -#define ETH_DCB_PFC_SUPPORT RTE_ETH_DCB_PFC_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 ETH_VLAN_STRIP_OFFLOAD RTE_ETH_VLAN_STRIP_OFFLOAD #define RTE_ETH_VLAN_FILTER_OFFLOAD 0x0002 /**< VLAN Filter On/Off */ -#define ETH_VLAN_FILTER_OFFLOAD RTE_ETH_VLAN_FILTER_OFFLOAD #define RTE_ETH_VLAN_EXTEND_OFFLOAD 0x0004 /**< VLAN Extend On/Off */ -#define ETH_VLAN_EXTEND_OFFLOAD RTE_ETH_VLAN_EXTEND_OFFLOAD #define RTE_ETH_QINQ_STRIP_OFFLOAD 0x0008 /**< QINQ Strip On/Off */ -#define ETH_QINQ_STRIP_OFFLOAD RTE_ETH_QINQ_STRIP_OFFLOAD + +#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 ETH_VLAN_STRIP_MASK RTE_ETH_VLAN_STRIP_MASK #define RTE_ETH_VLAN_FILTER_MASK 0x0002 /**< VLAN Filter setting mask*/ -#define ETH_VLAN_FILTER_MASK RTE_ETH_VLAN_FILTER_MASK #define RTE_ETH_VLAN_EXTEND_MASK 0x0004 /**< VLAN Extend setting mask*/ -#define ETH_VLAN_EXTEND_MASK RTE_ETH_VLAN_EXTEND_MASK #define RTE_ETH_QINQ_STRIP_MASK 0x0008 /**< QINQ Strip setting mask */ -#define ETH_QINQ_STRIP_MASK RTE_ETH_QINQ_STRIP_MASK #define RTE_ETH_VLAN_ID_MAX 0x0FFF /**< VLAN ID is in lower 12 bits*/ -#define ETH_VLAN_ID_MAX RTE_ETH_VLAN_ID_MAX /**@}*/ +#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_ETH_NUM_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. */ -#define ETH_VMDQ_NUM_UC_HASH_ARRAY RTE_ETH_VMDQ_NUM_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 */ /** Accept untagged packets. */ #define RTE_ETH_VMDQ_ACCEPT_UNTAG RTE_BIT32(0) -#define ETH_VMDQ_ACCEPT_UNTAG RTE_ETH_VMDQ_ACCEPT_UNTAG /** Accept packets in multicast table. */ #define RTE_ETH_VMDQ_ACCEPT_HASH_MC RTE_BIT32(1) -#define ETH_VMDQ_ACCEPT_HASH_MC RTE_ETH_VMDQ_ACCEPT_HASH_MC /** Accept packets in unicast table. */ #define RTE_ETH_VMDQ_ACCEPT_HASH_UC RTE_BIT32(2) -#define ETH_VMDQ_ACCEPT_HASH_UC RTE_ETH_VMDQ_ACCEPT_HASH_UC /** Accept broadcast packets. */ #define RTE_ETH_VMDQ_ACCEPT_BROADCAST RTE_BIT32(3) -#define ETH_VMDQ_ACCEPT_BROADCAST RTE_ETH_VMDQ_ACCEPT_BROADCAST /** Multicast promiscuous. */ #define RTE_ETH_VMDQ_ACCEPT_MULTICAST RTE_BIT32(4) -#define ETH_VMDQ_ACCEPT_MULTICAST RTE_ETH_VMDQ_ACCEPT_MULTICAST /**@}*/ +#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 @@ -1025,8 +1039,8 @@ 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_ETH_4_TCS -#define ETH_8_TCS RTE_ETH_8_TCS +#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 @@ -1038,10 +1052,10 @@ 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_ETH_8_POOLS -#define ETH_16_POOLS RTE_ETH_16_POOLS -#define ETH_32_POOLS RTE_ETH_32_POOLS -#define ETH_64_POOLS RTE_ETH_64_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 { @@ -1364,11 +1378,10 @@ 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_ETH_FC_NONE -#define RTE_FC_RX_PAUSE RTE_ETH_FC_RX_PAUSE -#define RTE_FC_TX_PAUSE RTE_ETH_FC_TX_PAUSE -#define RTE_FC_FULL RTE_ETH_FC_FULL +#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. @@ -1411,17 +1424,16 @@ enum rte_eth_tunnel_type { RTE_ETH_TUNNEL_TYPE_ECPRI, RTE_ETH_TUNNEL_TYPE_MAX, }; - -#define RTE_TUNNEL_TYPE_NONE RTE_ETH_TUNNEL_TYPE_NONE -#define RTE_TUNNEL_TYPE_VXLAN RTE_ETH_TUNNEL_TYPE_VXLAN -#define RTE_TUNNEL_TYPE_GENEVE RTE_ETH_TUNNEL_TYPE_GENEVE -#define RTE_TUNNEL_TYPE_TEREDO RTE_ETH_TUNNEL_TYPE_TEREDO -#define RTE_TUNNEL_TYPE_NVGRE RTE_ETH_TUNNEL_TYPE_NVGRE -#define RTE_TUNNEL_TYPE_IP_IN_GRE RTE_ETH_TUNNEL_TYPE_IP_IN_GRE -#define RTE_L2_TUNNEL_TYPE_E_TAG RTE_ETH_L2_TUNNEL_TYPE_E_TAG -#define RTE_TUNNEL_TYPE_VXLAN_GPE RTE_ETH_TUNNEL_TYPE_VXLAN_GPE -#define RTE_TUNNEL_TYPE_ECPRI RTE_ETH_TUNNEL_TYPE_ECPRI -#define RTE_TUNNEL_TYPE_MAX 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" @@ -1437,9 +1449,9 @@ enum rte_eth_fdir_pballoc_type { }; #define rte_fdir_pballoc_type rte_eth_fdir_pballoc_type -#define RTE_FDIR_PBALLOC_64K RTE_ETH_FDIR_PBALLOC_64K -#define RTE_FDIR_PBALLOC_128K RTE_ETH_FDIR_PBALLOC_128K -#define RTE_FDIR_PBALLOC_256K RTE_ETH_FDIR_PBALLOC_256K +#define RTE_FDIR_PBALLOC_64K RTE_DEPRECATED(RTE_FDIR_PBALLOC_64K) RTE_ETH_FDIR_PBALLOC_64K +#define RTE_FDIR_PBALLOC_128K RTE_DEPRECATED(RTE_FDIR_PBALLOC_128K) RTE_ETH_FDIR_PBALLOC_128K +#define RTE_FDIR_PBALLOC_256K RTE_DEPRECATED(RTE_FDIR_PBALLOC_256K) RTE_ETH_FDIR_PBALLOC_256K /** * Select report mode of FDIR hash information in Rx descriptors. @@ -1466,7 +1478,6 @@ struct rte_eth_fdir_conf { /** Flex payload configuration. */ struct rte_eth_fdir_flex_conf flex_conf; }; - #define rte_fdir_conf rte_eth_fdir_conf /** @@ -1545,57 +1556,58 @@ struct rte_eth_conf { * Rx offload capabilities of a device. */ #define RTE_ETH_RX_OFFLOAD_VLAN_STRIP RTE_BIT64(0) -#define DEV_RX_OFFLOAD_VLAN_STRIP RTE_ETH_RX_OFFLOAD_VLAN_STRIP #define RTE_ETH_RX_OFFLOAD_IPV4_CKSUM RTE_BIT64(1) -#define DEV_RX_OFFLOAD_IPV4_CKSUM RTE_ETH_RX_OFFLOAD_IPV4_CKSUM #define RTE_ETH_RX_OFFLOAD_UDP_CKSUM RTE_BIT64(2) -#define DEV_RX_OFFLOAD_UDP_CKSUM RTE_ETH_RX_OFFLOAD_UDP_CKSUM #define RTE_ETH_RX_OFFLOAD_TCP_CKSUM RTE_BIT64(3) -#define DEV_RX_OFFLOAD_TCP_CKSUM RTE_ETH_RX_OFFLOAD_TCP_CKSUM #define RTE_ETH_RX_OFFLOAD_TCP_LRO RTE_BIT64(4) -#define DEV_RX_OFFLOAD_TCP_LRO RTE_ETH_RX_OFFLOAD_TCP_LRO #define RTE_ETH_RX_OFFLOAD_QINQ_STRIP RTE_BIT64(5) -#define DEV_RX_OFFLOAD_QINQ_STRIP RTE_ETH_RX_OFFLOAD_QINQ_STRIP #define RTE_ETH_RX_OFFLOAD_OUTER_IPV4_CKSUM RTE_BIT64(6) -#define DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM RTE_ETH_RX_OFFLOAD_OUTER_IPV4_CKSUM #define RTE_ETH_RX_OFFLOAD_MACSEC_STRIP RTE_BIT64(7) -#define DEV_RX_OFFLOAD_MACSEC_STRIP RTE_ETH_RX_OFFLOAD_MACSEC_STRIP #define RTE_ETH_RX_OFFLOAD_HEADER_SPLIT RTE_BIT64(8) -#define DEV_RX_OFFLOAD_HEADER_SPLIT RTE_ETH_RX_OFFLOAD_HEADER_SPLIT #define RTE_ETH_RX_OFFLOAD_VLAN_FILTER RTE_BIT64(9) -#define DEV_RX_OFFLOAD_VLAN_FILTER RTE_ETH_RX_OFFLOAD_VLAN_FILTER #define RTE_ETH_RX_OFFLOAD_VLAN_EXTEND RTE_BIT64(10) -#define DEV_RX_OFFLOAD_VLAN_EXTEND RTE_ETH_RX_OFFLOAD_VLAN_EXTEND #define RTE_ETH_RX_OFFLOAD_SCATTER RTE_BIT64(13) -#define DEV_RX_OFFLOAD_SCATTER RTE_ETH_RX_OFFLOAD_SCATTER /** * Timestamp is set by the driver in RTE_MBUF_DYNFIELD_TIMESTAMP_NAME * and RTE_MBUF_DYNFLAG_RX_TIMESTAMP_NAME is set in ol_flags. * The mbuf field and flag are registered when the offload is configured. */ #define RTE_ETH_RX_OFFLOAD_TIMESTAMP RTE_BIT64(14) -#define DEV_RX_OFFLOAD_TIMESTAMP RTE_ETH_RX_OFFLOAD_TIMESTAMP #define RTE_ETH_RX_OFFLOAD_SECURITY RTE_BIT64(15) -#define DEV_RX_OFFLOAD_SECURITY RTE_ETH_RX_OFFLOAD_SECURITY #define RTE_ETH_RX_OFFLOAD_KEEP_CRC RTE_BIT64(16) -#define DEV_RX_OFFLOAD_KEEP_CRC RTE_ETH_RX_OFFLOAD_KEEP_CRC #define RTE_ETH_RX_OFFLOAD_SCTP_CKSUM RTE_BIT64(17) -#define DEV_RX_OFFLOAD_SCTP_CKSUM RTE_ETH_RX_OFFLOAD_SCTP_CKSUM #define RTE_ETH_RX_OFFLOAD_OUTER_UDP_CKSUM RTE_BIT64(18) -#define DEV_RX_OFFLOAD_OUTER_UDP_CKSUM RTE_ETH_RX_OFFLOAD_OUTER_UDP_CKSUM #define RTE_ETH_RX_OFFLOAD_RSS_HASH RTE_BIT64(19) -#define DEV_RX_OFFLOAD_RSS_HASH RTE_ETH_RX_OFFLOAD_RSS_HASH #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_ETH_RX_OFFLOAD_CHECKSUM +#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_ETH_RX_OFFLOAD_VLAN +#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 @@ -1606,80 +1618,81 @@ struct rte_eth_conf { * Tx offload capabilities of a device. */ #define RTE_ETH_TX_OFFLOAD_VLAN_INSERT RTE_BIT64(0) -#define DEV_TX_OFFLOAD_VLAN_INSERT RTE_ETH_TX_OFFLOAD_VLAN_INSERT #define RTE_ETH_TX_OFFLOAD_IPV4_CKSUM RTE_BIT64(1) -#define DEV_TX_OFFLOAD_IPV4_CKSUM RTE_ETH_TX_OFFLOAD_IPV4_CKSUM #define RTE_ETH_TX_OFFLOAD_UDP_CKSUM RTE_BIT64(2) -#define DEV_TX_OFFLOAD_UDP_CKSUM RTE_ETH_TX_OFFLOAD_UDP_CKSUM #define RTE_ETH_TX_OFFLOAD_TCP_CKSUM RTE_BIT64(3) -#define DEV_TX_OFFLOAD_TCP_CKSUM RTE_ETH_TX_OFFLOAD_TCP_CKSUM #define RTE_ETH_TX_OFFLOAD_SCTP_CKSUM RTE_BIT64(4) -#define DEV_TX_OFFLOAD_SCTP_CKSUM RTE_ETH_TX_OFFLOAD_SCTP_CKSUM #define RTE_ETH_TX_OFFLOAD_TCP_TSO RTE_BIT64(5) -#define DEV_TX_OFFLOAD_TCP_TSO RTE_ETH_TX_OFFLOAD_TCP_TSO #define RTE_ETH_TX_OFFLOAD_UDP_TSO RTE_BIT64(6) -#define DEV_TX_OFFLOAD_UDP_TSO RTE_ETH_TX_OFFLOAD_UDP_TSO #define RTE_ETH_TX_OFFLOAD_OUTER_IPV4_CKSUM RTE_BIT64(7) /**< Used for tunneling packet. */ -#define DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM RTE_ETH_TX_OFFLOAD_OUTER_IPV4_CKSUM #define RTE_ETH_TX_OFFLOAD_QINQ_INSERT RTE_BIT64(8) -#define DEV_TX_OFFLOAD_QINQ_INSERT RTE_ETH_TX_OFFLOAD_QINQ_INSERT #define RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO RTE_BIT64(9) /**< Used for tunneling packet. */ -#define DEV_TX_OFFLOAD_VXLAN_TNL_TSO RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO #define RTE_ETH_TX_OFFLOAD_GRE_TNL_TSO RTE_BIT64(10) /**< Used for tunneling packet. */ -#define DEV_TX_OFFLOAD_GRE_TNL_TSO RTE_ETH_TX_OFFLOAD_GRE_TNL_TSO #define RTE_ETH_TX_OFFLOAD_IPIP_TNL_TSO RTE_BIT64(11) /**< Used for tunneling packet. */ -#define DEV_TX_OFFLOAD_IPIP_TNL_TSO RTE_ETH_TX_OFFLOAD_IPIP_TNL_TSO #define RTE_ETH_TX_OFFLOAD_GENEVE_TNL_TSO RTE_BIT64(12) /**< Used for tunneling packet. */ -#define DEV_TX_OFFLOAD_GENEVE_TNL_TSO RTE_ETH_TX_OFFLOAD_GENEVE_TNL_TSO #define RTE_ETH_TX_OFFLOAD_MACSEC_INSERT RTE_BIT64(13) -#define DEV_TX_OFFLOAD_MACSEC_INSERT RTE_ETH_TX_OFFLOAD_MACSEC_INSERT /** * Multiple threads can invoke rte_eth_tx_burst() concurrently on the same * Tx queue without SW lock. */ #define RTE_ETH_TX_OFFLOAD_MT_LOCKFREE RTE_BIT64(14) -#define DEV_TX_OFFLOAD_MT_LOCKFREE RTE_ETH_TX_OFFLOAD_MT_LOCKFREE /** Device supports multi segment send. */ #define RTE_ETH_TX_OFFLOAD_MULTI_SEGS RTE_BIT64(15) -#define DEV_TX_OFFLOAD_MULTI_SEGS RTE_ETH_TX_OFFLOAD_MULTI_SEGS /** * Device supports optimization for fast release of mbufs. * When set application must guarantee that per-queue all mbufs comes from * the same mempool and has refcnt = 1. */ #define RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE RTE_BIT64(16) -#define DEV_TX_OFFLOAD_MBUF_FAST_FREE RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE #define RTE_ETH_TX_OFFLOAD_SECURITY RTE_BIT64(17) -#define DEV_TX_OFFLOAD_SECURITY RTE_ETH_TX_OFFLOAD_SECURITY /** * Device supports generic UDP tunneled packet TSO. * Application must set RTE_MBUF_F_TX_TUNNEL_UDP and other mbuf fields required * for tunnel TSO. */ #define RTE_ETH_TX_OFFLOAD_UDP_TNL_TSO RTE_BIT64(18) -#define DEV_TX_OFFLOAD_UDP_TNL_TSO RTE_ETH_TX_OFFLOAD_UDP_TNL_TSO /** * Device supports generic IP tunneled packet TSO. * Application must set RTE_MBUF_F_TX_TUNNEL_IP and other mbuf fields required * for tunnel TSO. */ #define RTE_ETH_TX_OFFLOAD_IP_TNL_TSO RTE_BIT64(19) -#define DEV_TX_OFFLOAD_IP_TNL_TSO RTE_ETH_TX_OFFLOAD_IP_TNL_TSO /** Device supports outer UDP checksum */ #define RTE_ETH_TX_OFFLOAD_OUTER_UDP_CKSUM RTE_BIT64(20) -#define DEV_TX_OFFLOAD_OUTER_UDP_CKSUM RTE_ETH_TX_OFFLOAD_OUTER_UDP_CKSUM /** * Device sends on time read from RTE_MBUF_DYNFIELD_TIMESTAMP_NAME * if RTE_MBUF_DYNFLAG_TX_TIMESTAMP_NAME is set in ol_flags. * The mbuf field and flag are registered when the offload is configured. */ #define RTE_ETH_TX_OFFLOAD_SEND_ON_TIMESTAMP RTE_BIT64(21) -#define DEV_TX_OFFLOAD_SEND_ON_TIMESTAMP RTE_ETH_TX_OFFLOAD_SEND_ON_TIMESTAMP /* * If new Tx offload capabilities are defined, they also must be * 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. */ @@ -1931,9 +1944,10 @@ struct rte_eth_xstat_name { }; #define RTE_ETH_DCB_NUM_TCS 8 -#define ETH_DCB_NUM_TCS RTE_ETH_DCB_NUM_TCS #define RTE_ETH_MAX_VMDQ_POOL 64 -#define ETH_MAX_VMDQ_POOL RTE_ETH_MAX_VMDQ_POOL + +#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 -- 2.34.1 ^ permalink raw reply [flat|nested] 21+ messages in thread
* RE: [PATCH v3] ethdev: mark old macros as deprecated 2022-01-12 14:36 ` [PATCH v3] " Ferruh Yigit @ 2022-01-14 6:45 ` Xia, Chenbo 2022-01-14 9:01 ` Ferruh Yigit 0 siblings, 1 reply; 21+ messages in thread From: Xia, Chenbo @ 2022-01-14 6:45 UTC (permalink / raw) To: Yigit, Ferruh, Thomas Monjalon, Andrew Rybchenko, Hemant Agrawal, Tyler Retzlaff, Jerin Jacob Cc: dev, Stephen Hemminger > -----Original Message----- > From: Yigit, Ferruh <ferruh.yigit@intel.com> > Sent: Wednesday, January 12, 2022 10:36 PM > To: Thomas Monjalon <thomas@monjalon.net>; Andrew Rybchenko > <andrew.rybchenko@oktetlabs.ru>; Hemant Agrawal <hemant.agrawal@nxp.com>; > Tyler Retzlaff <roretzla@linux.microsoft.com>; Xia, Chenbo > <chenbo.xia@intel.com>; Jerin Jacob <jerinj@marvell.com> > Cc: dev@dpdk.org; Yigit, Ferruh <ferruh.yigit@intel.com>; Stephen Hemminger > <stephen@networkplumber.org> > Subject: [PATCH v3] ethdev: mark old macros as deprecated > > Old macros kept for backward compatibility, but this cause old macro > usage to sneak in silently. > > Marking old macros as deprecated. Downside is this will cause some noise > for applications that are using old macros. > > Fixes: 295968d17407 ("ethdev: add namespace") > > Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com> > Acked-by: Stephen Hemminger <stephen@networkplumber.org> > --- > v2: > * Release notes updated > > v3: > * Update 22.03 release note > --- > doc/guides/rel_notes/release_22_03.rst | 3 + > lib/ethdev/rte_ethdev.h | 474 +++++++++++++------------ > 2 files changed, 247 insertions(+), 230 deletions(-) Acked-by: Chenbo Xia <chenbo.xia@intel.com> ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH v3] ethdev: mark old macros as deprecated 2022-01-14 6:45 ` Xia, Chenbo @ 2022-01-14 9:01 ` Ferruh Yigit 0 siblings, 0 replies; 21+ messages in thread From: Ferruh Yigit @ 2022-01-14 9:01 UTC (permalink / raw) To: Xia, Chenbo, Thomas Monjalon, Andrew Rybchenko, Hemant Agrawal, Tyler Retzlaff, Jerin Jacob Cc: dev, Stephen Hemminger On 1/14/2022 6:45 AM, Xia, Chenbo wrote: >> -----Original Message----- >> From: Yigit, Ferruh <ferruh.yigit@intel.com> >> Sent: Wednesday, January 12, 2022 10:36 PM >> To: Thomas Monjalon <thomas@monjalon.net>; Andrew Rybchenko >> <andrew.rybchenko@oktetlabs.ru>; Hemant Agrawal <hemant.agrawal@nxp.com>; >> Tyler Retzlaff <roretzla@linux.microsoft.com>; Xia, Chenbo >> <chenbo.xia@intel.com>; Jerin Jacob <jerinj@marvell.com> >> Cc: dev@dpdk.org; Yigit, Ferruh <ferruh.yigit@intel.com>; Stephen Hemminger >> <stephen@networkplumber.org> >> Subject: [PATCH v3] ethdev: mark old macros as deprecated >> >> Old macros kept for backward compatibility, but this cause old macro >> usage to sneak in silently. >> >> Marking old macros as deprecated. Downside is this will cause some noise >> for applications that are using old macros. >> >> Fixes: 295968d17407 ("ethdev: add namespace") >> >> Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com> >> Acked-by: Stephen Hemminger <stephen@networkplumber.org> >> --- >> v2: >> * Release notes updated >> >> v3: >> * Update 22.03 release note >> --- >> doc/guides/rel_notes/release_22_03.rst | 3 + >> lib/ethdev/rte_ethdev.h | 474 +++++++++++++------------ >> 2 files changed, 247 insertions(+), 230 deletions(-) > > Acked-by: Chenbo Xia <chenbo.xia@intel.com> Applied to dpdk-next-net/main, thanks. ^ permalink raw reply [flat|nested] 21+ messages in thread
* [dpdk-dev] [PATCH] ethdev: fix crash on owner delete 2021-11-02 23:44 ` [dpdk-dev] [PATCH] ethdev: mark old " Ferruh Yigit 2021-11-03 0:05 ` Stephen Hemminger 2021-11-03 22:48 ` [dpdk-dev] [PATCH v2] " Ferruh Yigit @ 2021-11-04 11:04 ` Ferruh Yigit 2021-11-05 3:03 ` [dpdk-dev] [dpdk-stable] " Xia, Chenbo 2 siblings, 1 reply; 21+ messages in thread From: Ferruh Yigit @ 2021-11-04 11:04 UTC (permalink / raw) To: Thomas Monjalon, Andrew Rybchenko, Stephen Hemminger, Matan Azrad Cc: Ferruh Yigit, dev, stable, Matan Azrad 'eth_dev->data' can be null before ethdev allocated. The API walks through all eth devices, at least for some data can be null. Adding 'eth_dev->data' null check before accessing it. Fixes: 33c73aae32e4 ("ethdev: allow ownership operations on unused port") Cc: stable@dpdk.org Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com> --- Cc: Matan Azrad <matan@nvidia.com> --- lib/ethdev/rte_ethdev.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index 7db84b12d03b..8e679e4003db 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -757,10 +757,13 @@ rte_eth_dev_owner_delete(const uint64_t owner_id) rte_spinlock_lock(ð_dev_shared_data->ownership_lock); if (eth_is_valid_owner_id(owner_id)) { - for (port_id = 0; port_id < RTE_MAX_ETHPORTS; port_id++) - if (rte_eth_devices[port_id].data->owner.id == owner_id) - memset(&rte_eth_devices[port_id].data->owner, 0, + for (port_id = 0; port_id < RTE_MAX_ETHPORTS; port_id++) { + struct rte_eth_dev_data *data = + rte_eth_devices[port_id].data; + if (data != NULL && data->owner.id == owner_id) + memset(&data->owner, 0, sizeof(struct rte_eth_dev_owner)); + } RTE_ETHDEV_LOG(NOTICE, "All port owners owned by %016"PRIx64" identifier have removed\n", owner_id); -- 2.31.1 ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [dpdk-dev] [dpdk-stable] [PATCH] ethdev: fix crash on owner delete 2021-11-04 11:04 ` [dpdk-dev] [PATCH] ethdev: fix crash on owner delete Ferruh Yigit @ 2021-11-05 3:03 ` Xia, Chenbo 2021-11-05 13:16 ` Thomas Monjalon 0 siblings, 1 reply; 21+ messages in thread From: Xia, Chenbo @ 2021-11-05 3:03 UTC (permalink / raw) To: Yigit, Ferruh, Thomas Monjalon, Andrew Rybchenko, Stephen Hemminger, Matan Azrad Cc: Yigit, Ferruh, dev, stable, Matan Azrad > -----Original Message----- > From: stable <stable-bounces@dpdk.org> On Behalf Of Ferruh Yigit > Sent: Thursday, November 4, 2021 7:04 PM > To: Thomas Monjalon <thomas@monjalon.net>; Andrew Rybchenko > <andrew.rybchenko@oktetlabs.ru>; Stephen Hemminger > <stephen@networkplumber.org>; Matan Azrad <matan@mellanox.com> > Cc: Yigit, Ferruh <ferruh.yigit@intel.com>; dev@dpdk.org; stable@dpdk.org; > Matan Azrad <matan@nvidia.com> > Subject: [dpdk-stable] [PATCH] ethdev: fix crash on owner delete > > 'eth_dev->data' can be null before ethdev allocated. The API walks > through all eth devices, at least for some data can be null. > > Adding 'eth_dev->data' null check before accessing it. > > Fixes: 33c73aae32e4 ("ethdev: allow ownership operations on unused port") > Cc: stable@dpdk.org > > Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com> > --- > Cc: Matan Azrad <matan@nvidia.com> > --- > lib/ethdev/rte_ethdev.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c > index 7db84b12d03b..8e679e4003db 100644 > --- a/lib/ethdev/rte_ethdev.c > +++ b/lib/ethdev/rte_ethdev.c > @@ -757,10 +757,13 @@ rte_eth_dev_owner_delete(const uint64_t owner_id) > rte_spinlock_lock(ð_dev_shared_data->ownership_lock); > > if (eth_is_valid_owner_id(owner_id)) { > - for (port_id = 0; port_id < RTE_MAX_ETHPORTS; port_id++) > - if (rte_eth_devices[port_id].data->owner.id == owner_id) > - memset(&rte_eth_devices[port_id].data->owner, 0, > + for (port_id = 0; port_id < RTE_MAX_ETHPORTS; port_id++) { > + struct rte_eth_dev_data *data = > + rte_eth_devices[port_id].data; > + if (data != NULL && data->owner.id == owner_id) > + memset(&data->owner, 0, > sizeof(struct rte_eth_dev_owner)); > + } > RTE_ETHDEV_LOG(NOTICE, > "All port owners owned by %016"PRIx64" identifier have > removed\n", > owner_id); > -- > 2.31.1 Acked-by: Chenbo Xia <chenbo.xia@intel.com> ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [dpdk-dev] [dpdk-stable] [PATCH] ethdev: fix crash on owner delete 2021-11-05 3:03 ` [dpdk-dev] [dpdk-stable] " Xia, Chenbo @ 2021-11-05 13:16 ` Thomas Monjalon 2021-11-05 13:36 ` Andrew Rybchenko 0 siblings, 1 reply; 21+ messages in thread From: Thomas Monjalon @ 2021-11-05 13:16 UTC (permalink / raw) To: Yigit, Ferruh Cc: Andrew Rybchenko, Stephen Hemminger, dev, stable, Matan Azrad, Xia, Chenbo 05/11/2021 04:03, Xia, Chenbo: > From: stable <stable-bounces@dpdk.org> On Behalf Of Ferruh Yigit > > > 'eth_dev->data' can be null before ethdev allocated. The API walks > > through all eth devices, at least for some data can be null. > > > > Adding 'eth_dev->data' null check before accessing it. > > > > Fixes: 33c73aae32e4 ("ethdev: allow ownership operations on unused port") > > Cc: stable@dpdk.org > > > > Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com> [...] > > @@ -757,10 +757,13 @@ rte_eth_dev_owner_delete(const uint64_t owner_id) > > rte_spinlock_lock(ð_dev_shared_data->ownership_lock); > > > > if (eth_is_valid_owner_id(owner_id)) { > > - for (port_id = 0; port_id < RTE_MAX_ETHPORTS; port_id++) > > - if (rte_eth_devices[port_id].data->owner.id == owner_id) > > - memset(&rte_eth_devices[port_id].data->owner, 0, > > + for (port_id = 0; port_id < RTE_MAX_ETHPORTS; port_id++) { > > + struct rte_eth_dev_data *data = > > + rte_eth_devices[port_id].data; > > + if (data != NULL && data->owner.id == owner_id) Indeed the NULL check was missing. > Acked-by: Chenbo Xia <chenbo.xia@intel.com> Acked-by: Thomas Monjalon <thomas@monjalon.net> ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [dpdk-dev] [dpdk-stable] [PATCH] ethdev: fix crash on owner delete 2021-11-05 13:16 ` Thomas Monjalon @ 2021-11-05 13:36 ` Andrew Rybchenko 2021-11-05 14:36 ` Ferruh Yigit 0 siblings, 1 reply; 21+ messages in thread From: Andrew Rybchenko @ 2021-11-05 13:36 UTC (permalink / raw) To: Thomas Monjalon, Yigit, Ferruh Cc: Stephen Hemminger, dev, stable, Matan Azrad, Xia, Chenbo On 11/5/21 4:16 PM, Thomas Monjalon wrote: > 05/11/2021 04:03, Xia, Chenbo: >> From: stable <stable-bounces@dpdk.org> On Behalf Of Ferruh Yigit >> >>> 'eth_dev->data' can be null before ethdev allocated. The API walks >>> through all eth devices, at least for some data can be null. >>> >>> Adding 'eth_dev->data' null check before accessing it. >>> >>> Fixes: 33c73aae32e4 ("ethdev: allow ownership operations on unused port") >>> Cc: stable@dpdk.org >>> >>> Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com> > [...] >>> @@ -757,10 +757,13 @@ rte_eth_dev_owner_delete(const uint64_t owner_id) >>> rte_spinlock_lock(ð_dev_shared_data->ownership_lock); >>> >>> if (eth_is_valid_owner_id(owner_id)) { >>> - for (port_id = 0; port_id < RTE_MAX_ETHPORTS; port_id++) >>> - if (rte_eth_devices[port_id].data->owner.id == owner_id) >>> - memset(&rte_eth_devices[port_id].data->owner, 0, >>> + for (port_id = 0; port_id < RTE_MAX_ETHPORTS; port_id++) { >>> + struct rte_eth_dev_data *data = >>> + rte_eth_devices[port_id].data; >>> + if (data != NULL && data->owner.id == owner_id) > > Indeed the NULL check was missing. > >> Acked-by: Chenbo Xia <chenbo.xia@intel.com> > > Acked-by: Thomas Monjalon <thomas@monjalon.net> > Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru> ^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [dpdk-dev] [dpdk-stable] [PATCH] ethdev: fix crash on owner delete 2021-11-05 13:36 ` Andrew Rybchenko @ 2021-11-05 14:36 ` Ferruh Yigit 0 siblings, 0 replies; 21+ messages in thread From: Ferruh Yigit @ 2021-11-05 14:36 UTC (permalink / raw) To: Andrew Rybchenko, Thomas Monjalon Cc: Stephen Hemminger, dev, stable, Matan Azrad, Xia, Chenbo On 11/5/2021 1:36 PM, Andrew Rybchenko wrote: > On 11/5/21 4:16 PM, Thomas Monjalon wrote: >> 05/11/2021 04:03, Xia, Chenbo: >>> From: stable <stable-bounces@dpdk.org> On Behalf Of Ferruh Yigit >>> >>>> 'eth_dev->data' can be null before ethdev allocated. The API walks >>>> through all eth devices, at least for some data can be null. >>>> >>>> Adding 'eth_dev->data' null check before accessing it. >>>> >>>> Fixes: 33c73aae32e4 ("ethdev: allow ownership operations on unused port") >>>> Cc: stable@dpdk.org >>>> >>>> Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com> >> [...] >>>> @@ -757,10 +757,13 @@ rte_eth_dev_owner_delete(const uint64_t owner_id) >>>> rte_spinlock_lock(ð_dev_shared_data->ownership_lock); >>>> >>>> if (eth_is_valid_owner_id(owner_id)) { >>>> - for (port_id = 0; port_id < RTE_MAX_ETHPORTS; port_id++) >>>> - if (rte_eth_devices[port_id].data->owner.id == owner_id) >>>> - memset(&rte_eth_devices[port_id].data->owner, 0, >>>> + for (port_id = 0; port_id < RTE_MAX_ETHPORTS; port_id++) { >>>> + struct rte_eth_dev_data *data = >>>> + rte_eth_devices[port_id].data; >>>> + if (data != NULL && data->owner.id == owner_id) >> >> Indeed the NULL check was missing. >> >>> Acked-by: Chenbo Xia <chenbo.xia@intel.com> >> >> Acked-by: Thomas Monjalon <thomas@monjalon.net> >> > > Acked-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru> > Applied to dpdk-next-net/main, thanks. ^ permalink raw reply [flat|nested] 21+ messages in thread
end of thread, other threads:[~2022-01-14 9:02 UTC | newest] Thread overview: 21+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-10-29 21:47 [dpdk-dev] [RFC] ethdev: mark old ETH_LINK macros as deprecated Stephen Hemminger 2021-11-01 12:30 ` Ferruh Yigit 2021-11-02 23:44 ` [dpdk-dev] [PATCH] ethdev: mark old " Ferruh Yigit 2021-11-03 0:05 ` Stephen Hemminger 2021-11-03 9:00 ` Ferruh Yigit 2021-11-03 22:48 ` [dpdk-dev] [PATCH v2] " Ferruh Yigit 2021-11-04 11:03 ` Ferruh Yigit 2021-11-04 12:59 ` Thomas Monjalon 2021-11-05 13:40 ` Andrew Rybchenko 2021-11-05 15:05 ` Thomas Monjalon 2021-11-05 16:26 ` Stephen Hemminger 2021-11-05 21:33 ` Ferruh Yigit 2021-11-06 7:46 ` Thomas Monjalon 2022-01-12 14:36 ` [PATCH v3] " Ferruh Yigit 2022-01-14 6:45 ` Xia, Chenbo 2022-01-14 9:01 ` Ferruh Yigit 2021-11-04 11:04 ` [dpdk-dev] [PATCH] ethdev: fix crash on owner delete Ferruh Yigit 2021-11-05 3:03 ` [dpdk-dev] [dpdk-stable] " Xia, Chenbo 2021-11-05 13:16 ` Thomas Monjalon 2021-11-05 13:36 ` Andrew Rybchenko 2021-11-05 14:36 ` Ferruh Yigit
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).