Add: support for DPDK 25.03 (#1126)

Sakoram · zLukas · web-flow · commit a141fa92beda · 2025-04-16T12:57:37.000+02:00
- Add patches for DPDK 25.03,
`0003-net-ice-revert-PF-ICE-rate-limit-to-non-queue-group-.patch` was
dropped
- align mt_ipv4_udp to two-byte boundary: `mt_ipv4_udp` has to be
aligned after c14fba6 commit from DPDK.
This commits adds alignment to `rte_ipv4_hdr` structure, which adds
the same requirement to all structures that starts with `rte_ipv4_hdr`.
- unhandled ret from rte_eth_link_get_nowait

---------

Signed-off-by: Kasiewicz, Marek &lt;marek.kasiewicz@intel.com&gt;
Co-authored-by: zLukas &lt;lukasz.grab@intel.com&gt;
diff --git a/.github/workflows/afxdp_build.yml b/.github/workflows/afxdp_build.yml
@@ -15,6 +15,7 @@ on:
 env:
   # Customize the env if
   PKG_CONFIG_PATH: /usr/local/lib/pkgconfig:/usr/lib64/pkgconfig
+  DPDK_VERSION: 25.03
 
 permissions:
   contents: read
@@ -58,14 +59,27 @@ jobs:
           source: '.'
           extensions: 'hpp,h,cpp,c,cc'
 
+      - name: checkout dpdk repo
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          repository: 'DPDK/dpdk'
+          ref: v${{  env.DPDK_VERSION  }}
+          path: dpdk
       - name: Install the build dependency
         run: |
           apt-get update -y
           apt-get install -y sudo git gcc meson python3 python3-pyelftools pkg-config libnuma-dev libjson-c-dev libpcap-dev libgtest-dev libsdl2-dev libsdl2-ttf-dev libssl-dev
           apt-get install -y make m4 clang llvm zlib1g-dev libelf-dev libcap-ng-dev gcc-multilib
-          apt-get install -y dpdk-dev
           apt-get install -y systemtap-sdt-dev
-        
+
+      - name: Build DPDK from source
+        working-directory: dpdk
+        run: |
+          meson build
+          ninja -C build
+          cd build
+          sudo ninja install
+
       - name: Checkout xdp-tools
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
@@ -74,16 +88,19 @@ jobs:
           submodules: recursive
 
       - name: Build and install xdp-tools
+        working-directory: xdp-tools
         run: |
-          cd xdp-tools && ./configure
+          ./configure
           make && sudo make install
           cd lib/libbpf/src && sudo make install
          
       - name: Build
+        working-directory: "${{ github.workspace }}"
         run: |
           ./build.sh
 
       - name: Build with debug
+        working-directory: "${{ github.workspace }}"
         run: |
           rm build -rf
           ./build.sh debug
diff --git a/.github/workflows/afxdp_build_with_gtest.yml b/.github/workflows/afxdp_build_with_gtest.yml
@@ -19,7 +19,7 @@ concurrency:
 env:
   # Customize the env if
   BUILD_TYPE: Release
-  DPDK_VERSION: 23.11
+  DPDK_VERSION: 25.03
   MTL_BUILD_DISABLE_USDT: true
 
 permissions:
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -24,6 +24,10 @@ on:
 
 permissions:
   contents: read
+env:
+  # Customize the env if
+  PKG_CONFIG_PATH: /usr/local/lib/pkgconfig:/usr/lib64/pkgconfig
+  DPDK_VERSION: 25.03
 
 jobs:
   analyze:
@@ -62,14 +66,27 @@ jobs:
         run: |
           sudo apt-get update --fix-missing -y
           sudo apt-get install --no-install-recommends -y sudo git gcc meson python3 python3-pyelftools pkg-config libnuma-dev libjson-c-dev libpcap-dev libgtest-dev libsdl2-dev libsdl2-ttf-dev libssl-dev llvm clang
-          sudo apt-get install --no-install-recommends -y dpdk-dev systemtap-sdt-dev software-properties-common
+          sudo apt-get install --no-install-recommends -y systemtap-sdt-dev software-properties-common
 
+      - name: checkout dpdk repo
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          repository: 'DPDK/dpdk'
+          ref: v${{  env.DPDK_VERSION  }}
+          path: dpdk
       - name: Git config
         run: |
           git config --global user.email "you@example.com"
           git config --global user.name "Your Name"
-
+      - name: Build DPDK from source
+        working-directory: dpdk
+        run: |
+          meson build
+          ninja -C build
+          cd build
+          sudo ninja install
       - name: Build
+        working-directory: "${{ github.workspace }}"
         run: |
           ./build.sh
 
diff --git a/.github/workflows/dpdk_patches_build.yml b/.github/workflows/dpdk_patches_build.yml
@@ -14,7 +14,7 @@ on:
 
 env:
   # Customize the env if
-  DPDK_VERSION: 23.11
+  DPDK_VERSION: 25.03
 
 permissions:
   contents: read
diff --git a/.github/workflows/gtest-bare-metal.yml b/.github/workflows/gtest-bare-metal.yml
@@ -25,7 +25,7 @@ concurrency:
 env:
   # Customize the env if
   BUILD_TYPE: 'Release'
-  DPDK_VERSION: '23.11'
+  DPDK_VERSION: '25.03'
   # Bellow ENV variables are required to be defined on runner side:
   # TEST_PF_PORT_P: '0000:49:00.0'
   # TEST_PF_PORT_R: '0000:49:00.1'
diff --git a/.github/workflows/msys2_build.yml b/.github/workflows/msys2_build.yml
@@ -38,7 +38,7 @@ jobs:
         sys:
           - mingw64
           - ucrt64
-        dpdk: [23.11, 23.07]
+        dpdk: [25.03, 23.11]
     defaults:
       run:
         shell: msys2 {0}
diff --git a/.github/workflows/msys2_ffmpeg.yml b/.github/workflows/msys2_ffmpeg.yml
@@ -17,7 +17,7 @@ jobs:
       matrix:
         sys:
           - mingw64
-        dpdk: [23.11]
+        dpdk: [25.03]
     defaults:
       run:
         shell: msys2 {0}
diff --git a/.github/workflows/ubuntu_build.yml b/.github/workflows/ubuntu_build.yml
@@ -14,7 +14,8 @@ on:
 
 permissions:
   contents: read
-
+env: 
+    DPDK_VERSION: 25.03
 jobs:
   changes:
     runs-on: ubuntu-latest
@@ -54,20 +55,35 @@ jobs:
           source: '.'
           extensions: 'hpp,h,cpp,c,cc'
 
+      - name: checkout dpdk repo
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          repository: 'DPDK/dpdk'
+          ref: v${{  env.DPDK_VERSION  }}
+          path: dpdk
+
       - name: Install the build dependency
         run: |
           apt-get update -y
           apt-get install -y sudo git gcc meson python3 python3-pyelftools pkg-config libnuma-dev libjson-c-dev libpcap-dev libgtest-dev libsdl2-dev libsdl2-ttf-dev libssl-dev systemtap-sdt-dev llvm clang
-          apt-get install -y dpdk-dev
           apt-get install -y doxygen
           apt-get install -y make m4 clang llvm zlib1g-dev libelf-dev libcap-ng-dev libcap2-bin gcc-multilib
 
+      - name: Build DPDK from source
+        working-directory: dpdk
+        run: |
+            meson build
+            ninja -C build
+            cd build
+            sudo ninja install
       - name: Git config
+        working-directory: "${{ github.workspace }}"
         run: |
           git config --global user.email "you@example.com"
           git config --global user.name "Your Name"
 
       - name: Build
+        working-directory: "${{ github.workspace }}"
         run: |
           ./build.sh
 
diff --git a/.github/workflows/validation-tests.yml b/.github/workflows/validation-tests.yml
@@ -106,7 +106,7 @@ on:
 
 env:
   BUILD_TYPE: 'Release'
-  DPDK_VERSION: '23.11'
+  DPDK_VERSION: '25.03'
   DPDK_REBUILD: 'false'
 
 permissions:
diff --git a/.github/workflows/windows_build_with_gtest.yml b/.github/workflows/windows_build_with_gtest.yml
@@ -19,7 +19,7 @@ concurrency:
 env:
   # Customize the env if
   BUILD_TYPE: Release
-  DPDK_VERSION: 23.11
+  DPDK_VERSION: 25.03
   TEST_PORT_P: 0000:af:00.0
   TEST_PORT_R: 0000:af:00.1
   MSYSTEM: UCRT64
diff --git a/action.yml b/action.yml
@@ -16,7 +16,7 @@ inputs:
   dpdk:
     description: DPDK support version on Media Transport
     required: true
-    default: 23.11
+    default: 25.03
   tap:
     description: Enable TAP device
     required: true
diff --git a/doc/build.md b/doc/build.md
@@ -64,7 +64,7 @@ sudo pacman -Syu --needed  sdl2 sdl2_ttf
 
 ### 1.2. Build dependency from source code
 
-It's true that not all operating systems, including RHEL 9, come with all the libraries required for every software package. If you're trying to install a software that has dependencies not provided by default on your OS, you might need to install these dependencies manually. Skip these part if your setup has all dependencies resolved.
+It's true that not all operating systems, including RHEL 9, come with all the libraries required for every software package. If you're trying to install a software that has dependencies not provided by default by your package manager, you might need to install these dependencies manually. Skip these step if your setup has all dependencies resolved.
 
 Refer to below commands for how to build from code.
 
@@ -107,7 +107,7 @@ cd ../../
 
 ### 1.3. secure_path for root user
 
-The build steps use `sudo ninja install` to install the built to system. Some operating systems, including CentOS stream and RHEL 9, not has `/usr/local/bin/` into secure_path defaults.
+The build steps use `sudo ninja install` to install the build to the system. Some operating systems, including CentOS Stream and RHEL 9, do not have `/usr/local/bin/` in the secure_path defaults.
 
 Edit the file `/etc/sudoers`, find `secure_path` and append `/usr/local/bin`
 
@@ -128,13 +128,13 @@ export mtl_source_code=${PWD}/Media-Transport-Library
 
 ## 2. DPDK build and install
 
-### 2.1. Get DPDK 23.11 source code
+### 2.1. Get DPDK 25.03 source code
 
 ```bash
 git clone https://github.com/DPDK/dpdk.git
 cd dpdk
-git checkout v23.11
-git switch -c v23.11
+git checkout v25.03
+git switch -c v25.03
 cd ..
 ```
 
@@ -144,7 +144,7 @@ Note: $mtl_source_code should be pointed to top source code tree of Media Transp
 
 ```bash
 cd dpdk
-git am $mtl_source_code/patches/dpdk/23.11/*.patch
+git am $mtl_source_code/patches/dpdk/25.03/*.patch
 ```
 
 ### 2.3. Build and install DPDK library
diff --git a/doc/build_WIN.md b/doc/build_WIN.md
@@ -60,7 +60,7 @@ export mtl_source_code=${PWD}/Media-Transport-Library
 * Convert symlink patch files to real file:
 
 ```bash
-cd $mtl_source_code/patches/dpdk/23.11
+cd $mtl_source_code/patches/dpdk/25.03
 ls *.patch | xargs -I{} bash -c 'if [[ $(sed -n '1p' "{}") =~ ^../.*\.patch$ ]]; then cp "$(cat "{}")" "{}"; fi'
 cd windows
 ls *.patch | xargs -I{} bash -c 'if [[ $(sed -n '1p' "{}") =~ ^../.*\.patch$ ]]; then cp "$(cat "{}")" "{}"; fi'
@@ -72,13 +72,13 @@ ls *.patch | xargs -I{} bash -c 'if [[ $(sed -n '1p' "{}") =~ ^../.*\.patch$ ]];
 cd $mtl_source_code
 git clone https://github.com/DPDK/dpdk.git
 cd dpdk
-git checkout v23.11
-git switch -c v23.11
+git checkout v25.03
+git switch -c v25.03
 
 git config user.name "Your Name"        # config if not
 git config user.email "you@example.com" # config if not
-git am $mtl_source_code/patches/dpdk/23.11/*.patch
-git am $mtl_source_code/patches/dpdk/23.11/windows/*.patch
+git am $mtl_source_code/patches/dpdk/25.03/*.patch
+git am $mtl_source_code/patches/dpdk/25.03/windows/*.patch
 ```
 
 * Build and install DPDK:
diff --git a/docker/ubuntu.dockerfile b/docker/ubuntu.dockerfile
@@ -19,7 +19,7 @@ RUN apt-get update -y && \
     rm -rf /var/lib/apt/lists/*
 
 ENV MTL_REPO=Media-Transport-Library
-ENV DPDK_VER=23.11
+ENV DPDK_VER=25.03
 ENV PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/lib64/pkgconfig
 
 COPY . $MTL_REPO
diff --git a/lib/src/dev/mt_dev.c b/lib/src/dev/mt_dev.c
@@ -799,6 +799,7 @@ static int dev_detect_link(struct mt_interface* inf) {
   struct rte_eth_link eth_link;
   uint16_t port_id = inf->port_id;
   enum mtl_port port = inf->port;
+  int err;
 
   if (inf->drv_info.flags & MT_DRV_F_NOT_DPDK_PMD) {
     dbg("%s(%d), not dpdk based\n", __func__, port);
@@ -808,7 +809,12 @@ static int dev_detect_link(struct mt_interface* inf) {
   memset(&eth_link, 0, sizeof(eth_link));
 
   for (int i = 0; i < 100; i++) {
-    rte_eth_link_get_nowait(port_id, &eth_link);
+    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);
+      return err;
+    }
+
     if (eth_link.link_status) {
       inf->link_speed = eth_link.link_speed;
       mt_eth_link_dump(port_id);
diff --git a/lib/src/mt_main.h b/lib/src/mt_main.h
@@ -119,7 +119,7 @@ struct mt_ptp_port_id {
 struct mt_ipv4_udp {
   struct rte_ipv4_hdr ip;
   struct rte_udp_hdr udp;
-} __attribute__((__packed__));
+} __attribute__((__packed__)) __attribute__((__aligned__(2)));
 
 enum mt_port_type {
   MT_PORT_ERR = 0,
diff --git a/lib/src/mt_util.c b/lib/src/mt_util.c
@@ -386,8 +386,13 @@ void mt_lcore_dump() {
 
 void mt_eth_link_dump(uint16_t port_id) {
   struct rte_eth_link eth_link;
+  int err;
 
-  rte_eth_link_get_nowait(port_id, &eth_link);
+  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);
+    return;
+  }
 
   critical("%s(%d), link_speed %dg link_status %d link_duplex %d link_autoneg %d\n",
            __func__, port_id, eth_link.link_speed / 1000, eth_link.link_status,
diff --git a/patches/dpdk/25.03/0001-e810-set-max-ring-desc-to-max-allowed-by-hardware.patch b/patches/dpdk/25.03/0001-e810-set-max-ring-desc-to-max-allowed-by-hardware.patch
@@ -0,0 +1,26 @@
+From 338b53c69db2462897efed66a97109e9ef3866c5 Mon Sep 17 00:00:00 2001
+From: "Kasiewicz, Marek" <marek.kasiewicz@intel.com>
+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 <marek.kasiewicz@intel.com>
+---
+ 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 823a6efa9a..c1a62a9a5f 100644
+--- a/drivers/net/intel/iavf/iavf_rxtx.h
++++ b/drivers/net/intel/iavf/iavf_rxtx.h
+@@ -11,7 +11,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
+
diff --git a/patches/dpdk/25.03/0002-net-iavf-refine-queue-rate-limit-configure.patch b/patches/dpdk/25.03/0002-net-iavf-refine-queue-rate-limit-configure.patch
diff --git a/patches/dpdk/25.03/0003-ice-set-ICE_SCHED_DFLT_BURST_SIZE-to-2048.patch b/patches/dpdk/25.03/0003-ice-set-ICE_SCHED_DFLT_BURST_SIZE-to-2048.patch
diff --git a/patches/dpdk/25.03/0004-Change-to-enable-PTP.patch b/patches/dpdk/25.03/0004-Change-to-enable-PTP.patch
diff --git a/patches/dpdk/25.03/0005-iavf-disable-runtime-queue.patch b/patches/dpdk/25.03/0005-iavf-disable-runtime-queue.patch
diff --git a/patches/dpdk/25.03/0006-pcapng-add-user-timestamp-support.patch b/patches/dpdk/25.03/0006-pcapng-add-user-timestamp-support.patch
diff --git a/patches/dpdk/25.03/hdr_split/0001-net-intel-ice-support-hdr-split-mbuf-callback.patch b/patches/dpdk/25.03/hdr_split/0001-net-intel-ice-support-hdr-split-mbuf-callback.patch
diff --git a/script/build_dpdk.sh b/script/build_dpdk.sh
