diff --git a/SOURCES/openvswitch-3.4.0.patch b/SOURCES/openvswitch-3.4.0.patch index 68f4117..2fe51c9 100644 --- a/SOURCES/openvswitch-3.4.0.patch +++ b/SOURCES/openvswitch-3.4.0.patch @@ -49,6 +49,39 @@ index 02cef6e451..7cced0f226 100644 out: free(response); netdev_close(netdev); +diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c +index 850597b3a4..7506ab5371 100644 +--- a/ofproto/ofproto-dpif-xlate.c ++++ b/ofproto/ofproto-dpif-xlate.c +@@ -679,6 +679,7 @@ static size_t count_skb_priorities(const struct xport *); + static bool dscp_from_skb_priority(const struct xport *, uint32_t skb_priority, + uint8_t *dscp); + ++static bool xlate_resubmit_resource_check(struct xlate_ctx *); + static void xlate_xbridge_init(struct xlate_cfg *, struct xbridge *); + static void xlate_xbundle_init(struct xlate_cfg *, struct xbundle *); + static void xlate_xport_init(struct xlate_cfg *, struct xport *); +@@ -3723,6 +3724,10 @@ compose_table_xlate(struct xlate_ctx *ctx, const struct xport *out_dev, + struct ofpact_output output; + struct flow flow; + ++ if (!xlate_resubmit_resource_check(ctx)) { ++ return 0; ++ } ++ + ofpact_init(&output.ofpact, OFPACT_OUTPUT, sizeof output); + flow_extract(packet, &flow); + flow.in_port.ofp_port = out_dev->ofp_port; +@@ -3731,7 +3736,8 @@ compose_table_xlate(struct xlate_ctx *ctx, const struct xport *out_dev, + + return ofproto_dpif_execute_actions__(xbridge->ofproto, version, &flow, + NULL, &output.ofpact, sizeof output, +- ctx->depth, ctx->resubmits, packet); ++ ctx->depth + 1, ctx->resubmits, ++ packet); + } + + static void diff --git a/ovsdb/transaction.c b/ovsdb/transaction.c index 65eca64783..98fff1a744 100644 --- a/ovsdb/transaction.c @@ -78,3 +111,181 @@ index 1c97bf7772..e79c755657 100644 dnl Clean up AT_CHECK([ovs-vsctl del-port br10 dpdkvhostuserclient0], [], [stdout], [stderr]) OVS_DPDK_STOP_VSWITCHD(["dnl +diff --git a/tests/tunnel-push-pop-ipv6.at b/tests/tunnel-push-pop-ipv6.at +index 3edec5fbca..824a226b21 100644 +--- a/tests/tunnel-push-pop-ipv6.at ++++ b/tests/tunnel-push-pop-ipv6.at +@@ -825,3 +825,86 @@ hash(l4(0)),recirc(0x2) + + OVS_VSWITCHD_STOP + AT_CLEANUP ++ ++AT_SETUP([tunnel_push_pop_ipv6 - Mirror over tunnels]) ++OVS_VSWITCHD_START([dnl ++ add-br br-ext -- set bridge br-ext datapath_type=dummy \ ++ other-config:hwaddr=aa:55:aa:55:00:00 \ ++ -- add-port br0 t1 -- set Interface t1 type=geneve \ ++ options:remote_ip=2001:cafe::91 \ ++ -- add-port br0 t2 -- set Interface t2 type=erspan \ ++ options:remote_ip=2001:cafe::92 options:key=flow \ ++ options:erspan_ver=1 options:erspan_idx=flow \ ++ -- add-port br0 p0 -- set Interface p0 type=dummy \ ++ -- add-port br0 p1 -- set Interface p1 type=dummy \ ++ -- add-port br-ext p-ext -- set Interface p-ext type=dummy \ ++ options:pcap=ext.pcap]) ++ ++dnl Configure mirroring over the UDP and ERSPAN tunnels. ++AT_CHECK([dnl ++ ovs-vsctl \ ++ set Bridge br0 mirrors=@m1,@m2 -- \ ++ --id=@t1 get Port t1 -- \ ++ --id=@t2 get Port t2 -- \ ++ --id=@m1 create Mirror name=vxlan select_all=true output_port=@t1 -- \ ++ --id=@m2 create Mirror name=erspan select_all=true output_port=@t2], ++ [0], [stdout]) ++ ++AT_CHECK([ovs-ofctl add-flow br-ext actions=normal]) ++AT_CHECK([ovs-ofctl add-flow br0 actions=normal]) ++ ++dnl Make sure ephemeral ports stay static across tests. ++AT_CHECK([ovs-appctl tnl/egress_port_range 35190 35190], [0], [OK ++]) ++ ++dnl Setup an IP address. ++AT_CHECK([ovs-appctl netdev-dummy/ip6addr br-ext 2001:cafe::90/64], [0], [OK ++]) ++ ++dnl Send two ND packets to set the tunnel's port and mac address. ++AT_CHECK([ovs-appctl netdev-dummy/receive p-ext dnl ++ 'eth(src=f8:bc:12:44:34:b3,dst=aa:55:aa:55:00:00),eth_type(0x86dd),dnl ++ ipv6(src=2001:cafe::91,dst=2001:cafe::90,label=0,proto=58,tclass=0,hlimit=255,frag=no),dnl ++ icmpv6(type=136,code=0),dnl ++ nd(target=2001:cafe::91,sll=00:00:00:00:00:00,tll=f8:bc:12:44:34:b3)' ++]) ++AT_CHECK([ovs-appctl netdev-dummy/receive p-ext dnl ++ 'eth(src=f8:bc:12:44:34:b6,dst=aa:55:aa:55:00:00),eth_type(0x86dd),dnl ++ ipv6(src=2001:cafe::92,dst=2001:cafe::90,label=0,proto=58,tclass=0,hlimit=255,frag=no),dnl ++ icmpv6(type=136,code=0),dnl ++ nd(target=2001:cafe::92,sll=00:00:00:00:00:00,tll=f8:bc:12:44:34:b6)' ++]) ++ ++m4_define([FLOW], [m4_join([,], ++ [in_port(p1)], ++ [eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800)], ++ [ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no)], ++ [icmp(type=8,code=0)])]) ++ ++m4_define([ERSPAN_ACT], [m4_join([,], ++ [clone(tnl_push(tnl_port(erspan_sys)], ++ [header(size=70,type=108], ++ [eth(dst=f8:bc:12:44:34:b6,src=aa:55:aa:55:00:00,dl_type=0x86dd)], ++ [ipv6(src=2001:cafe::90,dst=2001:cafe::92,label=0,proto=47,tclass=0x0,hlimit=64)], ++ [erspan(ver=1,sid=0x0,idx=0x0))], ++ [out_port(br-ext))], ++ [p-ext)])]) ++ ++m4_define([GENEVE_ACT], [m4_join([,], ++ [clone(tnl_push(tnl_port(genev_sys_6081)], ++ [header(size=70,type=5], ++ [eth(dst=f8:bc:12:44:34:b3,src=aa:55:aa:55:00:00,dl_type=0x86dd)], ++ [ipv6(src=2001:cafe::90,dst=2001:cafe::91,label=0,proto=17,tclass=0x0,hlimit=64)], ++ [udp(src=0,dst=6081,csum=0xffff)], ++ [geneve(vni=0x0))], ++ [out_port(br-ext))], ++ [p-ext)])]) ++ ++dnl Verify packet is mirrored to both tunnels. Tunnel actions may happen ++dnl in any order. ++AT_CHECK([ovs-appctl ofproto/trace --names ovs-dummy "FLOW"], [0], [stdout]) ++AT_CHECK([grep -q "ERSPAN_ACT" stdout]) ++AT_CHECK([grep -q "GENEVE_ACT" stdout]) ++ ++OVS_VSWITCHD_STOP ++AT_CLEANUP +diff --git a/tests/tunnel-push-pop.at b/tests/tunnel-push-pop.at +index 7ec4c31ab2..99b1b02bf9 100644 +--- a/tests/tunnel-push-pop.at ++++ b/tests/tunnel-push-pop.at +@@ -1259,3 +1259,82 @@ hash(l4(0)),recirc(0x2) + + OVS_VSWITCHD_STOP + AT_CLEANUP ++ ++AT_SETUP([tunnel_push_pop - Mirror over tunnels]) ++OVS_VSWITCHD_START([dnl ++ add-br br-ext -- set bridge br-ext datapath_type=dummy \ ++ other-config:hwaddr=aa:55:aa:55:00:00 \ ++ -- add-port br0 t1 -- set Interface t1 type=geneve \ ++ options:remote_ip=1.1.1.1 \ ++ -- add-port br0 t2 -- set Interface t2 type=erspan \ ++ options:remote_ip=1.1.1.2 options:key=flow options:erspan_ver=1 \ ++ options:erspan_idx=flow \ ++ -- add-port br0 p0 -- set Interface p0 type=dummy \ ++ -- add-port br0 p1 -- set Interface p1 type=dummy \ ++ -- add-port br-ext p-ext -- set Interface p-ext type=dummy \ ++ options:pcap=ext.pcap]) ++ ++dnl Configure mirroring over the UDP and ERSPAN tunnels. ++AT_CHECK([dnl ++ ovs-vsctl \ ++ set Bridge br0 mirrors=@m1,@m2 -- \ ++ --id=@t1 get Port t1 -- \ ++ --id=@t2 get Port t2 -- \ ++ --id=@m1 create Mirror name=vxlan select_all=true output_port=@t1 -- \ ++ --id=@m2 create Mirror name=erspan select_all=true output_port=@t2], ++ [0], [stdout]) ++ ++AT_CHECK([ovs-ofctl add-flow br-ext actions=normal]) ++AT_CHECK([ovs-ofctl add-flow br0 actions=normal]) ++ ++dnl Make sure ephemeral ports stay static across tests. ++AT_CHECK([ovs-appctl tnl/egress_port_range 35190 35190], [0], [OK ++]) ++ ++dnl Setup an IP address for the local side of the tunnel. ++AT_CHECK([ovs-appctl netdev-dummy/ip4addr br-ext 1.1.1.3/24], [0], [OK ++]) ++ ++dnl Send two arp replies to populate arp table with tunnel remote endpoints. ++AT_CHECK([ovs-appctl netdev-dummy/receive p-ext dnl ++ 'eth(src=f8:bc:12:44:34:b6,dst=ff:ff:ff:ff:ff:ff),eth_type(0x0806),dnl ++ arp(sip=1.1.1.1,tip=1.1.1.3,op=2,sha=f8:bc:12:44:34:b6,tha=00:00:00:00:00:00)' ++]) ++AT_CHECK([ovs-appctl netdev-dummy/receive p-ext dnl ++ 'eth(src=f8:bc:12:44:34:b3,dst=ff:ff:ff:ff:ff:ff),eth_type(0x0806),dnl ++ arp(sip=1.1.1.2,tip=1.1.1.3,op=2,sha=f8:bc:12:44:34:b3,tha=00:00:00:00:00:00)' ++]) ++ ++m4_define([FLOW], [m4_join([,], ++ [in_port(p1)], ++ [eth(src=50:54:00:00:00:05,dst=50:54:00:00:00:07),eth_type(0x0800)], ++ [ipv4(src=192.168.0.1,dst=192.168.0.2,proto=1,tos=0,ttl=128,frag=no)], ++ [icmp(type=8,code=0)])]) ++ ++m4_define([ERSPAN_ACT], [m4_join([,], ++ [clone(tnl_push(tnl_port(erspan_sys)], ++ [header(size=50,type=107], ++ [eth(dst=f8:bc:12:44:34:b3,src=aa:55:aa:55:00:00,dl_type=0x0800)], ++ [ipv4(src=1.1.1.3,dst=1.1.1.2,proto=47,tos=0,ttl=64,frag=0x4000)], ++ [erspan(ver=1,sid=0x0,idx=0x0))], ++ [out_port(br-ext))], ++ [p-ext)])]) ++ ++m4_define([GENEVE_ACT], [m4_join([,], ++ [clone(tnl_push(tnl_port(genev_sys_6081)], ++ [header(size=50,type=5], ++ [eth(dst=f8:bc:12:44:34:b6,src=aa:55:aa:55:00:00,dl_type=0x0800)], ++ [ipv4(src=1.1.1.3,dst=1.1.1.1,proto=17,tos=0,ttl=64,frag=0x4000)], ++ [udp(src=0,dst=6081,csum=0x0)], ++ [geneve(vni=0x0))], ++ [out_port(br-ext))], ++ [p-ext)])]) ++ ++dnl Verify packet is mirrored to both tunnels. Tunnel actions may happen ++dnl in any order. ++AT_CHECK([ovs-appctl ofproto/trace --names ovs-dummy "FLOW"], [0], [stdout]) ++AT_CHECK([grep -q "ERSPAN_ACT" stdout]) ++AT_CHECK([grep -q "GENEVE_ACT" stdout]) ++ ++OVS_VSWITCHD_STOP ++AT_CLEANUP diff --git a/SPECS/openvswitch3.4.spec b/SPECS/openvswitch3.4.spec index 9dec2a3..9c0c9f6 100644 --- a/SPECS/openvswitch3.4.spec +++ b/SPECS/openvswitch3.4.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 3.4.0 -Release: 0.3%{?dist} +Release: 0.4%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -770,6 +770,13 @@ exit 0 %endif %changelog +* Mon Aug 12 2024 Open vSwitch CI - 3.4.0-4 +- Merging upstream branch-3.4 [RH git: 581e76e784] + Commit list: + 6cea2b36c6 tunnel, tests: Add test for mirroring over tunnels. + a1afd83696 ofproto-dpif-xlate: Add a recursion limit to tunnel address lookup. + + * Fri Aug 09 2024 Open vSwitch CI - 3.4.0-3 - Merging upstream branch-3.4 [RH git: e6170caeec] Commit list: