This patch updates OVS to use DPDK RTE_ETH namespaces.
DPDK commit 295968d17407 ("ethdev: add namespace") [0] added RTE_ETH
namespaces for ethdev enums and macros in DPDK 21.11.
As compatibility for the older names was kept and they were not officially
deprecated in DPDK 21.11, there was no impact to OVS and OVS did not have
to be updated.
In future DPDK releases the older names will be deprecated and that will
cause build warnings for OVS. They may also be removed from DPDK at some
point.
There is no immediate need to update OVS to use the new namespaces while
DPDK 21.11 is being used but at the same time there is no need to wait
until it becomes an issue either. So might as well align with the
updated names in DPDK 21.11.
[0] http://git.dpdk.org/dpdk/commit/?id=295968d1740760337e16b0d7914875c5cac52850
Signed-off-by: Kevin Traynor <[email protected]>
---
N.B. This is not required for 2.17, the existing defines work fine.
GHA: https://github.com/kevintraynor/ovs/actions/runs/1693471302
---
lib/netdev-dpdk.c | 97 ++++++++++++++++++++++++-----------------------
1 file changed, 49 insertions(+), 48 deletions(-)
diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c
index db0d81877..823728301 100644
--- a/lib/netdev-dpdk.c
+++ b/lib/netdev-dpdk.c
@@ -147,11 +147,12 @@ typedef uint16_t dpdk_port_t;
/* List of required flags advertised by the hardware that will be used
- * if TSO is enabled. Ideally this should include DEV_TX_OFFLOAD_SCTP_CKSUM.
- * However, very few drivers supports that the moment and SCTP is not a
- * widely used protocol as TCP and UDP, so it's optional. */
-#define DPDK_TX_TSO_OFFLOAD_FLAGS (DEV_TX_OFFLOAD_TCP_TSO \
- | DEV_TX_OFFLOAD_TCP_CKSUM \
- | DEV_TX_OFFLOAD_UDP_CKSUM \
- | DEV_TX_OFFLOAD_IPV4_CKSUM)
+ * if TSO is enabled. Ideally this should include
+ * RTE_ETH_TX_OFFLOAD_SCTP_CKSUM. However, very few drivers support that
+ * at the moment and SCTP is not a widely used protocol like TCP and UDP,
+ * so it's optional. */
+#define DPDK_TX_TSO_OFFLOAD_FLAGS (RTE_ETH_TX_OFFLOAD_TCP_TSO \
+ | RTE_ETH_TX_OFFLOAD_TCP_CKSUM \
+ | RTE_ETH_TX_OFFLOAD_UDP_CKSUM \
+ | RTE_ETH_TX_OFFLOAD_IPV4_CKSUM)
@@ -164,9 +165,9 @@ static const struct rte_eth_conf port_conf = {
.rss_conf = {
.rss_key = NULL,
- .rss_hf = ETH_RSS_IP | ETH_RSS_UDP | ETH_RSS_TCP,
+ .rss_hf = RTE_ETH_RSS_IP | RTE_ETH_RSS_UDP | RTE_ETH_RSS_TCP,
},
},
.txmode = {
- .mq_mode = ETH_MQ_TX_NONE,
+ .mq_mode = RTE_ETH_MQ_TX_NONE,
},
};
@@ -920,5 +921,5 @@ check_link_status(struct netdev_dpdk *dev)
"Port "DPDK_PORT_ID_FMT" Link Up - speed %u Mbps - %s",
dev->port_id, (unsigned) dev->link.link_speed,
- (dev->link.link_duplex == ETH_LINK_FULL_DUPLEX)
+ (dev->link.link_duplex == RTE_ETH_LINK_FULL_DUPLEX)
? "full-duplex" : "half-duplex");
} else {
@@ -969,5 +970,5 @@ dpdk_eth_dev_port_config(struct netdev_dpdk *dev, int
n_rxq, int n_txq)
if (dev->mtu > RTE_ETHER_MTU) {
if (dev->hw_ol_features & NETDEV_RX_HW_SCATTER) {
- conf.rxmode.offloads |= DEV_RX_OFFLOAD_SCATTER;
+ conf.rxmode.offloads |= RTE_ETH_RX_OFFLOAD_SCATTER;
}
}
@@ -976,10 +977,10 @@ dpdk_eth_dev_port_config(struct netdev_dpdk *dev, int
n_rxq, int n_txq)
if (dev->hw_ol_features & NETDEV_RX_CHECKSUM_OFFLOAD) {
- conf.rxmode.offloads |= DEV_RX_OFFLOAD_CHECKSUM;
+ conf.rxmode.offloads |= RTE_ETH_RX_OFFLOAD_CHECKSUM;
}
if (!(dev->hw_ol_features & NETDEV_RX_HW_CRC_STRIP)
- && info.rx_offload_capa & DEV_RX_OFFLOAD_KEEP_CRC) {
- conf.rxmode.offloads |= DEV_RX_OFFLOAD_KEEP_CRC;
+ && info.rx_offload_capa & RTE_ETH_RX_OFFLOAD_KEEP_CRC) {
+ conf.rxmode.offloads |= RTE_ETH_RX_OFFLOAD_KEEP_CRC;
}
@@ -987,5 +988,5 @@ dpdk_eth_dev_port_config(struct netdev_dpdk *dev, int
n_rxq, int n_txq)
conf.txmode.offloads |= DPDK_TX_TSO_OFFLOAD_FLAGS;
if (dev->hw_ol_features & NETDEV_TX_SCTP_CHECKSUM_OFFLOAD) {
- conf.txmode.offloads |= DEV_TX_OFFLOAD_SCTP_CKSUM;
+ conf.txmode.offloads |= RTE_ETH_TX_OFFLOAD_SCTP_CKSUM;
}
}
@@ -995,7 +996,7 @@ dpdk_eth_dev_port_config(struct netdev_dpdk *dev, int
n_rxq, int n_txq)
conf.rx_adv_conf.rss_conf.rss_hf &= info.flow_type_rss_offloads;
if (conf.rx_adv_conf.rss_conf.rss_hf == 0) {
- conf.rxmode.mq_mode = ETH_MQ_RX_NONE;
+ conf.rxmode.mq_mode = RTE_ETH_MQ_RX_NONE;
} else {
- conf.rxmode.mq_mode = ETH_MQ_RX_RSS;
+ conf.rxmode.mq_mode = RTE_ETH_MQ_RX_RSS;
}
@@ -1095,7 +1096,7 @@ dpdk_eth_dev_init(struct netdev_dpdk *dev)
int n_rxq, n_txq;
uint32_t tx_tso_offload_capa = DPDK_TX_TSO_OFFLOAD_FLAGS;
- uint32_t rx_chksm_offload_capa = DEV_RX_OFFLOAD_UDP_CKSUM |
- DEV_RX_OFFLOAD_TCP_CKSUM |
- DEV_RX_OFFLOAD_IPV4_CKSUM;
+ uint32_t rx_chksm_offload_capa = RTE_ETH_RX_OFFLOAD_UDP_CKSUM |
+ RTE_ETH_RX_OFFLOAD_TCP_CKSUM |
+ RTE_ETH_RX_OFFLOAD_IPV4_CKSUM;
rte_eth_dev_info_get(dev->port_id, &info);
@@ -1117,5 +1118,5 @@ dpdk_eth_dev_init(struct netdev_dpdk *dev)
}
- if (info.rx_offload_capa & DEV_RX_OFFLOAD_SCATTER) {
+ if (info.rx_offload_capa & RTE_ETH_RX_OFFLOAD_SCATTER) {
dev->hw_ol_features |= NETDEV_RX_HW_SCATTER;
} else {
@@ -1129,5 +1130,5 @@ dpdk_eth_dev_init(struct netdev_dpdk *dev)
== tx_tso_offload_capa) {
dev->hw_ol_features |= NETDEV_TX_TSO_OFFLOAD;
- if (info.tx_offload_capa & DEV_TX_OFFLOAD_SCTP_CKSUM) {
+ if (info.tx_offload_capa & RTE_ETH_TX_OFFLOAD_SCTP_CKSUM) {
dev->hw_ol_features |= NETDEV_TX_SCTP_CHECKSUM_OFFLOAD;
} else {
@@ -1885,6 +1886,6 @@ netdev_dpdk_set_config(struct netdev *netdev, const
struct smap *args,
enum rte_eth_fc_mode fc_mode;
static const enum rte_eth_fc_mode fc_mode_set[2][2] = {
- {RTE_FC_NONE, RTE_FC_TX_PAUSE},
- {RTE_FC_RX_PAUSE, RTE_FC_FULL }
+ {RTE_ETH_FC_NONE, RTE_ETH_FC_TX_PAUSE},
+ {RTE_ETH_FC_RX_PAUSE, RTE_ETH_FC_FULL }
};
const char *new_devargs;
@@ -3279,22 +3280,22 @@ netdev_dpdk_get_features(const struct netdev *netdev,
/* Match against OpenFlow defined link speed values. */
- if (link.link_duplex == ETH_LINK_FULL_DUPLEX) {
+ if (link.link_duplex == RTE_ETH_LINK_FULL_DUPLEX) {
switch (link.link_speed) {
- case ETH_SPEED_NUM_10M:
+ case RTE_ETH_SPEED_NUM_10M:
feature |= NETDEV_F_10MB_FD;
break;
- case ETH_SPEED_NUM_100M:
+ case RTE_ETH_SPEED_NUM_100M:
feature |= NETDEV_F_100MB_FD;
break;
- case ETH_SPEED_NUM_1G:
+ case RTE_ETH_SPEED_NUM_1G:
feature |= NETDEV_F_1GB_FD;
break;
- case ETH_SPEED_NUM_10G:
+ case RTE_ETH_SPEED_NUM_10G:
feature |= NETDEV_F_10GB_FD;
break;
- case ETH_SPEED_NUM_40G:
+ case RTE_ETH_SPEED_NUM_40G:
feature |= NETDEV_F_40GB_FD;
break;
- case ETH_SPEED_NUM_100G:
+ case RTE_ETH_SPEED_NUM_100G:
feature |= NETDEV_F_100GB_FD;
break;
@@ -3302,13 +3303,13 @@ netdev_dpdk_get_features(const struct netdev *netdev,
feature |= NETDEV_F_OTHER;
}
- } else if (link.link_duplex == ETH_LINK_HALF_DUPLEX) {
+ } else if (link.link_duplex == RTE_ETH_LINK_HALF_DUPLEX) {
switch (link.link_speed) {
- case ETH_SPEED_NUM_10M:
+ case RTE_ETH_SPEED_NUM_10M:
feature |= NETDEV_F_10MB_HD;
break;
- case ETH_SPEED_NUM_100M:
+ case RTE_ETH_SPEED_NUM_100M:
feature |= NETDEV_F_100MB_HD;
break;
- case ETH_SPEED_NUM_1G:
+ case RTE_ETH_SPEED_NUM_1G:
feature |= NETDEV_F_1GB_HD;
break;
@@ -3620,17 +3621,17 @@ netdev_dpdk_link_speed_to_str__(uint32_t link_speed)
{
switch (link_speed) {
- case ETH_SPEED_NUM_10M: return "10Mbps";
- case ETH_SPEED_NUM_100M: return "100Mbps";
- case ETH_SPEED_NUM_1G: return "1Gbps";
- case ETH_SPEED_NUM_2_5G: return "2.5Gbps";
- case ETH_SPEED_NUM_5G: return "5Gbps";
- case ETH_SPEED_NUM_10G: return "10Gbps";
- case ETH_SPEED_NUM_20G: return "20Gbps";
- case ETH_SPEED_NUM_25G: return "25Gbps";
- case ETH_SPEED_NUM_40G: return "40Gbps";
- case ETH_SPEED_NUM_50G: return "50Gbps";
- case ETH_SPEED_NUM_56G: return "56Gbps";
- case ETH_SPEED_NUM_100G: return "100Gbps";
- default: return "Not Defined";
+ case RTE_ETH_SPEED_NUM_10M: return "10Mbps";
+ case RTE_ETH_SPEED_NUM_100M: return "100Mbps";
+ case RTE_ETH_SPEED_NUM_1G: return "1Gbps";
+ case RTE_ETH_SPEED_NUM_2_5G: return "2.5Gbps";
+ case RTE_ETH_SPEED_NUM_5G: return "5Gbps";
+ case RTE_ETH_SPEED_NUM_10G: return "10Gbps";
+ case RTE_ETH_SPEED_NUM_20G: return "20Gbps";
+ case RTE_ETH_SPEED_NUM_25G: return "25Gbps";
+ case RTE_ETH_SPEED_NUM_40G: return "40Gbps";
+ case RTE_ETH_SPEED_NUM_50G: return "50Gbps";
+ case RTE_ETH_SPEED_NUM_56G: return "56Gbps";
+ case RTE_ETH_SPEED_NUM_100G: return "100Gbps";
+ default: return "Not Defined";
}
}
--
2.31.1
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
