From 919024e93a10e01d76dc23eb4cd7b205c5a73438 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Feb 14 2025 21:27:31 +0000
Subject: Import openvswitch3.3-3.3.0-40 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-3.3.0.patch b/SOURCES/openvswitch-3.3.0.patch
index bcead91..1818b0e 100644
--- a/SOURCES/openvswitch-3.3.0.patch
+++ b/SOURCES/openvswitch-3.3.0.patch
@@ -2309,7 +2309,7 @@ index d76d53f8f1..b7516257c5 100644
      }
  
 diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
-index 46e24d204d..99ff9b3693 100644
+index 46e24d204d..f439f9c374 100644
 --- a/lib/dpif-netdev.c
 +++ b/lib/dpif-netdev.c
 @@ -115,6 +115,7 @@ COVERAGE_DEFINE(datapath_drop_lock_error);
@@ -2320,7 +2320,32 @@ index 46e24d204d..99ff9b3693 100644
  COVERAGE_DEFINE(datapath_drop_recirc_error);
  COVERAGE_DEFINE(datapath_drop_invalid_port);
  COVERAGE_DEFINE(datapath_drop_invalid_bond);
-@@ -8912,6 +8913,34 @@ static void
+@@ -6508,9 +6509,6 @@ pmd_rebalance_dry_run(struct dp_netdev *dp)
+     struct sched_numa_list numa_list_cur;
+     struct sched_numa_list numa_list_est;
+     bool thresh_met = false;
+-    uint64_t current_var, estimate_var;
+-    struct sched_numa *numa_cur, *numa_est;
+-    uint64_t improvement = 0;
+ 
+     VLOG_DBG("PMD auto load balance performing dry run.");
+ 
+@@ -6526,9 +6524,14 @@ pmd_rebalance_dry_run(struct dp_netdev *dp)
+     /* Check if cross-numa polling, there is only one numa with PMDs. */
+     if (!sched_numa_list_cross_numa_polling(&numa_list_est) ||
+             sched_numa_list_count(&numa_list_est) == 1) {
++        struct sched_numa *numa_cur;
+ 
+         /* Calculate variances. */
+         HMAP_FOR_EACH (numa_cur, node, &numa_list_cur.numas) {
++            uint64_t current_var, estimate_var;
++            struct sched_numa *numa_est;
++            uint64_t improvement = 0;
++
+             numa_est = sched_numa_list_lookup(&numa_list_est,
+                                               numa_cur->numa_id);
+             if (!numa_est) {
+@@ -8912,6 +8915,34 @@ static void
  dp_netdev_recirculate(struct dp_netdev_pmd_thread *pmd,
                        struct dp_packet_batch *packets)
  {
diff --git a/SPECS/openvswitch3.3.spec b/SPECS/openvswitch3.3.spec
index 7e0a0a6..052875e 100644
--- a/SPECS/openvswitch3.3.spec
+++ b/SPECS/openvswitch3.3.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 3.3.0
-Release: 39%{?dist}
+Release: 40%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -769,6 +769,12 @@ exit 0
 %endif
 
 %changelog
+* Fri Feb 14 2025 Open vSwitch CI <ovs-ci@redhat.com> - 3.3.0-40
+- Merging upstream branch-3.3 [RH git: 66869f1fdb]
+    Commit list:
+    b731551968 dpif-netdev: Fix Auto Load Balance debug log. (FDP-1145)
+
+
 * Thu Feb 13 2025 Open vSwitch CI <ovs-ci@redhat.com> - 3.3.0-39
 - Merging upstream branch-3.3 [RH git: 2d50482dd3]
     Commit list: