net: ipv6: fix UDPv6 GSO segmentation with NAT
Subsystems (2)
PATCH 1/1 net: ipv6: fix UDPv6 GSO segmentation with NAT
If any address or port is changed, update it in all packets and recalculate checksum.
--- net/ipv4/udp_offload.c | 61 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-)
net/ipv4/udp_offload.c +60 -1
@@ -247,6 +247,62 @@ static struct sk_buff *__udpv4_gso_segment_list_csum(struct sk_buff *segs)return segs; } +static void __udpv6_gso_segment_csum (struct sk_buff *seg, +struct in6_addr *oldip, +const struct in6_addr *newip, +__be16 *oldport,__be16 newport) +{ +struct udphdr *uh =udp_hdr (seg); + +if (ipv6_addr_equal (oldip, newip) && *oldport == newport) +return ; + +if (uh->check) { +inet_proto_csum_replace16 (&uh->check, seg, oldip->s6_addr32, + newip->s6_addr32, true); + +inet_proto_csum_replace2 (&uh->check, seg, *oldport, newport, + false); +if (!uh->check) + uh->check =CSUM_MANGLED_0 ; + } + + *oldip = *newip; + *oldport = newport; +} + +static struct sk_buff *__udpv6_gso_segment_list_csum (struct sk_buff *segs) +{ +const struct ipv6hdr *iph; +const struct udphdr *uh; +struct ipv6hdr *iph2; +struct sk_buff *seg; +struct udphdr *uh2; + + seg = segs; + uh =udp_hdr (seg); + iph =ipv6_hdr (seg); + uh2 =udp_hdr (seg->next); + iph2 =ipv6_hdr (seg->next); + +if (!(*(const u32 *)&uh->source ^ *(const u32 *)&uh2->source) && +ipv6_addr_equal (&iph->saddr, &iph2->saddr) && +ipv6_addr_equal (&iph->daddr, &iph2->daddr)) +return segs; + +while ((seg = seg->next)) { + uh2 =udp_hdr (seg); + iph2 =ipv6_hdr (seg); + +__udpv6_gso_segment_csum (seg, &iph2->saddr, &iph->saddr, + &uh2->source, uh->source); +__udpv6_gso_segment_csum (seg, &iph2->daddr, &iph->daddr, + &uh2->dest, uh->dest); + } + +return segs; +} +static struct sk_buff *__udp_gso_segment_list (struct sk_buff *skb,netdev_features_t features,bool is_ipv6)
@@ -259,7 +315,10 @@ static struct sk_buff *__udp_gso_segment_list(struct sk_buff *skb,udp_hdr (skb)->len =htons (sizeof (struct udphdr ) + mss); -return is_ipv6 ? skb :__udpv4_gso_segment_list_csum (skb); +if (is_ipv6) +return __udpv6_gso_segment_list_csum (skb); +else +return __udpv4_gso_segment_list_csum (skb); } struct sk_buff *__udp_gso_segment(struct sk_buff *gso_skb,
Signature · 1 line
2.49.0
Quoted 5 lines · Felix Fietkau
If any address or port is changed, update it in all packets and recalculate checksum.
Fixes 9fd1ff5d2ac7 ("udp: Support UDP fraglist GRO/GSO.")Signed-off-by Felix Fietkau <[email protected]>
This is the IPv6 equivalent to commit c3df39ac9b0e ("udp: ipv4:
manipulate network header of NATed UDP GRO fraglist"). Not sure why IPv6 was missed at the time.
Quoted 41 lines
--- net/ipv4/udp_offload.c | 61 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-)net/ipv4/udp_offload.c +29
-0@@ -247,6 +247,62 @@ static struct sk_buff *__udpv4_gso_segment_list_csum(struct sk_buff *segs)return segs; } +static void __udpv6_gso_segment_csum (struct sk_buff *seg, +struct in6_addr *oldip, +const struct in6_addr *newip, +__be16 *oldport,__be16 newport) +{ +struct udphdr *uh =udp_hdr (seg); + +if (ipv6_addr_equal (oldip, newip) && *oldport == newport) +return ; + +if (uh->check) { +inet_proto_csum_replace16 (&uh->check, seg, oldip->s6_addr32, + newip->s6_addr32, true); + +inet_proto_csum_replace2 (&uh->check, seg, *oldport, newport, + false); +if (!uh->check) + uh->check =CSUM_MANGLED_0 ; + } + + *oldip = *newip; + *oldport = newport; +} + +static struct sk_buff *__udpv6_gso_segment_list_csum (struct sk_buff *segs) +{ +const struct ipv6hdr *iph; +const struct udphdr *uh; +struct ipv6hdr *iph2;
net/ipv4/udp_offload.c static struct sk_buff *__udpv4_gso_segment_list_csum(struct sk_buff *segs) · line 288
Quoted 10 lines
net/ipv4/udp_offload.c +10
-0+struct sk_buff *seg; +struct udphdr *uh2; + + seg = segs; + uh =udp_hdr (seg); + iph =ipv6_hdr (seg); + uh2 =udp_hdr (seg->next); + iph2 =ipv6_hdr (seg->next); + + if (!(*(const u32 *)&uh->source ^ *(const u32 *)&uh2->source) &&
only if respin: this could be a simpler equality test?
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Sat, 26 Apr 2025 17:32:09 +0200 you wrote:
If any address or port is changed, update it in all packets and recalculate checksum.
Fixes 9fd1ff5d2ac7 ("udp: Support UDP fraglist GRO/GSO.")Signed-off-by Felix Fietkau <[email protected]>--- net/ipv4/udp_offload.c | 61 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-)
Here is the summary with links:
- [net] net: ipv6: fix UDPv6 GSO segmentation with NAT
https://git.kernel.org/netdev/net/c/b936a9b8d4a5
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html