Commit c122fda2 authored Oct 01, 2017 by Xin Long Committed by David S. Miller Oct 01, 2017

ip_gre: set tunnel hlen properly in erspan_tunnel_init



According to __gre_tunnel_init, tunnel->hlen should be set as the
headers' length between inner packet and outer iphdr.

It would be used especially to calculate a proper mtu when updating
mtu in tnl_update_pmtu. Now without setting it, a bigger mtu value
than expected would be updated, which hurts performance a lot.

This patch is to fix it by setting tunnel->hlen with:
   tunnel->tun_hlen + tunnel->encap_hlen + sizeof(struct erspanhdr)

Fixes: 84e54fe0 ("gre: introduce native tunnel support for ERSPAN")
Signed-off-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 5513d08d

net/ipv4/ip_gre.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1245,7 +1245,9 @@ static int erspan_tunnel_init(struct net_device *dev)

		tunnel->tun_hlen = 8;
		tunnel->parms.iph.protocol = IPPROTO_GRE;
		t_hlen = tunnel->hlen + sizeof(struct iphdr) + sizeof(struct erspanhdr);
		tunnel->hlen = tunnel->tun_hlen + tunnel->encap_hlen +
		sizeof(struct erspanhdr);
		t_hlen = tunnel->hlen + sizeof(struct iphdr);

		dev->needed_headroom = LL_MAX_HEADER + t_hlen + 4;
		dev->mtu = ETH_DATA_LEN - t_hlen - 4;

Admin message