Add: Support for DPDK 25.11

Author: Sakoram

lib/src/dev/mt_dev.c

@@ -802,7 +802,7 @@ static int dev_detect_link(struct mt_interface* inf) {
 
   memset(&eth_link, 0, sizeof(eth_link));
 
-  for (int i = 0; i < 100; i++) {
+  for (int i = 0; i < 300; i++) {
     err = rte_eth_link_get_nowait(port_id, &eth_link);
     if (err < 0) {
       err("%s, failed to get link status for port %d, ret %d\n", __func__, port_id, err);
@@ -814,7 +814,7 @@ static int dev_detect_link(struct mt_interface* inf) {
       mt_eth_link_dump(port_id);
       return 0;
     }
-    mt_sleep_ms(100); /* only happen on CVL PF */
+    mt_sleep_ms(100); /* only happen on CVL PF and CNV PF */
   }
 
   mt_eth_link_dump(port_id);

lib/src/mt_main.h

@@ -7,6 +7,7 @@
 #include <math.h>
 #include <rte_alarm.h>
 #include <rte_arp.h>
+#include <rte_cpuflags.h>
 #include <rte_errno.h>
 #include <rte_ethdev.h>
 #include <rte_thash.h>
@@ -961,7 +962,7 @@ struct mt_rsq_impl {
 /* if launch time enabled */
 #define MT_TXQ_FLOW_F_LAUNCH_TIME (MTL_BIT32(1))
 /* force to use socket, only for MT_DRV_F_KERNEL_BASED */
-#define MT_TXQ_FLOW_F_FORCE_SOCKET (MTL_BIT32(1))
+#define MT_TXQ_FLOW_F_FORCE_SOCKET (MTL_BIT32(2))
 
 /* request of tx queue flow */
 struct mt_txq_flow {

lib/src/mt_pcap.c

@@ -49,7 +49,16 @@ struct mt_pcap* mt_pcap_open(struct mtl_main_impl* impl, enum mtl_port port, int
     mt_pcap_close(pcap);
     return NULL;
   }
-#if RTE_VERSION >= RTE_VERSION_NUM(23, 3, 0, 0)
+
+#if RTE_VERSION >= RTE_VERSION_NUM(25, 11, 0, 0)
+  for (int i = 0; i < mt_num_ports(impl); i++) {
+    ret = rte_pcapng_add_interface(pcap->pcapng, mt_port_id(impl, i), DLT_EN10MB, NULL,
+                                   NULL, NULL);
+    if (ret < 0) {
+      warn("%s(%d), add interface fail %d on port %d\n", __func__, fd, ret, i);
+    }
+  }
+#elif RTE_VERSION >= RTE_VERSION_NUM(23, 3, 0, 0)
   /* add all port interfaces */
   for (int i = 0; i < mt_num_ports(impl); i++) {
     ret = rte_pcapng_add_interface(pcap->pcapng, mt_port_id(impl, i), NULL, NULL, NULL);

lib/src/mt_ptp.c

@@ -871,10 +871,6 @@ static void ptp_delay_req_task(struct mt_ptp_impl* ptp) {
   m->pkt_len = hdr_offset + sizeof(struct mt_ptp_sync_msg);
   m->data_len = m->pkt_len;
 
-#if MT_PTP_USE_TX_TIME_STAMP
-  ptp_timesync_read_tx_time(ptp, &tx_ns); /* read out tx time */
-#endif
-
   // mt_mbuf_dump(port, 0, "PTP_DELAY_REQ", m);
   uint16_t tx = mt_sys_queue_tx_burst(ptp->impl, port, &m, 1);
   if (tx < 1) {

lib/src/st2110/st_tx_video_session.c

@@ -639,7 +639,7 @@ static int tv_sync_pacing(struct mtl_main_impl* impl, struct st_tx_video_session
   uint64_t cur_tai = mt_get_ptp_time(impl, MTL_PORT_P);
   uint64_t cur_tsc = mt_get_tsc(impl);
   uint64_t start_time_tai;
-  uint64_t time_to_tx_ns;
+  int64_t time_to_tx_ns;
 
   pacing->cur_epochs = calc_frame_count_since_epoch(s, cur_tai, required_tai);
 
@@ -651,8 +651,8 @@ static int tv_sync_pacing(struct mtl_main_impl* impl, struct st_tx_video_session
   time_to_tx_ns = start_time_tai - cur_tai;
 
   if (time_to_tx_ns < 0) {
-    /* should never happen */
-    err("%s(%d), negative time_to_tx_ns detected: %ld ns. Current PTP time: %" PRIu64
+    /* should never happen, but it does. TODO: check why */
+    dbg("%s(%d), negative time_to_tx_ns detected: %ld ns. Current PTP time: %" PRIu64
         "\n",
         __func__, s->idx, time_to_tx_ns, cur_tai);
     time_to_tx_ns = 0;

patches/dpdk/25.11/0001-e810-set-max-ring-desc-to-max-allowed-by-hardware.patch

@@ -0,0 +1,26 @@
+From c4e622441564203a6e8b8586dcab520286d04236 Mon Sep 17 00:00:00 2001
+From: "Kasiewicz, Marek" <[email protected]>
+Date: Mon, 31 Mar 2025 11:42:58 +0000
+Subject: [PATCH 1/6] e810: set max ring desc to max allowed by hardware
+
+Signed-off-by: Kasiewicz, Marek <[email protected]>
+---
+ drivers/net/intel/iavf/iavf_rxtx.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/net/intel/iavf/iavf_rxtx.h b/drivers/net/intel/iavf/iavf_rxtx.h
+index 1641bfe59a..9502321be0 100644
+--- a/drivers/net/intel/iavf/iavf_rxtx.h
++++ b/drivers/net/intel/iavf/iavf_rxtx.h
+@@ -16,7 +16,7 @@
+ /* In QLEN must be whole number of 32 descriptors. */
+ #define IAVF_ALIGN_RING_DESC      32
+ #define IAVF_MIN_RING_DESC        64
+-#define IAVF_MAX_RING_DESC        4096
++#define IAVF_MAX_RING_DESC        (8192 - 32)
+ #define IAVF_DMA_MEM_ALIGN        4096
+ /* Base address of the HW descriptor ring should be 128B aligned. */
+ #define IAVF_RING_BASE_ALIGN      128
+-- 
+2.34.1
+

patches/dpdk/25.11/0002-net-iavf-refine-queue-rate-limit-configure.patch

@@ -0,0 +1,56 @@
+From 33d0f922f2bed99cdab07fa8b6f60b4150845139 Mon Sep 17 00:00:00 2001
+From: Ting Xu <[email protected]>
+Date: Tue, 19 Apr 2022 02:09:28 +0000
+Subject: [PATCH 2/6] net/iavf: refine queue rate limit configure
+
+Refine two operations when configuring queue rate limit:
+1. no need to stop port first, now can configure queue rate limit at
+runtime
+2. users can delete part of the queues and set new rate limit for them,
+but they must assign correct queue id. Otherwise, the result will be not
+correct.
+
+Signed-off-by: Ting Xu <[email protected]>
+---
+ drivers/net/intel/iavf/iavf_tm.c | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/net/intel/iavf/iavf_tm.c b/drivers/net/intel/iavf/iavf_tm.c
+index 1d12196ba6..67186dff67 100644
+--- a/drivers/net/intel/iavf/iavf_tm.c
++++ b/drivers/net/intel/iavf/iavf_tm.c
+@@ -810,8 +810,10 @@ static int iavf_hierarchy_commit(struct rte_eth_dev *dev,
+ 	int index = 0, node_committed = 0;
+ 	int i, ret_val = IAVF_SUCCESS;
+ 
+-	/* check if port is stopped */
+-	if (adapter->stopped != 1) {
++	/* check if port is stopped, except for setting queue bandwidth */
++	if (vf->tm_conf.nb_tc_node != 1 &&
++	    vf->qos_cap->num_elem != 1 &&
++	    adapter->stopped != 1) {
+ 		PMD_DRV_LOG(ERR, "Please stop port first");
+ 		ret_val = IAVF_ERR_NOT_READY;
+ 		goto err;
+@@ -862,7 +864,7 @@ static int iavf_hierarchy_commit(struct rte_eth_dev *dev,
+ 		q_tc_mapping->tc[tm_node->tc].req.queue_count++;
+ 
+ 		if (tm_node->shaper_profile) {
+-			q_bw->cfg[node_committed].queue_id = node_committed;
++			q_bw->cfg[node_committed].queue_id = tm_node->id;
+ 			q_bw->cfg[node_committed].shaper.peak =
+ 			tm_node->shaper_profile->profile.peak.rate /
+ 			1000 * IAVF_BITS_PER_BYTE;
+@@ -906,7 +908,8 @@ static int iavf_hierarchy_commit(struct rte_eth_dev *dev,
+ 		goto fail_clear;
+ 
+ 	vf->qtc_map = qtc_map;
+-	vf->tm_conf.committed = true;
++	if (adapter->stopped == 1)
++		vf->tm_conf.committed = true;
+ 	return ret_val;
+ 
+ fail_clear:
+-- 
+2.34.1
+

patches/dpdk/25.11/0003-ice-set-ICE_SCHED_DFLT_BURST_SIZE-to-2048.patch

@@ -0,0 +1,28 @@
+From 65ee1358c09bd98cd08a16598b1822f820037558 Mon Sep 17 00:00:00 2001
+From: Frank Du <[email protected]>
+Date: Tue, 21 Feb 2023 09:26:05 +0800
+Subject: [PATCH 3/6] ice: set ICE_SCHED_DFLT_BURST_SIZE to 2048
+
+For st2110 rl burst optimization
+
+Signed-off-by: Frank Du <[email protected]>
+---
+ drivers/net/intel/ice/base/ice_type.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/net/intel/ice/base/ice_type.h b/drivers/net/intel/ice/base/ice_type.h
+index ae3b944d6e..02e98ae988 100644
+--- a/drivers/net/intel/ice/base/ice_type.h
++++ b/drivers/net/intel/ice/base/ice_type.h
+@@ -1087,7 +1087,7 @@ enum ice_rl_type {
+ #define ICE_SCHED_NO_SHARED_RL_PROF_ID	0xFFFF
+ #define ICE_SCHED_DFLT_BW_WT		4
+ #define ICE_SCHED_INVAL_PROF_ID		0xFFFF
+-#define ICE_SCHED_DFLT_BURST_SIZE	(15 * 1024)	/* in bytes (15k) */
++#define ICE_SCHED_DFLT_BURST_SIZE	(2 * 1024)	/* in bytes (2k) */
+ 
+ /* Access Macros for Tx Sched RL Profile data */
+ #define ICE_TXSCHED_GET_RL_PROF_ID(p) LE16_TO_CPU((p)->info.profile_id)
+-- 
+2.34.1
+

patches/dpdk/25.11/0004-Change-to-enable-PTP.patch

@@ -0,0 +1,47 @@
+From 1df44ba751ddd8d9831cfaa123475fc0db172da8 Mon Sep 17 00:00:00 2001
+From: "Kasiewicz, Marek" <[email protected]>
+Date: Mon, 31 Mar 2025 12:37:40 +0000
+Subject: [PATCH 4/6] Change to enable PTP
+
+Signed-off-by: Kasiewicz, Marek <[email protected]>
+---
+ drivers/net/intel/ice/ice_rxtx.c | 9 +++------
+ 1 file changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/drivers/net/intel/ice/ice_rxtx.c b/drivers/net/intel/ice/ice_rxtx.c
+index da508592aa..c832fdd083 100644
+--- a/drivers/net/intel/ice/ice_rxtx.c
++++ b/drivers/net/intel/ice/ice_rxtx.c
+@@ -1972,8 +1972,7 @@ ice_rx_scan_hw_ring(struct ci_rx_queue *rxq)
+ 				pkt_flags |= rxq->ts_flag;
+ 			}
+ 
+-			if (ad->ptp_ena && ((mb->packet_type &
+-			    RTE_PTYPE_L2_MASK) == RTE_PTYPE_L2_ETHER_TIMESYNC)) {
++			if (ad->ptp_ena) {
+ 				rxq->time_high =
+ 				   rte_le_to_cpu_32(rxdp[j].wb.flex_ts.ts_high);
+ 				mb->timesync = rxq->queue_id;
+@@ -2339,8 +2338,7 @@ ice_recv_scattered_pkts(void *rx_queue,
+ 			pkt_flags |= rxq->ts_flag;
+ 		}
+ 
+-		if (ad->ptp_ena && ((first_seg->packet_type & RTE_PTYPE_L2_MASK)
+-		    == RTE_PTYPE_L2_ETHER_TIMESYNC)) {
++		if (ad->ptp_ena) {
+ 			rxq->time_high =
+ 			   rte_le_to_cpu_32(rxd.wb.flex_ts.ts_high);
+ 			first_seg->timesync = rxq->queue_id;
+@@ -2837,8 +2835,7 @@ ice_recv_pkts(void *rx_queue,
+ 			pkt_flags |= rxq->ts_flag;
+ 		}
+ 
+-		if (ad->ptp_ena && ((rxm->packet_type & RTE_PTYPE_L2_MASK) ==
+-		    RTE_PTYPE_L2_ETHER_TIMESYNC)) {
++		if (ad->ptp_ena) {
+ 			rxq->time_high =
+ 			   rte_le_to_cpu_32(rxd.wb.flex_ts.ts_high);
+ 			rxm->timesync = rxq->queue_id;
+-- 
+2.34.1
+

patches/dpdk/25.11/0005-iavf-disable-runtime-queue.patch

@@ -0,0 +1,28 @@
+From e3f5f1819f22b92d055c6d18e20aa7656c46a364 Mon Sep 17 00:00:00 2001
+From: Ric Li <[email protected]>
+Date: Fri, 1 Dec 2023 18:52:34 +0800
+Subject: [PATCH 5/6] iavf: disable runtime queue
+
+Signed-off-by: Ric Li <[email protected]>
+---
+ drivers/net/intel/iavf/iavf_ethdev.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/drivers/net/intel/iavf/iavf_ethdev.c b/drivers/net/intel/iavf/iavf_ethdev.c
+index 335a8126c4..10d4ff84f9 100644
+--- a/drivers/net/intel/iavf/iavf_ethdev.c
++++ b/drivers/net/intel/iavf/iavf_ethdev.c
+@@ -1140,9 +1140,7 @@ iavf_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
+ 	dev_info->reta_size = vf->vf_res->rss_lut_size;
+ 	dev_info->flow_type_rss_offloads = IAVF_RSS_OFFLOAD_ALL;
+ 	dev_info->max_mac_addrs = IAVF_NUM_MACADDR_MAX;
+-	dev_info->dev_capa =
+-		RTE_ETH_DEV_CAPA_RUNTIME_RX_QUEUE_SETUP |
+-		RTE_ETH_DEV_CAPA_RUNTIME_TX_QUEUE_SETUP;
++	dev_info->dev_capa &= ~RTE_ETH_DEV_CAPA_FLOW_RULE_KEEP;
+ 	dev_info->rx_offload_capa =
+ 		RTE_ETH_RX_OFFLOAD_VLAN_STRIP |
+ 		RTE_ETH_RX_OFFLOAD_QINQ_STRIP |
+-- 
+2.34.1
+