diff --git a/SOURCES/openvswitch-3.5.0.patch b/SOURCES/openvswitch-3.5.0.patch index 70c621d..ee0984a 100644 --- a/SOURCES/openvswitch-3.5.0.patch +++ b/SOURCES/openvswitch-3.5.0.patch @@ -91,6 +91,57 @@ index e59ff17ade..d9962765f1 100644 if (err) { nh_s_ip6 = s_ip6; } +diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c +index bf43d5d4bc..2f79be79a3 100644 +--- a/ofproto/ofproto-dpif.c ++++ b/ofproto/ofproto-dpif.c +@@ -5392,7 +5392,6 @@ group_set_selection_method(struct group_dpif *group) + const struct ofputil_group_props *props = &group->up.props; + const char *selection_method = props->selection_method; + +- VLOG_DBG("Constructing select group %"PRIu32, group->up.group_id); + if (selection_method[0] == '\0') { + VLOG_DBG("No selection method specified. Trying dp_hash."); + /* If the controller has not specified a selection method, check if +@@ -5459,6 +5458,7 @@ group_construct(struct ofgroup *group_) + group_construct_stats(group); + group->hash_map = NULL; + if (group->up.type == OFPGT11_SELECT) { ++ VLOG_DBG("Constructing select group %"PRIu32, group->up.group_id); + group_set_selection_method(group); + } + ovs_mutex_unlock(&group->stats_mutex); +@@ -5476,6 +5476,21 @@ group_destruct(struct ofgroup *group_) + } + } + ++static void ++group_modify(struct ofgroup *group_) ++{ ++ struct group_dpif *group = group_dpif_cast(group_); ++ ++ if (group->hash_map) { ++ free(group->hash_map); ++ group->hash_map = NULL; ++ } ++ if (group->up.type == OFPGT11_SELECT) { ++ VLOG_DBG("Modifying select group %"PRIu32, group->up.group_id); ++ group_set_selection_method(group); ++ } ++} ++ + static enum ofperr + group_get_stats(const struct ofgroup *group_, struct ofputil_group_stats *ogs) + { +@@ -7299,7 +7314,7 @@ const struct ofproto_class ofproto_dpif_class = { + group_construct, /* group_construct */ + group_destruct, /* group_destruct */ + group_dealloc, /* group_dealloc */ +- NULL, /* group_modify */ ++ group_modify, /* group_modify */ + group_get_stats, /* group_get_stats */ + get_datapath_version, /* get_datapath_version */ + get_datapath_cap, diff --git a/python/ovs/db/idl.py b/python/ovs/db/idl.py index c8cc543465..384428c3fc 100644 --- a/python/ovs/db/idl.py @@ -126,10 +177,110 @@ index 60060ee2e0..920bbcac0b 100644 AT_CHECK([ovs-ofctl add-flow br0 action=normal]) AT_CHECK([ovs-appctl netdev-dummy/receive p1 'in_port(1),packet_type(ns=0,id=0),eth(src=50:54:00:00:00:09,dst=50:54:00:00:00:0a),eth_type(0x0800),ipv4(src=10.0.0.2,dst=10.0.0.1,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)']) diff --git a/tests/ofproto-dpif.at b/tests/ofproto-dpif.at -index fa5f148b4c..7527104863 100644 +index fa5f148b4c..fbc3deb68e 100644 --- a/tests/ofproto-dpif.at +++ b/tests/ofproto-dpif.at -@@ -9482,6 +9482,7 @@ AT_CHECK([ovs-appctl upcall/disable-ufid], [0], [Datapath dumping tersely using +@@ -1335,6 +1335,99 @@ m4_for([id], [1], [64], [1], [ + OVS_VSWITCHD_STOP + AT_CLEANUP + ++AT_SETUP([ofproto-dpif - select group with dp_hash, insert/remove buckets]) ++ ++OVS_VSWITCHD_START ++add_of_ports br0 1 10 ++ ++AT_CHECK([ovs-appctl vlog/set ofproto_dpif:file:dbg]) ++ ++dnl Add a group without buckets. ++AT_CHECK([ovs-ofctl -O OpenFlow15 add-group br0 \ ++ 'group_id=1235,type=select,selection_method=dp_hash']) ++AT_CHECK([grep -A3 "Constructing select group 1235" ovs-vswitchd.log \ ++ | sed 's/^.*ofproto_dpif/ofproto_dpif/'], [0], [dnl ++ofproto_dpif|DBG|Constructing select group 1235 ++ofproto_dpif|DBG|Selection method specified: dp_hash. ++ofproto_dpif|DBG| Don't apply dp_hash method without buckets. ++ofproto_dpif|DBG|Falling back to default hash method. ++]) ++ ++m4_define([OFG_BUCKET], [bucket=weight=$1,bucket_id=$1,output:10]) ++ ++dnl Add two buckets one by one. ++get_log_next_line_num ++AT_CHECK([ovs-ofctl -O OpenFlow15 insert-buckets br0 \ ++ group_id=1235,command_bucket_id=last,OFG_BUCKET([5])]) ++AT_CHECK([tail -n +$LINENUM ovs-vswitchd.log | grep -E '(Bucket|group 1235)' \ ++ | sed 's/^.*ofproto_dpif/ofproto_dpif/'], [0], [dnl ++ofproto_dpif|DBG|Constructing select group 1235 ++ofproto_dpif|DBG| Bucket 5: weight=5, target=16.00 hits=16 ++ofproto_dpif|DBG|Modifying select group 1235 ++ofproto_dpif|DBG| Bucket 5: weight=5, target=16.00 hits=16 ++]) ++get_log_next_line_num ++AT_CHECK([ovs-ofctl -O OpenFlow15 insert-buckets br0 \ ++ group_id=1235,command_bucket_id=last,OFG_BUCKET([6])]) ++AT_CHECK([tail -n +$LINENUM ovs-vswitchd.log | grep -E '(Bucket|group 1235)' \ ++ | sed 's/^.*ofproto_dpif/ofproto_dpif/'], [0], [dnl ++ofproto_dpif|DBG|Constructing select group 1235 ++ofproto_dpif|DBG| Bucket 6: weight=6, target=16.00 hits=16 ++ofproto_dpif|DBG|Modifying select group 1235 ++ofproto_dpif|DBG| Bucket 5: weight=5, target=7.27 hits=7 ++ofproto_dpif|DBG| Bucket 6: weight=6, target=8.73 hits=9 ++]) ++dnl Add two more in the middle. ++get_log_next_line_num ++AT_CHECK([ovs-ofctl -O OpenFlow15 insert-buckets br0 \ ++ group_id=1235,command_bucket_id=5,OFG_BUCKET([7]),OFG_BUCKET([8])]) ++AT_CHECK([tail -n +$LINENUM ovs-vswitchd.log | grep -E '(Bucket|group 1235)' \ ++ | sed 's/^.*ofproto_dpif/ofproto_dpif/'], [0], [dnl ++ofproto_dpif|DBG|Constructing select group 1235 ++ofproto_dpif|DBG| Bucket 7: weight=7, target=7.47 hits=7 ++ofproto_dpif|DBG| Bucket 8: weight=8, target=8.53 hits=9 ++ofproto_dpif|DBG|Modifying select group 1235 ++ofproto_dpif|DBG| Bucket 5: weight=5, target=3.08 hits=3 ++ofproto_dpif|DBG| Bucket 7: weight=7, target=4.31 hits=4 ++ofproto_dpif|DBG| Bucket 8: weight=8, target=4.92 hits=5 ++ofproto_dpif|DBG| Bucket 6: weight=6, target=3.69 hits=4 ++]) ++dnl Remove the last bucket. ++get_log_next_line_num ++AT_CHECK([ovs-ofctl -O OpenFlow15 remove-buckets br0 \ ++ group_id=1235,command_bucket_id=last]) ++AT_CHECK([tail -n +$LINENUM ovs-vswitchd.log | grep -E '(Bucket|group 1235)' \ ++ | sed 's/^.*ofproto_dpif/ofproto_dpif/'], [0], [dnl ++ofproto_dpif|DBG|Constructing select group 1235 ++ofproto_dpif|DBG|Modifying select group 1235 ++ofproto_dpif|DBG| Bucket 5: weight=5, target=4.00 hits=4 ++ofproto_dpif|DBG| Bucket 7: weight=7, target=5.60 hits=6 ++ofproto_dpif|DBG| Bucket 8: weight=8, target=6.40 hits=6 ++]) ++dnl Remove the one in the middle. ++get_log_next_line_num ++AT_CHECK([ovs-ofctl -O OpenFlow15 remove-buckets br0 \ ++ group_id=1235,command_bucket_id=7]) ++AT_CHECK([tail -n +$LINENUM ovs-vswitchd.log | grep -E '(Bucket|group 1235)' \ ++ | sed 's/^.*ofproto_dpif/ofproto_dpif/'], [0], [dnl ++ofproto_dpif|DBG|Constructing select group 1235 ++ofproto_dpif|DBG|Modifying select group 1235 ++ofproto_dpif|DBG| Bucket 5: weight=5, target=6.15 hits=6 ++ofproto_dpif|DBG| Bucket 8: weight=8, target=9.85 hits=10 ++]) ++dnl Remove all the remaining. ++get_log_next_line_num ++AT_CHECK([ovs-ofctl -O OpenFlow15 remove-buckets br0 \ ++ group_id=1235,command_bucket_id=all]) ++AT_CHECK([tail -n +$LINENUM ovs-vswitchd.log | grep -E '(Bucket|group 1235)' \ ++ | sed 's/^.*ofproto_dpif/ofproto_dpif/'], [0], [dnl ++ofproto_dpif|DBG|Constructing select group 1235 ++ofproto_dpif|DBG|Modifying select group 1235 ++]) ++ ++OVS_VSWITCHD_STOP ++AT_CLEANUP ++ + AT_SETUP([ofproto-dpif - select group with explicit dp_hash selection method]) + + OVS_VSWITCHD_START +@@ -9482,6 +9575,7 @@ AT_CHECK([ovs-appctl upcall/disable-ufid], [0], [Datapath dumping tersely using ], []) AT_CHECK([ovs-appctl time/stop]) AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) @@ -137,7 +288,7 @@ index fa5f148b4c..7527104863 100644 AT_CHECK([ovs-ofctl add-flow br0 actions=LOCAL,output:1,output:2]) AT_CHECK([ovs-ofctl add-flow br1 actions=LOCAL,output:1,output:3]) -@@ -10197,6 +10198,7 @@ m4_define([OFPROTO_DPIF_MEGAFLOW_DISABLED], +@@ -10197,6 +10291,7 @@ m4_define([OFPROTO_DPIF_MEGAFLOW_DISABLED], [AT_SETUP([ofproto-dpif megaflow - disabled$1]) OVS_VSWITCHD_START([], [], [], [m4_if([$1], [], [], [--dummy-numa="0,0,0,0,1,1,1,1"])]) AT_CHECK([ovs-appctl vlog/set dpif:dbg dpif_netdev:dbg]) diff --git a/SPECS/openvswitch3.5.spec b/SPECS/openvswitch3.5.spec index 9c42535..ea1aa59 100644 --- a/SPECS/openvswitch3.5.spec +++ b/SPECS/openvswitch3.5.spec @@ -59,7 +59,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 3.5.0 -Release: 12%{?dist} +Release: 13%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -796,6 +796,12 @@ exit 0 %endif %changelog +* Fri Mar 21 2025 Open vSwitch CI - 3.5.0-13 +- Merging upstream branch-3.5 [RH git: 280d901003] + Commit list: + 4455941553 ofproto-dpif: Fix dp_hash mapping after select group modification. () + + * Tue Mar 18 2025 Open vSwitch CI - 3.5.0-12 - Merging redhat subtree [RH git: 39dbc86442] Commit list: