From 8e7a916fcffc818d93d0c3800a8e041e47a6f435 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Jan 25 2025 22:03:53 +0000
Subject: Import openvswitch3.4-3.4.0-39 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-3.4.0.patch b/SOURCES/openvswitch-3.4.0.patch
index 2bbd0bb..7357657 100644
--- a/SOURCES/openvswitch-3.4.0.patch
+++ b/SOURCES/openvswitch-3.4.0.patch
@@ -46,7 +46,7 @@ index d73154a971..9f0fbfe40d 100644
      matrix:
        COMPILER: gcc
 diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
-index 9d3a13ca1c..9aaf451451 100644
+index 9d3a13ca1c..d8c2746ea5 100644
 --- a/.github/workflows/build-and-test.yml
 +++ b/.github/workflows/build-and-test.yml
 @@ -7,15 +7,18 @@ env:
@@ -62,7 +62,7 @@ index 9d3a13ca1c..9aaf451451 100644
        CC: gcc
        DPDK_GIT: https://dpdk.org/git/dpdk-stable
 -      DPDK_VER: 23.11.1
-+      DPDK_VER: 23.11.2
++      DPDK_VER: 23.11.3
      name: dpdk gcc
      outputs:
        dpdk_key: ${{ steps.gen_dpdk_key.outputs.key }}
@@ -329,7 +329,7 @@ index 9d3a13ca1c..9aaf451451 100644
  
      strategy:
 diff --git a/Documentation/faq/releases.rst b/Documentation/faq/releases.rst
-index 7c32d7acfc..d345b63d5b 100644
+index 7c32d7acfc..70f5b1b13a 100644
 --- a/Documentation/faq/releases.rst
 +++ b/Documentation/faq/releases.rst
 @@ -216,12 +216,12 @@ Q: What DPDK version does each Open vSwitch release work with?
@@ -342,17 +342,17 @@ index 7c32d7acfc..d345b63d5b 100644
 -    3.2.x        22.11.5
 -    3.3.x        23.11.1
 -    3.4.x        23.11.1
-+    2.17.x       21.11.8
-+    3.0.x        21.11.8
-+    3.1.x        22.11.6
-+    3.2.x        22.11.6
-+    3.3.x        23.11.2
-+    3.4.x        23.11.2
++    2.17.x       21.11.9
++    3.0.x        21.11.9
++    3.1.x        22.11.7
++    3.2.x        22.11.7
++    3.3.x        23.11.3
++    3.4.x        23.11.3
      ============ ========
  
  Q: Are all the DPDK releases that OVS versions work with maintained?
 diff --git a/Documentation/intro/install/dpdk.rst b/Documentation/intro/install/dpdk.rst
-index 63a978f0e8..ebd29a45a9 100644
+index 63a978f0e8..f98f3265d4 100644
 --- a/Documentation/intro/install/dpdk.rst
 +++ b/Documentation/intro/install/dpdk.rst
 @@ -42,7 +42,7 @@ Build requirements
@@ -360,7 +360,7 @@ index 63a978f0e8..ebd29a45a9 100644
  vSwitch with DPDK will require the following:
  
 -- DPDK 23.11.1
-+- DPDK 23.11.2
++- DPDK 23.11.3
  
  - A `DPDK supported NIC`_
  
@@ -371,9 +371,9 @@ index 63a978f0e8..ebd29a45a9 100644
 -       $ wget https://fast.dpdk.org/rel/dpdk-23.11.1.tar.xz
 -       $ tar xf dpdk-23.11.1.tar.xz
 -       $ export DPDK_DIR=/usr/src/dpdk-stable-23.11.1
-+       $ wget https://fast.dpdk.org/rel/dpdk-23.11.2.tar.xz
-+       $ tar xf dpdk-23.11.2.tar.xz
-+       $ export DPDK_DIR=/usr/src/dpdk-stable-23.11.2
++       $ wget https://fast.dpdk.org/rel/dpdk-23.11.3.tar.xz
++       $ tar xf dpdk-23.11.3.tar.xz
++       $ export DPDK_DIR=/usr/src/dpdk-stable-23.11.3
         $ cd $DPDK_DIR
  
  #. Configure and install DPDK using Meson
@@ -644,10 +644,10 @@ index a21bb2b5de..07bdc29465 100644
  All kernel devices that use the raw socket interface (veth, for example)
  require the kernel commit 9d2f67e43b73 ("net/packet: fix packet drop as of
 diff --git a/NEWS b/NEWS
-index 944c95a8d7..3b22d550a1 100644
+index 944c95a8d7..51cb667552 100644
 --- a/NEWS
 +++ b/NEWS
-@@ -1,3 +1,20 @@
+@@ -1,3 +1,22 @@
 +v3.4.2 - xx xxx xxxx
 +--------------------
 +   - The limit on the number of fields for address prefix tracking in flow
@@ -658,6 +658,8 @@ index 944c95a8d7..3b22d550a1 100644
 +                    name=table123 prefixes=nw_dst,nw_src,ipv6_dst,ipv6_src
 +     This allows to significantly reduce amount of datapath flows generated
 +     from mixed IPv4+IPv6 flow tables, if configured.
++   - DPDK:
++     * OVS validated with DPDK 23.11.3.
 +
 +v3.4.1 - 15 Nov 2024
 +--------------------
diff --git a/SPECS/openvswitch3.4.spec b/SPECS/openvswitch3.4.spec
index 8c4492d..44cd7d6 100644
--- a/SPECS/openvswitch3.4.spec
+++ b/SPECS/openvswitch3.4.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 3.4.0
-Release: 38%{?dist}
+Release: 39%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -770,6 +770,12 @@ exit 0
 %endif
 
 %changelog
+* Fri Jan 24 2025 Open vSwitch CI <ovs-ci@redhat.com> - 3.4.0-39
+- Merging upstream branch-3.4 [RH git: 956e0b7549]
+    Commit list:
+    2b7de35f08 dpdk: Use DPDK 23.11.3 release for OVS 3.4.
+
+
 * Thu Jan 23 2025 Open vSwitch CI <ovs-ci@redhat.com> - 3.4.0-38
 - Merging upstream branch-3.4 [RH git: 04a798dd77]
     Commit list: