Skip to contentSkip to conversation

ip6_tunnel: do not use dst6_mtu() in ip4ip6_err() and ip6erspan_tunnel_xmit()

PATCH Applied Eric Dumazet 4 participants 5 messages Jun 9 – Jun 11

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ip6_tunnel: do not use dst6_mtu() in ip4ip6_err() and ip6erspan_tunnel_xmit()

This is a minor performance / conceptual fix.

1) ip6erspan_tunnel_xmit()

ERSPAN tunnel can mirror both IPv4 and IPv6 traffic, skb (the packet being mirrored) can be an IPv4 packet, and thus dst can be an IPv4 destination entry

Use dst_mtu() which contains generic logic for both families.

2) ip4ip6_err()

skb2 has been prepared as an IPv4 packet, and its destination is an IPv4 route.

dst6_mtu() is optimized for IPv6 destinations and uses INDIRECT_CALL_1 to call ip6_mtu() directly if the ops match.

We should use dst4_mtu() instead.

Fixes b40f0130a23b ("ipv6: use dst6_mtu() instead of dst_mtu()")
---
 net/ipv6/ip6_gre.c    | 2 +-
 net/ipv6/ip6_tunnel.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
net/ipv6/ip6_gre.c +1 -1
index 365b4059eb20354c256c491a16db0e606e0a9790..48039f00b4bc4321c1502714a98dbf209a7ea398 100644
@@ -1058,7 +1058,7 @@ static netdev_tx_t ip6erspan_tunnel_xmit(struct sk_buff *skb,
 	/* TooBig packet may have updated dst->dev's mtu */
 	if (!t->parms.collect_md && dst) {
 		mtu = READ_ONCE(dst_dev(dst)->mtu);
-		if (dst6_mtu(dst) > mtu)
+		if (dst_mtu(dst) > mtu)
 			dst->ops->update_pmtu(dst, NULL, skb, mtu, false);
 	}
 	err = ip6_tnl_xmit(skb, dev, dsfield, &fl6, encap_limit, &mtu,
net/ipv6/ip6_tunnel.c +1 -1
index 9d1037ac082f6aad36c152ffdbe0f30237b65fc3..bf5cd5d4adcdfa86eb7a3c0a27db3cadb69499ae 100644
@@ -650,7 +650,7 @@ ip4ip6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
 
 	/* change mtu on this route */
 	if (rel_type == ICMP_DEST_UNREACH && rel_code == ICMP_FRAG_NEEDED) {
-		if (rel_info > dst6_mtu(skb_dst(skb2)))
+		if (rel_info > dst4_mtu(skb_dst(skb2)))
 			goto out;
 
 		skb_dst_update_pmtu_no_confirm(skb2, rel_info);
Signature · 1 line
2.54.0.1064.gd145956f57-goog
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 15 lines · Eric Dumazet

This is a minor performance / conceptual fix.

1) ip6erspan_tunnel_xmit()

ERSPAN tunnel can mirror both IPv4 and IPv6 traffic, skb (the packet being mirrored) can be an IPv4 packet, and thus dst can be an IPv4 destination entry

Use dst_mtu() which contains generic logic for both families.

2) ip4ip6_err()

skb2 has been prepared as an IPv4 packet, and its destination is an IPv4 route.

Quoted 7 lines

dst6_mtu() is optimized for IPv6 destinations and uses INDIRECT_CALL_1 to call ip6_mtu() directly if the ops match.

We should use dst4_mtu() instead.

Fixes b40f0130a23b ("ipv6: use dst6_mtu() instead of dst_mtu()")
maintainer
#2 lore raw
In reply to Eric Dumazet
Quoted 15 lines · Eric Dumazet

This is a minor performance / conceptual fix.

1) ip6erspan_tunnel_xmit()

ERSPAN tunnel can mirror both IPv4 and IPv6 traffic, skb (the packet being mirrored) can be an IPv4 packet, and thus dst can be an IPv4 destination entry

Use dst_mtu() which contains generic logic for both families.

2) ip4ip6_err()

skb2 has been prepared as an IPv4 packet, and its destination is an IPv4 route.

Quoted 7 lines

dst6_mtu() is optimized for IPv6 destinations and uses INDIRECT_CALL_1 to call ip6_mtu() directly if the ops match.

We should use dst4_mtu() instead.

Fixes b40f0130a23b ("ipv6: use dst6_mtu() instead of dst_mtu()")

Any strong opinon vs redirecting this one to the net-next tree? We are trying (with limited success :( to keep the amount of changes in net under control, and this looks like a minor performance optimization to me.

If there is agreement, I can apply the patch there stripping the fixes tag without a repost.

Thanks,

Paolo

#3 lore raw
Quoted 25 lines · Paolo Abeni
Quoted 15 lines · Eric Dumazet

This is a minor performance / conceptual fix.

1) ip6erspan_tunnel_xmit()

ERSPAN tunnel can mirror both IPv4 and IPv6 traffic, skb (the packet being mirrored) can be an IPv4 packet, and thus dst can be an IPv4 destination entry

Use dst_mtu() which contains generic logic for both families.

2) ip4ip6_err()

skb2 has been prepared as an IPv4 packet, and its destination is an IPv4 route.

Quoted 7 lines

dst6_mtu() is optimized for IPv6 destinations and uses INDIRECT_CALL_1 to call ip6_mtu() directly if the ops match.

We should use dst4_mtu() instead.

Fixes b40f0130a23b ("ipv6: use dst6_mtu() instead of dst_mtu()")
Quoted 6 lines

Any strong opinon vs redirecting this one to the net-next tree? We are trying (with limited success :( to keep the amount of changes in net under control, and this looks like a minor performance optimization to me.

If there is agreement, I can apply the patch there stripping the fixes tag without a repost.

Absolutely fine.

Paolo, feel free to use your own judgement on these minor things, you do not have to ask for my permission.

Thanks.

#4 lore raw
In reply to Eric Dumazet
This patch was applied to netdev/net-next.git (main) by Paolo Abeni <[email protected]>:

Hello:

This patch was applied to netdev/net-next.git (main) by Paolo Abeni <[email protected]>:

Quoted 9 lines · On Tue, 9 Jun 2026 09:13:37 +0000 you wrote:

This is a minor performance / conceptual fix.

1) ip6erspan_tunnel_xmit()

ERSPAN tunnel can mirror both IPv4 and IPv6 traffic, skb (the packet being mirrored) can be an IPv4 packet, and thus dst can be an IPv4 destination entry

[...]

Here is the summary with links:
- [net] ip6_tunnel: do not use dst6_mtu() in ip4ip6_err() and ip6erspan_tunnel_xmit()

    https://git.kernel.org/netdev/net-next/c/6e12a8894e02

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html