Commit f870c1ff authored Dec 14, 2017 by Alexey Kodanev Committed by David S. Miller Dec 16, 2017

vxlan: restore dev->mtu setting based on lower device



Stefano Brivio says:
    Commit a985343b ("vxlan: refactor verification and
    application of configuration") introduced a change in the
    behaviour of initial MTU setting: earlier, the MTU for a link
    created on top of a given lower device, without an initial MTU
    specification, was set to the MTU of the lower device minus
    headroom as a result of this path in vxlan_dev_configure():

	if (!conf->mtu)
		dev->mtu = lowerdev->mtu -
			   (use_ipv6 ? VXLAN6_HEADROOM : VXLAN_HEADROOM);

    which is now gone. Now, the initial MTU, in absence of a
    configured value, is simply set by ether_setup() to ETH_DATA_LEN
    (1500 bytes).

    This breaks userspace expectations in case the MTU of
    the lower device is higher than 1500 bytes minus headroom.

This patch restores the previous behaviour on newlink operation. Since
max_mtu can be negative and we update dev->mtu directly, also check it
for valid minimum.

Reported-by: Junhan Yan <juyan@redhat.com>
Fixes: a985343b ("vxlan: refactor verification and application of configuration")
Signed-off-by: Alexey Kodanev <alexey.kodanev@oracle.com>
Acked-by: Stefano Brivio <sbrivio@redhat.com>
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 588753f1

drivers/net/vxlan.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -3103,6 +3103,11 @@ static void vxlan_config_apply(struct net_device *dev,

		max_mtu = lowerdev->mtu - (use_ipv6 ? VXLAN6_HEADROOM :
		VXLAN_HEADROOM);
		if (max_mtu < ETH_MIN_MTU)
		max_mtu = ETH_MIN_MTU;

		if (!changelink && !conf->mtu)
		dev->mtu = max_mtu;
		}

		if (dev->mtu > max_mtu)

Admin message