This commit adds support for DPDK v25.11.

It updates the CI script and documentation.

The following commit was previously added and is required for
compatibility with DPDK 25.11.
cd2ff530d740 ("dpdk: Convert dpdk-lcore-mask to DPDK lcore args.")

Signed-off-by: Kevin Traynor <[email protected]>
---
 .github/workflows/build-and-test.yml     |  2 +-
 Documentation/faq/releases.rst           |  2 +-
 Documentation/intro/install/dpdk.rst     | 16 ++++++++--------
 Documentation/topics/dpdk/phy.rst        | 12 ++++++------
 Documentation/topics/dpdk/vdev.rst       |  2 +-
 Documentation/topics/dpdk/vhost-user.rst |  2 +-
 Documentation/topics/testing.rst         |  2 +-
 Documentation/topics/userspace-tso.rst   |  2 +-
 NEWS                                     |  2 +-
 debian/control.in                        |  2 +-
 rhel/openvswitch-fedora.spec.in          |  2 +-
 11 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/build-and-test.yml 
b/.github/workflows/build-and-test.yml
index f7ca4d1f0..96a503ca5 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -15,5 +15,5 @@ jobs:
       CC: gcc
       DPDK_GIT: https://dpdk.org/git/dpdk-stable
-      DPDK_VER: 24.11.3
+      DPDK_VER: 25.11
     name: dpdk gcc
     outputs:
diff --git a/Documentation/faq/releases.rst b/Documentation/faq/releases.rst
index 436207ae3..7f1fe7077 100644
--- a/Documentation/faq/releases.rst
+++ b/Documentation/faq/releases.rst
@@ -186,5 +186,5 @@ Q: Are all the DPDK releases that OVS versions work with 
maintained?
     at `DPDK stable`_.
 
-.. _DPDK stable: http://doc.dpdk.org/guides-24.11/contributing/stable.html
+.. _DPDK stable: https://doc.dpdk.org/guides/contributing/stable.html
 
 Q: What features are not available in the Open vSwitch kernel datapath that
diff --git a/Documentation/intro/install/dpdk.rst 
b/Documentation/intro/install/dpdk.rst
index af824239e..06e31ea47 100644
--- a/Documentation/intro/install/dpdk.rst
+++ b/Documentation/intro/install/dpdk.rst
@@ -43,5 +43,5 @@ In addition to the requirements described in :doc:`general`, 
building Open
 vSwitch with DPDK will require the following:
 
-- DPDK 24.11.3
+- DPDK 25.11
 
 - A `DPDK supported NIC`_
@@ -60,6 +60,6 @@ vSwitch with DPDK will require the following:
 Detailed system requirements can be found at `DPDK requirements`_.
 
-.. _DPDK supported NIC: https://doc.dpdk.org/guides-24.11/nics/index.html
-.. _DPDK requirements: 
https://doc.dpdk.org/guides-24.11/linux_gsg/sys_reqs.html
+.. _DPDK supported NIC: https://doc.dpdk.org/guides-25.11/nics/index.html
+.. _DPDK requirements: 
https://doc.dpdk.org/guides-25.11/linux_gsg/sys_reqs.html
 
 .. _dpdk-install:
@@ -74,7 +74,7 @@ Install DPDK
 
        $ cd /usr/src/
-       $ wget https://fast.dpdk.org/rel/dpdk-24.11.3.tar.xz
-       $ tar xf dpdk-24.11.3.tar.xz
-       $ export DPDK_DIR=/usr/src/dpdk-stable-24.11.3
+       $ wget https://fast.dpdk.org/rel/dpdk-25.11.tar.xz
+       $ tar xf dpdk-25.11.tar.xz
+       $ export DPDK_DIR=/usr/src/dpdk-25.11
        $ cd $DPDK_DIR
 
@@ -122,5 +122,5 @@ Install DPDK
 .. _DPDK sources: http://dpdk.org/rel
 .. _DPDK documentation:
