From abe49cdcea35b1ccd6546aab5c9e68d92d6899c7 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Feb 14 2025 16:44:58 +0000
Subject: Import openvswitch3.1-3.1.0-147 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-3.1.0.patch b/SOURCES/openvswitch-3.1.0.patch
index dcd0784..0920b38 100644
--- a/SOURCES/openvswitch-3.1.0.patch
+++ b/SOURCES/openvswitch-3.1.0.patch
@@ -4088,7 +4088,7 @@ index 240babc03e..0ff8cda826 100644
      }
  
 diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
-index c9f7179c3b..4c85ab4aad 100644
+index c9f7179c3b..53e2c76ef1 100644
 --- a/lib/dpif-netdev.c
 +++ b/lib/dpif-netdev.c
 @@ -3365,14 +3365,13 @@ static inline void
@@ -4189,7 +4189,32 @@ index c9f7179c3b..4c85ab4aad 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);
-@@ -9616,6 +9634,7 @@ dpif_netdev_bond_stats_get(struct dpif *dpif, uint32_t bond_id,
+@@ -6254,9 +6272,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.");
+ 
+@@ -6272,9 +6287,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) {
+@@ -9616,6 +9636,7 @@ dpif_netdev_bond_stats_get(struct dpif *dpif, uint32_t bond_id,
  const struct dpif_class dpif_netdev_class = {
      "netdev",
      true,                       /* cleanup_required */
diff --git a/SPECS/openvswitch3.1.spec b/SPECS/openvswitch3.1.spec
index c2a5420..cf9a32e 100644
--- a/SPECS/openvswitch3.1.spec
+++ b/SPECS/openvswitch3.1.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 3.1.0
-Release: 146%{?dist}
+Release: 147%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -756,6 +756,12 @@ exit 0
 %endif
 
 %changelog
+* Fri Feb 14 2025 Open vSwitch CI <ovs-ci@redhat.com> - 3.1.0-147
+- Merging upstream branch-3.1 [RH git: 6161735248]
+    Commit list:
+    c4615997f9 dpif-netdev: Fix Auto Load Balance debug log. (FDP-1145)
+
+
 * Fri Jan 31 2025 Timothy Redaelli <tredaelli@redhat.com> - 3.1.0-146
 - template: use %patch -P0 instead of %patch0 [RH git: 19f585eb57]