From de24e44032c31e645134a78c73267d6ada9eaecc Mon Sep 17 00:00:00 2001 From: Open vSwitch CI Date: May 25 2023 23:00:56 +0000 Subject: Import openvswitch2.17-2.17.0-100 from Fast DataPath --- diff --git a/SOURCES/openvswitch-2.17.0.patch b/SOURCES/openvswitch-2.17.0.patch index 6b5eebf..feb756b 100644 --- a/SOURCES/openvswitch-2.17.0.patch +++ b/SOURCES/openvswitch-2.17.0.patch @@ -53648,6 +53648,22 @@ index e03cd8d0c5..474344194f 100644 + wc->masks.nw_proto = 0xff; + } +} +diff --git a/lib/meta-flow.xml b/lib/meta-flow.xml +index 28865f88c8..ff81fddc5e 100644 +--- a/lib/meta-flow.xml ++++ b/lib/meta-flow.xml +@@ -4303,9 +4303,9 @@ r r c c c. + + + +- ++ + +- ++ + + + diff --git a/lib/namemap.c b/lib/namemap.c index 785cda4c27..dd317ea52e 100644 --- a/lib/namemap.c @@ -69214,7 +69230,7 @@ index 784bada12c..3bf339582d 100644 +OVS_TRAFFIC_VSWITCHD_STOP +AT_CLEANUP diff --git a/tests/system-kmod-macros.at b/tests/system-kmod-macros.at -index 86d633ac4f..f0aaae63eb 100644 +index 86d633ac4f..a9c7398e1c 100644 --- a/tests/system-kmod-macros.at +++ b/tests/system-kmod-macros.at @@ -200,6 +200,13 @@ m4_define([OVS_CHECK_KERNEL_EXCL], @@ -69231,11 +69247,25 @@ index 86d633ac4f..f0aaae63eb 100644 # VSCTL_ADD_DATAPATH_TABLE() # # Create system datapath table "system" for kernel tests in ovsdb +@@ -215,3 +222,13 @@ m4_define([VSCTL_ADD_DATAPATH_TABLE], + # or necessary for the userspace datapath as it is checking for a kernel + # specific regression. + m4_define([CHECK_L3L4_CONNTRACK_REASM]) ++ ++# OVS_CHECK_BAREUDP() ++# ++# The feature needs to be enabled in the kernel configuration (CONFIG_BAREUDP) ++# to work. ++m4_define([OVS_CHECK_BAREUDP], ++[ ++ AT_SKIP_IF([! ip link add dev ovs_bareudp0 type bareudp dstport 6635 ethertype mpls_uc 2>&1 >/dev/null]) ++ AT_CHECK([ip link del dev ovs_bareudp0]) ++]) diff --git a/tests/system-layer3-tunnels.at b/tests/system-layer3-tunnels.at -index d21fd777dd..c37852b216 100644 +index d21fd777dd..81123f7309 100644 --- a/tests/system-layer3-tunnels.at +++ b/tests/system-layer3-tunnels.at -@@ -147,7 +147,7 @@ AT_CHECK([tail -1 stdout], [0], +@@ -147,14 +147,14 @@ AT_CHECK([tail -1 stdout], [0], dnl Check GRE tunnel push AT_CHECK([ovs-appctl ofproto/trace ovs-dummy 'in_port(3),eth(dst=f9:bc:12:44:34:b6,src=af:55:aa:55:00:03),eth_type(0x0800),ipv4(src=1.1.3.88,dst=1.1.3.92,proto=1,tos=0,ttl=64,frag=no)'], [0], [stdout]) AT_CHECK([tail -1 stdout], [0], @@ -69244,6 +69274,23 @@ index d21fd777dd..c37852b216 100644 ]) OVS_VSWITCHD_STOP + AT_CLEANUP + + AT_SETUP([layer3 - ping over MPLS Bareudp]) +-OVS_CHECK_MIN_KERNEL(5, 7) ++OVS_CHECK_BAREUDP() + OVS_TRAFFIC_VSWITCHD_START([_ADD_BR([br1])]) + ADD_NAMESPACES(at_ns0, at_ns1) + +@@ -202,7 +202,7 @@ OVS_TRAFFIC_VSWITCHD_STOP + AT_CLEANUP + + AT_SETUP([layer3 - ping over Bareudp]) +-OVS_CHECK_MIN_KERNEL(5, 7) ++OVS_CHECK_BAREUDP() + OVS_TRAFFIC_VSWITCHD_START([_ADD_BR([br1])]) + ADD_NAMESPACES(at_ns0, at_ns1) + diff --git a/tests/system-offloads-traffic.at b/tests/system-offloads-traffic.at index 80bc1dd5c3..bf60e4cb27 100644 --- a/tests/system-offloads-traffic.at @@ -70530,7 +70577,7 @@ index 406334f3e0..1a80047619 100644 + +m4_define([CHECK_SYSTEM_TSO], []) diff --git a/tests/system-userspace-macros.at b/tests/system-userspace-macros.at -index f639ba53a2..da3a4caca9 100644 +index f639ba53a2..53c86ef2fd 100644 --- a/tests/system-userspace-macros.at +++ b/tests/system-userspace-macros.at @@ -299,6 +299,11 @@ m4_define([OVS_CHECK_KERNEL_EXCL], @@ -70545,6 +70592,18 @@ index f639ba53a2..da3a4caca9 100644 # VSCTL_ADD_DATAPATH_TABLE() # # Create datapath table "netdev" for userspace tests in ovsdb +@@ -318,3 +323,11 @@ m4_define([CHECK_L3L4_CONNTRACK_REASM], + [ + AT_SKIP_IF([:]) + ]) ++ ++# OVS_CHECK_BAREUDP() ++# ++# The userspace datapath does not support bareudp tunnels. ++m4_define([OVS_CHECK_BAREUDP], ++[ ++ AT_SKIP_IF([:]) ++]) diff --git a/tests/test-cmap.c b/tests/test-cmap.c index 0705475606..588a5dea63 100644 --- a/tests/test-cmap.c diff --git a/SPECS/openvswitch2.17.spec b/SPECS/openvswitch2.17.spec index 91aa8c9..d005522 100644 --- a/SPECS/openvswitch2.17.spec +++ b/SPECS/openvswitch2.17.spec @@ -63,7 +63,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.17.0 -Release: 99%{?dist} +Release: 100%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -749,6 +749,13 @@ exit 0 %endif %changelog +* Thu May 25 2023 Open vSwitch CI - 2.17.0-100 +- Merging upstream branch-2.17 [RH git: 0e97bfc734] + Commit list: + fe99e6b971 tests: layer3-tunnels: Skip bareudp tests if not supported by kernel. + a375055f2e ovs-fields: Modify the width of tpa and spa. + + * Thu May 25 2023 Open vSwitch CI - 2.17.0-99 - Merging upstream branch-2.17 [RH git: ef455a33f3] Commit list: