lkml.org 
[lkml]   [2020]   [Nov]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 031/133] ip_tunnel: fix over-mtu packet send fail without TUNNEL_DONT_FRAGMENT flags
    Date
    From: wenxu <wenxu@ucloud.cn>

    [ Upstream commit 20149e9eb68c003eaa09e7c9a49023df40779552 ]

    The tunnel device such as vxlan, bareudp and geneve in the lwt mode set
    the outer df only based TUNNEL_DONT_FRAGMENT.
    And this was also the behavior for gre device before switching to use
    ip_md_tunnel_xmit in commit 962924fa2b7a ("ip_gre: Refactor collect
    metatdata mode tunnel xmit to ip_md_tunnel_xmit")

    When the ip_gre in lwt mode xmit with ip_md_tunnel_xmi changed the rule and
    make the discrepancy between handling of DF by different tunnels. So in the
    ip_md_tunnel_xmit should follow the same rule like other tunnels.

    Fixes: cfc7381b3002 ("ip_tunnel: add collect_md mode to IPIP tunnel")
    Signed-off-by: wenxu <wenxu@ucloud.cn>
    Link: https://lore.kernel.org/r/1604028728-31100-1-git-send-email-wenxu@ucloud.cn
    Signed-off-by: Jakub Kicinski <kuba@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    net/ipv4/ip_tunnel.c | 3 ---
    1 file changed, 3 deletions(-)

    --- a/net/ipv4/ip_tunnel.c
    +++ b/net/ipv4/ip_tunnel.c
    @@ -614,9 +614,6 @@ void ip_md_tunnel_xmit(struct sk_buff *s
    ttl = ip4_dst_hoplimit(&rt->dst);
    }

    - if (!df && skb->protocol == htons(ETH_P_IP))
    - df = inner_iph->frag_off & htons(IP_DF);
    -
    headroom += LL_RESERVED_SPACE(rt->dst.dev) + rt->dst.header_len;
    if (headroom > dev->needed_headroom)
    dev->needed_headroom = headroom;

    \
     
     \ /
      Last update: 2020-11-09 14:18    [W:2.246 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site