blob: 46a8e69f94ee1ced9eb031e96da4f45a32f0e518 [file] [log] [blame]
From 171cf27ebbd18ab4b62eac3d719375f0dcba903d Mon Sep 17 00:00:00 2001
From: Hangbin Liu <>
Date: Sun, 22 Dec 2019 10:51:16 +0800
Subject: [PATCH] net/dst: do not confirm neighbor for vxlan and geneve pmtu
commit f081042d128a0c7acbd67611def62e1b52e2d294 upstream.
When do IPv6 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.
So disable the neigh confirm for vxlan and geneve pmtu update.
v5: No change.
v4: No change.
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: a93bf0ff4490 ("vxlan: update skb dst pmtu on tx path")
Fixes: 52a589d51f10 ("geneve: update skb dst pmtu on tx path")
Reviewed-by: Guillaume Nault <>
Tested-by: Guillaume Nault <>
Acked-by: David Ahern <>
Signed-off-by: Hangbin Liu <>
Signed-off-by: David S. Miller <>
Signed-off-by: Paul Gortmaker <>
diff --git a/include/net/dst.h b/include/net/dst.h
index dfd899aa8c69..4d61945d5d74 100644
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -535,7 +535,7 @@ static inline void skb_tunnel_check_pmtu(struct sk_buff *skb,
u32 encap_mtu = dst_mtu(encap_dst);
if (skb->len > encap_mtu - headroom)
- skb_dst_update_pmtu(skb, encap_mtu - headroom);
+ skb_dst_update_pmtu_no_confirm(skb, encap_mtu - headroom);
#endif /* _NET_DST_H */