Thanks wenxu and Greg. I backported as far as branch-2.6.
On Fri, Jan 26, 2018 at 05:20:14PM +0800, wenxu wrote: > > > I also it should backport to branch-2.6~2.8 > > > > > > > At 2018-01-26 08:16:54, "Gregory Rose" <[email protected]> wrote: > >On 1/25/2018 10:22 AM, Ben Pfaff wrote: > >> On Thu, Jan 25, 2018 at 10:16:23AM -0800, Gregory Rose wrote: > >>> On 12/28/2017 8:45 PM, [email protected] wrote: > >>>> From: wenxu <[email protected]> > >>>> > >>>> if the gro enable, ipgre receive a gre-tso package. After pop > >>>> the gre-tunnel the encapsulation and GSO_ENCAP flags should be > >>>> striped. or the packet encap again and will be dropped in > >>>> ovs_iptunnel_handle_offloads > >>>> > >>>> Signed-off-by: wenxu <[email protected]> > >>>> --- > >>>> datapath/linux/compat/ip_gre.c | 2 ++ > >>>> 1 file changed, 2 insertions(+) > >>>> > >>>> diff --git a/datapath/linux/compat/ip_gre.c > >>>> b/datapath/linux/compat/ip_gre.c > >>>> index 03c5435..94fdaa9 100644 > >>>> --- a/datapath/linux/compat/ip_gre.c > >>>> +++ b/datapath/linux/compat/ip_gre.c > >>>> @@ -140,6 +140,8 @@ static int ipgre_rcv(struct sk_buff *skb, const > >>>> struct tnl_ptk_info *tpi) > >>>> __be64 tun_id; > >>>> int err; > >>>> + if (iptunnel_pull_offloads(skb)) > >>>> + return PACKET_REJECT; > >>>> skb_pop_mac_header(skb); > >>>> flags = tpi->flags & (TUNNEL_CSUM | TUNNEL_KEY); > >>> Sorry for the delay Wenxu but I finally got to it. > >>> > >>> Tested-by: Greg Rose <[email protected]> > >>> Reviewed-by: Greg Rose <[email protected]> > >> Thanks wenxu and Greg. I applied this to master and branch-2.9. If it > >> should be backported further, please let me know. > > > >I think branch-2.8 as well. But I'll let Wenxu comment further. > > > >Thanks Ben, > > > >- Greg > >_______________________________________________ > >dev mailing list > >[email protected] > >https://mail.openvswitch.org/mailman/listinfo/ovs-dev _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
