Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c062783 authored Dec 22, 2019 by Hangbin Liu Committed by Greg Kroah-Hartman Jan 04, 2020

tunnel: do not confirm neighbor when do pmtu update



[ Upstream commit 7a1592bcb15d71400a98632727791d1e68ea0ee8 ]

When do tunnel PMTU update and calls __ip6_rt_update_pmtu() in the end,
we should not call dst_confirm_neigh() as there is no two-way communication.

v5: No Change.
v4: Update commit description
v3: Do not remove dst_confirm_neigh, but add a new bool parameter in
    dst_ops.update_pmtu to control whether we should do neighbor confirm.
    Also split the big patch to small ones for each area.
v2: Remove dst_confirm_neigh in __ip6_rt_update_pmtu.

Fixes: 0dec879f ("net: use dst_confirm_neigh for UDP, RAW, ICMP, L2TP")
Reviewed-by: Guillaume Nault <gnault@redhat.com>
Tested-by: Guillaume Nault <gnault@redhat.com>
Acked-by: David Ahern <dsahern@gmail.com>
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent dba3ed56

net/ipv4/ip_tunnel.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -513,7 +513,7 @@ static int tnl_update_pmtu(struct net_device dev, struct sk_buff skb,
	else		else
	mtu = skb_dst(skb) ? dst_mtu(skb_dst(skb)) : dev->mtu;		mtu = skb_dst(skb) ? dst_mtu(skb_dst(skb)) : dev->mtu;

	skb_dst_update_pmtu(skb, mtu);		skb_dst_update_pmtu_no_confirm(skb, mtu);

	if (skb->protocol == htons(ETH_P_IP)) {		if (skb->protocol == htons(ETH_P_IP)) {
	if (!skb_is_gso(skb) &&		if (!skb_is_gso(skb) &&

net/ipv6/ip6_tunnel.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -645,7 +645,7 @@ ip4ip6_err(struct sk_buff skb, struct inet6_skb_parm opt,
	if (rel_info > dst_mtu(skb_dst(skb2)))		if (rel_info > dst_mtu(skb_dst(skb2)))
	goto out;		goto out;

	skb_dst_update_pmtu(skb2, rel_info);		skb_dst_update_pmtu_no_confirm(skb2, rel_info);
	}		}

	icmp_send(skb2, rel_type, rel_code, htonl(rel_info));		icmp_send(skb2, rel_type, rel_code, htonl(rel_info));
	@@ -1137,7 +1137,7 @@ int ip6_tnl_xmit(struct sk_buff skb, struct net_device dev, __u8 dsfield,
	mtu = max(mtu, skb->protocol == htons(ETH_P_IPV6) ?		mtu = max(mtu, skb->protocol == htons(ETH_P_IPV6) ?
	IPV6_MIN_MTU : IPV4_MIN_MTU);		IPV6_MIN_MTU : IPV4_MIN_MTU);

	skb_dst_update_pmtu(skb, mtu);		skb_dst_update_pmtu_no_confirm(skb, mtu);
	if (skb->len - t->tun_hlen - eth_hlen > mtu && !skb_is_gso(skb)) {		if (skb->len - t->tun_hlen - eth_hlen > mtu && !skb_is_gso(skb)) {
	*pmtu = mtu;		*pmtu = mtu;
	err = -EMSGSIZE;		err = -EMSGSIZE;