Skip to content

Commit 82612de

Browse files
NicolasDichteldavem330
authored andcommitted
ip_tunnel: restore binding to ifaces with a large mtu
After commit f6cc9c0, the following conf is broken (note that the default loopback mtu is 65536, ie IP_MAX_MTU + 1): $ ip tunnel add gre1 mode gre local 10.125.0.1 remote 10.125.0.2 dev lo add tunnel "gre0" failed: Invalid argument $ ip l a type dummy $ ip l s dummy1 up $ ip l s dummy1 mtu 65535 $ ip tunnel add gre1 mode gre local 10.125.0.1 remote 10.125.0.2 dev dummy1 add tunnel "gre0" failed: Invalid argument dev_set_mtu() doesn't allow to set a mtu which is too large. First, let's cap the mtu returned by ip_tunnel_bind_dev(). Second, remove the magic value 0xFFF8 and use IP_MAX_MTU instead. 0xFFF8 seems to be there for ages, I don't know why this value was used. With a recent kernel, it's also possible to set a mtu > IP_MAX_MTU: $ ip l s dummy1 mtu 66000 After that patch, it's also possible to bind an ip tunnel on that kind of interface. CC: Petr Machata <[email protected]> CC: Ido Schimmel <[email protected]> Link: https://git.kernel.org/pub/scm/linux/kernel/git/davem/netdev-vger-cvs.git/commit/?id=e5afd356a411a Fixes: f6cc9c0 ("ip_tunnel: Emit events for post-register MTU changes") Signed-off-by: Nicolas Dichtel <[email protected]> Reviewed-by: Ido Schimmel <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent ccfde6e commit 82612de

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

net/ipv4/ip_tunnel.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ static int ip_tunnel_bind_dev(struct net_device *dev)
328328

329329
if (tdev) {
330330
hlen = tdev->hard_header_len + tdev->needed_headroom;
331-
mtu = tdev->mtu;
331+
mtu = min(tdev->mtu, IP_MAX_MTU);
332332
}
333333

334334
dev->needed_headroom = t_hlen + hlen;
@@ -362,7 +362,7 @@ static struct ip_tunnel *ip_tunnel_create(struct net *net,
362362
nt = netdev_priv(dev);
363363
t_hlen = nt->hlen + sizeof(struct iphdr);
364364
dev->min_mtu = ETH_MIN_MTU;
365-
dev->max_mtu = 0xFFF8 - dev->hard_header_len - t_hlen;
365+
dev->max_mtu = IP_MAX_MTU - dev->hard_header_len - t_hlen;
366366
ip_tunnel_add(itn, nt);
367367
return nt;
368368

@@ -930,7 +930,7 @@ int __ip_tunnel_change_mtu(struct net_device *dev, int new_mtu, bool strict)
930930
{
931931
struct ip_tunnel *tunnel = netdev_priv(dev);
932932
int t_hlen = tunnel->hlen + sizeof(struct iphdr);
933-
int max_mtu = 0xFFF8 - dev->hard_header_len - t_hlen;
933+
int max_mtu = IP_MAX_MTU - dev->hard_header_len - t_hlen;
934934

935935
if (new_mtu < ETH_MIN_MTU)
936936
return -EINVAL;
@@ -1107,7 +1107,7 @@ int ip_tunnel_newlink(struct net_device *dev, struct nlattr *tb[],
11071107

11081108
mtu = ip_tunnel_bind_dev(dev);
11091109
if (tb[IFLA_MTU]) {
1110-
unsigned int max = 0xfff8 - dev->hard_header_len - nt->hlen;
1110+
unsigned int max = IP_MAX_MTU - dev->hard_header_len - nt->hlen;
11111111

11121112
mtu = clamp(dev->mtu, (unsigned int)ETH_MIN_MTU,
11131113
(unsigned int)(max - sizeof(struct iphdr)));

0 commit comments

Comments
 (0)