diff --git a/SOURCES/openvswitch-2.13.0.patch b/SOURCES/openvswitch-2.13.0.patch index bf6b9a2..252d59f 100644 --- a/SOURCES/openvswitch-2.13.0.patch +++ b/SOURCES/openvswitch-2.13.0.patch @@ -44659,7 +44659,7 @@ index a7982de381..39d9aa391e 100644 ]) AT_CLEANUP diff --git a/tests/dpif-netdev.at b/tests/dpif-netdev.at -index 0aeb4e788f..32082967b8 100644 +index 0aeb4e788f..062f0228b4 100644 --- a/tests/dpif-netdev.at +++ b/tests/dpif-netdev.at @@ -293,59 +293,61 @@ type=drop rate=1 burst_size=2 @@ -44762,7 +44762,16 @@ index 0aeb4e788f..32082967b8 100644 ]) AT_CHECK([cat ovs-vswitchd.log | filter_flow_install | strip_xout_keep_actions], [0], [dnl -@@ -371,7 +373,7 @@ m4_define([DPIF_NETDEV_FLOW_HW_OFFLOAD], +@@ -364,6 +366,8 @@ recirc_id(0),in_port(7),packet_type(ns=0,id=0),eth_type(0x0800),ipv4(frag=no), a + recirc_id(0),in_port(8),packet_type(ns=0,id=0),eth_type(0x0800),ipv4(frag=no), actions:2 + ]) + ++AT_CHECK([ovs-ofctl -O OpenFlow13 del-meters br0]) ++ + OVS_VSWITCHD_STOP + AT_CLEANUP + +@@ -371,7 +375,7 @@ m4_define([DPIF_NETDEV_FLOW_HW_OFFLOAD], [AT_SETUP([dpif-netdev - partial hw offload - $1]) OVS_VSWITCHD_START( [add-port br0 p1 -- \ @@ -44771,7 +44780,7 @@ index 0aeb4e788f..32082967b8 100644 set bridge br0 datapath-type=dummy \ other-config:datapath-id=1234 fail-mode=secure], [], [], [m4_if([$1], [dummy-pmd], [--dummy-numa="0,0,0,0,1,1,1,1"], [])]) -@@ -393,7 +395,7 @@ skb_priority(0),skb_mark(0),ct_state(0),ct_zone(0),ct_mark(0),ct_label(0),recirc +@@ -393,7 +397,7 @@ skb_priority(0),skb_mark(0),ct_state(0),ct_zone(0),ct_mark(0),ct_label(0),recirc # Check that flow successfully offloaded. OVS_WAIT_UNTIL([grep "succeed to add netdev flow" ovs-vswitchd.log]) AT_CHECK([filter_hw_flow_install < ovs-vswitchd.log | strip_xout], [0], [dnl @@ -44780,7 +44789,7 @@ index 0aeb4e788f..32082967b8 100644 ]) # Check that datapath flow installed successfully. AT_CHECK([filter_flow_install < ovs-vswitchd.log | strip_xout], [0], [dnl -@@ -404,7 +406,7 @@ recirc_id(0),in_port(1),packet_type(ns=0,id=0),eth_type(0x0800),ipv4(frag=no), a +@@ -404,7 +408,7 @@ recirc_id(0),in_port(1),packet_type(ns=0,id=0),eth_type(0x0800),ipv4(frag=no), a # Check for succesfull packet matching with installed offloaded flow. AT_CHECK([filter_hw_packet_netdev_dummy < ovs-vswitchd.log | strip_xout], [0], [dnl @@ -44789,7 +44798,7 @@ index 0aeb4e788f..32082967b8 100644 ]) ovs-appctl revalidator/wait -@@ -421,7 +423,7 @@ recirc_id(0),in_port(1),packet_type(ns=0,id=0),eth_type(0x0800),ipv4(frag=no), p +@@ -421,7 +425,7 @@ recirc_id(0),in_port(1),packet_type(ns=0,id=0),eth_type(0x0800),ipv4(frag=no), p # Check that flow successfully deleted from HW. OVS_WAIT_UNTIL([grep "succeed to delete netdev flow" ovs-vswitchd.log]) AT_CHECK([filter_hw_flow_del < ovs-vswitchd.log | strip_xout], [0], [dnl @@ -44798,7 +44807,7 @@ index 0aeb4e788f..32082967b8 100644 ]) OVS_VSWITCHD_STOP AT_CLEANUP]) -@@ -434,7 +436,7 @@ m4_define([DPIF_NETDEV_FLOW_HW_OFFLOAD_OFFSETS], +@@ -434,7 +438,7 @@ m4_define([DPIF_NETDEV_FLOW_HW_OFFLOAD_OFFSETS], [AT_SETUP([dpif-netdev - partial hw offload with packet modifications - $1]) OVS_VSWITCHD_START( [add-port br0 p1 -- \ @@ -44807,7 +44816,7 @@ index 0aeb4e788f..32082967b8 100644 set bridge br0 datapath-type=dummy \ other-config:datapath-id=1234 fail-mode=secure], [], [], [m4_if([$1], [dummy-pmd], [--dummy-numa="0,0,0,0,1,1,1,1"], [])]) -@@ -460,7 +462,7 @@ packet_type(ns=0,id=0),eth(src=00:06:07:08:09:0a,dst=00:01:02:03:04:05),eth_type +@@ -460,7 +464,7 @@ packet_type(ns=0,id=0),eth(src=00:06:07:08:09:0a,dst=00:01:02:03:04:05),eth_type # Check that flow successfully offloaded. OVS_WAIT_UNTIL([grep "succeed to add netdev flow" ovs-vswitchd.log]) AT_CHECK([filter_hw_flow_install < ovs-vswitchd.log | strip_xout], [0], [dnl @@ -44816,7 +44825,7 @@ index 0aeb4e788f..32082967b8 100644 ]) # Check that datapath flow installed successfully. AT_CHECK([filter_flow_install < ovs-vswitchd.log | strip_xout], [0], [dnl -@@ -472,7 +474,7 @@ recirc_id(0),in_port(1),packet_type(ns=0,id=0),eth_type(0x8100),vlan(vid=99,pcp= +@@ -472,7 +476,7 @@ recirc_id(0),in_port(1),packet_type(ns=0,id=0),eth_type(0x8100),vlan(vid=99,pcp= # Check for succesfull packet matching with installed offloaded flow. AT_CHECK([filter_hw_packet_netdev_dummy < ovs-vswitchd.log | strip_xout], [0], [dnl p1: packet: udp,dl_vlan=99,dl_vlan_pcp=7,vlan_tci1=0x0000,dl_src=00:06:07:08:09:0a,dl_dst=00:01:02:03:04:05,nw_src=127.0.0.1,nw_dst=127.0.0.1,nw_tos=0,nw_ecn=0,nw_ttl=64,tp_src=81,tp_dst=82 dnl @@ -44825,7 +44834,7 @@ index 0aeb4e788f..32082967b8 100644 ]) ovs-appctl revalidator/wait -@@ -490,7 +492,7 @@ packets:1, bytes:64, used:0.0s, actions:set(ipv4(src=192.168.0.7)),set(udp(dst=3 +@@ -490,7 +494,7 @@ packets:1, bytes:64, used:0.0s, actions:set(ipv4(src=192.168.0.7)),set(udp(dst=3 # Check that flow successfully deleted from HW. OVS_WAIT_UNTIL([grep "succeed to delete netdev flow" ovs-vswitchd.log]) AT_CHECK([filter_hw_flow_del < ovs-vswitchd.log | strip_xout], [0], [dnl @@ -44834,7 +44843,7 @@ index 0aeb4e788f..32082967b8 100644 ]) # Check that ip address and udp port were correctly modified in output packets. -@@ -506,3 +508,20 @@ udp,in_port=ANY,dl_vlan=99,dl_vlan_pcp=7,vlan_tci1=0x0000,dl_src=00:06:07:08:09: +@@ -506,3 +510,20 @@ udp,in_port=ANY,dl_vlan=99,dl_vlan_pcp=7,vlan_tci1=0x0000,dl_src=00:06:07:08:09: DPIF_NETDEV_FLOW_HW_OFFLOAD_OFFSETS([dummy]) DPIF_NETDEV_FLOW_HW_OFFLOAD_OFFSETS([dummy-pmd]) @@ -46881,6 +46890,42 @@ index f2cc3f7f2a..fbe6e4f560 100755 def main(): +diff --git a/utilities/ovs-ofctl.c b/utilities/ovs-ofctl.c +index 3601890f40..62059e962f 100644 +--- a/utilities/ovs-ofctl.c ++++ b/utilities/ovs-ofctl.c +@@ -4020,6 +4020,7 @@ ofctl_meter_mod__(const char *bridge, const char *str, int command) + enum ofputil_protocol usable_protocols; + enum ofp_version version; + ++ memset(&mm, 0, sizeof mm); + if (str) { + char *error; + error = parse_ofp_meter_mod_str(&mm, str, command, &usable_protocols); +@@ -4030,7 +4031,6 @@ ofctl_meter_mod__(const char *bridge, const char *str, int command) + usable_protocols = OFPUTIL_P_OF13_UP; + mm.command = command; + mm.meter.meter_id = OFPM13_ALL; +- mm.meter.bands = NULL; + } + + protocol = open_vconn_for_flow_mod(bridge, &vconn, usable_protocols); +@@ -4050,6 +4050,7 @@ ofctl_meter_request__(const char *bridge, const char *str, + enum ofputil_protocol protocol; + enum ofp_version version; + ++ memset(&mm, 0, sizeof mm); + if (str) { + char *error; + error = parse_ofp_meter_mod_str(&mm, str, -1, &usable_protocols); +@@ -4059,7 +4060,6 @@ ofctl_meter_request__(const char *bridge, const char *str, + } else { + usable_protocols = OFPUTIL_P_OF13_UP; + mm.meter.meter_id = OFPM13_ALL; +- mm.meter.bands = NULL; + } + + protocol = open_vconn_for_flow_mod(bridge, &vconn, usable_protocols); diff --git a/utilities/ovs-pipegen.py b/utilities/ovs-pipegen.py index ee5797221c..a3b6a661de 100755 --- a/utilities/ovs-pipegen.py diff --git a/SPECS/openvswitch2.13.spec b/SPECS/openvswitch2.13.spec index 4b90ce5..da92824 100644 --- a/SPECS/openvswitch2.13.spec +++ b/SPECS/openvswitch2.13.spec @@ -59,7 +59,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.13.0 -Release: 99%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist} +Release: 100%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -710,6 +710,10 @@ exit 0 %endif %changelog +* Thu Apr 01 2021 Open vSwitch CI - 2.13.0-100 +- Merging upstream branch-2.13 + [7323d4b8e428cec0b48de457159861b8a1cdd410] + * Tue Mar 30 2021 Open vSwitch CI - 2.13.0-99 - Merging upstream branch-2.13 [8e7dc3319c3b29a77620f75b1d42ff42fd174ecf]