-   https://doc.dpdk.org/guides-24.11/linux_gsg/build_dpdk.html
+   https://doc.dpdk.org/guides-25.11/linux_gsg/build_dpdk.html
 
 Install OVS
@@ -723,5 +723,5 @@ Limitations
 
 .. _DPDK release notes:
-   https://doc.dpdk.org/guides-24.11/rel_notes/release_24_11.html
+   https://doc.dpdk.org/guides-25.11/rel_notes/release_25_11.html
 
 - Upper bound MTU: DPDK device drivers differ in how the L2 frame for a
diff --git a/Documentation/topics/dpdk/phy.rst 
b/Documentation/topics/dpdk/phy.rst
index 41b2c9132..487a5ba93 100644
--- a/Documentation/topics/dpdk/phy.rst
+++ b/Documentation/topics/dpdk/phy.rst
@@ -118,5 +118,5 @@ tool::
 For more information, refer to the `DPDK drivers documentation`_.
 
-.. _DPDK drivers documentation: 
https://doc.dpdk.org/guides-24.11/linux_gsg/linux_drivers.html
+.. _DPDK drivers documentation: 
https://doc.dpdk.org/guides-25.11/linux_gsg/linux_drivers.html
 
 .. _dpdk-phy-multiqueue:
@@ -149,5 +149,5 @@ Some physical NICs can be programmed to put these protocols 
in a dedicated
 hardware Rx queue using the rte_flow__ API.
 
-__ https://doc.dpdk.org/guides-24.11/prog_guide/ethdev/flow_offload.html
+__ https://doc.dpdk.org/guides-25.11/prog_guide/ethdev/flow_offload.html
 
 .. warning::
@@ -156,5 +156,5 @@ __ 
https://doc.dpdk.org/guides-24.11/prog_guide/ethdev/flow_offload.html
    `compatibility matrix`__ and vendor documentation for more details.
 
-   __ https://doc.dpdk.org/guides-24.11/nics/overview.html
+   __ https://doc.dpdk.org/guides-25.11/nics/overview.html
 
 Rx steering must be enabled for specific protocols per port. The
@@ -323,5 +323,5 @@ physical addressing for IOVA mode. For more information 
regarding IOVA modes
 in DPDK please refer to the `DPDK IOVA Mode Detection`__.
 
-__ 
https://doc.dpdk.org/guides-24.11/prog_guide/env_abstraction_layer.html#iova-mode-detection
+__ 
https://doc.dpdk.org/guides-25.11/prog_guide/env_abstraction_layer.html#iova-mode-detection
 
 To configure OVS DPDK to use physical addressing for IOVA::
@@ -355,5 +355,5 @@ Representors are multi devices created on top of one PF.
 For more information, refer to the `DPDK documentation`__.
 
-__ 
https://doc.dpdk.org/guides-24.11/prog_guide/ethdev/switch_representation.html#port-representors
+__ 
https://doc.dpdk.org/guides-25.11/prog_guide/ethdev/switch_representation.html#port-representors
 
 Prior to port representors there was a one-to-one relationship between the PF
@@ -489,5 +489,5 @@ in the ``options`` column of the ``Interface`` table.
    even if the options described in this section are unset from Open vSwitch.
 
-.. _bifurcated drivers: 
https://doc.dpdk.org/guides-24.11/linux_gsg/linux_drivers.html#bifurcated-driver
+.. _bifurcated drivers: 
https://doc.dpdk.org/guides-25.11/linux_gsg/linux_drivers.html#bifurcated-driver
 
 - Configure the VF MAC address::
diff --git a/Documentation/topics/dpdk/vdev.rst 
b/Documentation/topics/dpdk/vdev.rst
index 9effe6bd0..7cc7b4a12 100644
--- a/Documentation/topics/dpdk/vdev.rst
+++ b/Documentation/topics/dpdk/vdev.rst
@@ -64,3 +64,3 @@ More information on the different types of virtual DPDK PMDs 
can be found in
 the `DPDK documentation`__.
 
-__ https://doc.dpdk.org/guides-24.11/nics/overview.html
+__ https://doc.dpdk.org/guides-25.11/nics/overview.html
diff --git a/Documentation/topics/dpdk/vhost-user.rst 
b/Documentation/topics/dpdk/vhost-user.rst
index 20e8eb245..1d18b6c7e 100644
--- a/Documentation/topics/dpdk/vhost-user.rst
+++ b/Documentation/topics/dpdk/vhost-user.rst
@@ -557,3 +557,3 @@ shown with::
 Further information can be found in the
 `DPDK documentation
-<https://doc.dpdk.org/guides-24.11/prog_guide/vhost_lib.html>`__
+<https://doc.dpdk.org/guides-25.11/prog_guide/vhost_lib.html>`__
diff --git a/Documentation/topics/testing.rst b/Documentation/topics/testing.rst
index dbeaf2d93..1ca833d4a 100644
--- a/Documentation/topics/testing.rst
+++ b/Documentation/topics/testing.rst
@@ -359,5 +359,5 @@ All tests are skipped if no hugepages are configured. User 
must look into the DP
 manual to figure out how to `Configure hugepages`_.
 
-.. _Configure hugepages: 
https://doc.dpdk.org/guides-24.11/linux_gsg/sys_reqs.html
+.. _Configure hugepages: 
https://doc.dpdk.org/guides-25.11/linux_gsg/sys_reqs.html
 
 All the features documented under `Unit Tests`_ are available for the DPDK
diff --git a/Documentation/topics/userspace-tso.rst 
b/Documentation/topics/userspace-tso.rst
index ed4d36edd..e53ddd6e0 100644
--- a/Documentation/topics/userspace-tso.rst
+++ b/Documentation/topics/userspace-tso.rst
@@ -47,5 +47,5 @@ Poll Mode Driver (PMD) which supports `TSO`. For a list of 
features per PMD,
 refer to the `DPDK documentation`__.
 
-__ https://doc.dpdk.org/guides-24.11/nics/overview.html
+__ https://doc.dpdk.org/guides-25.11/nics/overview.html
 
 Enabling TSO
diff --git a/NEWS b/NEWS
index f9a74df1a..d34b85217 100644
--- a/NEWS
+++ b/NEWS
@@ -12,5 +12,5 @@ Post-v3.6.0
        connections, instead of limiting these commands to IPv6 only.
    - DPDK:
-     * OVS validated with DPDK 24.11.3.
+     * Add support for DPDK 25.11.
    - OVSDB-IDL:
      * New ovsdb_idl_txn_assert_read_only() interface to mark transactions
diff --git a/debian/control.in b/debian/control.in
index dfcf10bcc..836e2564a 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -22,5 +22,5 @@ Build-Depends:
  libcap-ng-dev,
  libdbus-1-dev [amd64 i386 ppc64el arm64],
-# DPDK_NETDEV  libdpdk-dev (>= 24.11) [amd64 i386 ppc64el arm64],
+# DPDK_NETDEV  libdpdk-dev (>= 25.11) [amd64 i386 ppc64el arm64],
  libnuma-dev [amd64 i386 ppc64el arm64],
  libpcap-dev [amd64 i386 ppc64el arm64],
diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in
index 26c0f6ec4..38fbee727 100644
--- a/rhel/openvswitch-fedora.spec.in
+++ b/rhel/openvswitch-fedora.spec.in
@@ -74,5 +74,5 @@ BuildRequires: libcap-ng libcap-ng-devel
 %if %{with dpdk}
 BuildRequires: libpcap-devel numactl-devel
-BuildRequires: dpdk-devel >= 24.11
+BuildRequires: dpdk-devel >= 25.11
 Provides: %{name}-dpdk = %{version}-%{release}
 %endif
-- 
2.52.0

_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Reply via email to