diff --git a/SOURCES/openvswitch-3.3.0.patch b/SOURCES/openvswitch-3.3.0.patch index bcead91..0c2a8b0 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) { @@ -7688,7 +7713,7 @@ index 49ac45275a..7cbea51654 100755 try: sockfd = socket.socket(socket.AF_PACKET, socket.SOCK_RAW) diff --git a/tests/system-common-macros.at b/tests/system-common-macros.at -index 01ebe364ee..0893187ce5 100644 +index 01ebe364ee..de5b65c279 100644 --- a/tests/system-common-macros.at +++ b/tests/system-common-macros.at @@ -2,10 +2,7 @@ @@ -7730,7 +7755,7 @@ index 01ebe364ee..0893187ce5 100644 +# +m4_define([OVS_GET_FTP], + [curl ftp://$1 --retry 3 --max-time 1 --retry-connrefused \ -+ --disable-eps -v $2] ++ --disable-epsv -v $2] +) + +# OVS_GET_FTP_ACTIVE([url], [optional_curl_arguments]) diff --git a/SPECS/openvswitch3.3.spec b/SPECS/openvswitch3.3.spec index 8bf86ae..ccf6c75 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: 89%{?dist} +Release: 91%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -769,6 +769,18 @@ exit 0 %endif %changelog +* Mon Feb 17 2025 Open vSwitch CI - 3.3.0-91 +- Merging upstream branch-3.3 [RH git: b01c4cda51] + Commit list: + c174d5e062 tests: Use correct arguments to curl. + + +* Fri Feb 14 2025 Open vSwitch CI - 3.3.0-90 +- Merging upstream branch-3.3 [RH git: 596ee65b1b] + Commit list: + b731551968 dpif-netdev: Fix Auto Load Balance debug log. (FDP-1145) + + * Thu Feb 13 2025 Open vSwitch CI - 3.3.0-89 - Merging upstream branch-3.3 [RH git: b4c5af8f50] Commit list: