Yes that fix should be applied to branches 2.9 and 2.8.
I checked that it applies and passes all unit tests pass.
On branch-2.8 the patch for nsh.at patch must be slightly retrofitted as the
datapath action names changed from encap_nsh/decap_nsh to push_nsh/pop_nsh and
the nsh_ttl field was introduced in 2.9.
diff --git a/tests/nsh.at b/tests/nsh.at
index 6ae71b5..6eb4637 100644
--- a/tests/nsh.at
+++ b/tests/nsh.at
@@ -351,7 +351,7 @@ bridge("br0")
Final flow: unchanged
Megaflow: recirc_id=0,eth,ip,in_port=1,dl_dst=66:77:88:99:aa:bb,nw_frag=no
-Datapath actions:
push_nsh(flags=0,ttl=63,mdtype=1,np=3,spi=0x1234,si=255,c1=0x1122334
+Datapath actions:
encap_nsh(flags=0,mdtype=1,np=3,spi=0x1234,si=255,c1=0x11223344,c2=0
])
AT_CHECK([
@@ -370,7 +370,7 @@ bridge("br0")
Final flow:
recirc_id=0x1,eth,in_port=4,vlan_tci=0x0000,dl_src=00:00:00:00:00:00,dl_ds
Megaflow:
recirc_id=0x1,packet_type=(1,0x894f),in_port=4,nsh_mdtype=1,nsh_np=3,nsh_spi
-Datapath actions: pop_nsh(),recirc(0x2)
+Datapath actions: decap_nsh(),recirc(0x2)
])
AT_CHECK([
@@ -407,8 +407,8 @@ ovs-appctl time/warp 1000
AT_CHECK([
ovs-appctl dpctl/dump-flows dummy@ovs-dummy | strip_used | grep -v ipv6 |
sort
], [0], [flow-dump from non-dpdk interfaces:
-recirc_id(0),in_port(1),packet_type(ns=0,id=0),eth(dst=1e:2c:e9:2a:66:9e),eth_type(0x0
-recirc_id(0x3),in_port(1),packet_type(ns=1,id=0x894f),nsh(mdtype=1,np=3,spi=0x1234,c1=
+recirc_id(0),in_port(1),packet_type(ns=0,id=0),eth(dst=1e:2c:e9:2a:66:9e),eth_type(0x0
+recirc_id(0x3),in_port(1),packet_type(ns=1,id=0x894f),nsh(mdtype=1,np=3,spi=0x1234,c1=
recirc_id(0x4),in_port(1),packet_type(ns=0,id=0),eth_type(0x0800),ipv4(frag=no),
packe
])
Thanks, Jan
> -----Original Message-----
> From: Ben Pfaff [mailto:[email protected]]
> Sent: Friday, 06 April, 2018 18:36
> To: Jan Scheurich <[email protected]>
> Cc: [email protected]; [email protected]
> Subject: Re: [PATCH v2 0/2] Correct handling of double encap and decap actions
>
> On Fri, Apr 06, 2018 at 09:35:48AM -0700, Ben Pfaff wrote:
> > On Thu, Apr 05, 2018 at 04:11:02PM +0200, Jan Scheurich wrote:
> > > Recent tests with NSH encap have shown that the translation of multiple
> > > subsequent encap() or decap() actions was incorrect. This patch set
> > > corrects the handling and adds a unit test for NSH to cover two NSH
> > > and one Ethernet encapsulation levels.
> >
> > Thanks. Should this be applied to branch-2.9?
>
> To be clear, I applied it to master just now.
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
