From 68ad2075628c1e5c6790d0ebe3484202bda17824 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Feb 14 2025 20:07:13 +0000
Subject: Import openvswitch3.2-3.2.0-116 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-3.2.0.patch b/SOURCES/openvswitch-3.2.0.patch
index 968b175..475ec1c 100644
--- a/SOURCES/openvswitch-3.2.0.patch
+++ b/SOURCES/openvswitch-3.2.0.patch
@@ -3702,7 +3702,7 @@ index d76d53f8f1..b7516257c5 100644
      }
  
 diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
-index 9730e0eecc..b8f065d1d7 100644
+index 9730e0eecc..b4eb82d6a5 100644
 --- a/lib/dpif-netdev.c
 +++ b/lib/dpif-netdev.c
 @@ -3380,14 +3380,13 @@ static inline void
@@ -3732,6 +3732,31 @@ index 9730e0eecc..b8f065d1d7 100644
      /* nb_thread counters for the overall total as well. */
      stats->size = ARRAY_SIZE(hwol_stats) * (nb_thread + 1);
      stats->counters = xcalloc(stats->size, sizeof *stats->counters);
+@@ -6293,9 +6296,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.");
+ 
+@@ -6311,9 +6311,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) {
 diff --git a/lib/dpif-netlink-rtnl.c b/lib/dpif-netlink-rtnl.c
 index 5788294ae0..f7035333e6 100644
 --- a/lib/dpif-netlink-rtnl.c
diff --git a/SPECS/openvswitch3.2.spec b/SPECS/openvswitch3.2.spec
index bac4316..9a8c925 100644
--- a/SPECS/openvswitch3.2.spec
+++ b/SPECS/openvswitch3.2.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 3.2.0
-Release: 115%{?dist}
+Release: 116%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -763,6 +763,12 @@ exit 0
 %endif
 
 %changelog
+* Fri Feb 14 2025 Open vSwitch CI <ovs-ci@redhat.com> - 3.2.0-116
+- Merging upstream branch-3.2 [RH git: e003b61ddc]
+    Commit list:
+    898ef685ca dpif-netdev: Fix Auto Load Balance debug log. (FDP-1145)
+
+
 * Fri Jan 24 2025 Open vSwitch CI <ovs-ci@redhat.com> - 3.2.0-115
 - Merging upstream branch-3.2 [RH git: 9ba79ad138]
     Commit list: