From ff21e075a14a3898291ca1e7420cee42b69b5507 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Feb 14 2025 15:46:33 +0000
Subject: Import openvswitch3.5-3.5.0-0.23 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-3.5.0.patch b/SOURCES/openvswitch-3.5.0.patch
index 9ae8a75..00aa439 100644
--- a/SOURCES/openvswitch-3.5.0.patch
+++ b/SOURCES/openvswitch-3.5.0.patch
@@ -922,7 +922,7 @@ index 4afbbe7223..0f487a4283 100644
  
      *dp_packet_ol_flags_ptr(p) = ol_flags;
 diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
-index 2a529f272d..11f82210a8 100644
+index 2a529f272d..87d69c46d5 100644
 --- a/lib/dpif-netdev.c
 +++ b/lib/dpif-netdev.c
 @@ -115,7 +115,6 @@ COVERAGE_DEFINE(datapath_drop_lock_error);
@@ -933,7 +933,32 @@ index 2a529f272d..11f82210a8 100644
  COVERAGE_DEFINE(datapath_drop_recirc_error);
  COVERAGE_DEFINE(datapath_drop_invalid_port);
  COVERAGE_DEFINE(datapath_drop_invalid_bond);
-@@ -8923,34 +8922,6 @@ static void
+@@ -6519,9 +6518,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.");
+ 
+@@ -6537,9 +6533,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) {
+@@ -8923,34 +8924,6 @@ static void
  dp_netdev_recirculate(struct dp_netdev_pmd_thread *pmd,
                        struct dp_packet_batch *packets)
  {
diff --git a/SPECS/openvswitch3.5.spec b/SPECS/openvswitch3.5.spec
index 656363a..5eb3c43 100644
--- a/SPECS/openvswitch3.5.spec
+++ b/SPECS/openvswitch3.5.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 3.5.0
-Release: 0.22%{?dist}
+Release: 0.23%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -773,6 +773,12 @@ exit 0
 %endif
 
 %changelog
+* Fri Feb 14 2025 Open vSwitch CI <ovs-ci@redhat.com> - 3.5.0-0.23
+- Merging upstream branch-3.5 [RH git: f4fb85cfcc]
+    Commit list:
+    6740a52300 dpif-netdev: Fix Auto Load Balance debug log. (FDP-1145)
+
+
 * Thu Feb 13 2025 Open vSwitch CI <ovs-ci@redhat.com> - 3.5.0-0.22
 - Merging upstream branch-3.5 [RH git: 5f33ac20e0]
     Commit list: