Skip to content

Commit 3d48d59

Browse files
Jibin Zhanggregkh
authored andcommitted
net: fix segmentation of forwarding fraglist GRO
commit 426ca15 upstream. This patch enhances GSO segment handling by properly checking the SKB_GSO_DODGY flag for frag_list GSO packets, addressing low throughput issues observed when a station accesses IPv4 servers via hotspots with an IPv6-only upstream interface. Specifically, it fixes a bug in GSO segmentation when forwarding GRO packets containing a frag_list. The function skb_segment_list cannot correctly process GRO skbs that have been converted by XLAT, since XLAT only translates the header of the head skb. Consequently, skbs in the frag_list may remain untranslated, resulting in protocol inconsistencies and reduced throughput. To address this, the patch explicitly sets the SKB_GSO_DODGY flag for GSO packets in XLAT's IPv4/IPv6 protocol translation helpers (bpf_skb_proto_4_to_6 and bpf_skb_proto_6_to_4). This marks GSO packets as potentially modified after protocol translation. As a result, GSO segmentation will avoid using skb_segment_list and instead falls back to skb_segment for packets with the SKB_GSO_DODGY flag. This ensures that only safe and fully translated frag_list packets are processed by skb_segment_list, resolving protocol inconsistencies and improving throughput when forwarding GRO packets converted by XLAT. Signed-off-by: Jibin Zhang <jibin.zhang@mediatek.com> Fixes: 9fd1ff5 ("udp: Support UDP fraglist GRO/GSO.") Cc: stable@vger.kernel.org Link: https://patch.msgid.link/20260126152114.1211-1-jibin.zhang@mediatek.com Signed-off-by: Paolo Abeni <pabeni@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent b23bee8 commit 3d48d59

4 files changed

Lines changed: 8 additions & 3 deletions

File tree

net/core/filter.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3352,6 +3352,7 @@ static int bpf_skb_proto_4_to_6(struct sk_buff *skb)
33523352
shinfo->gso_type &= ~SKB_GSO_TCPV4;
33533353
shinfo->gso_type |= SKB_GSO_TCPV6;
33543354
}
3355+
shinfo->gso_type |= SKB_GSO_DODGY;
33553356
}
33563357

33573358
bpf_skb_change_protocol(skb, ETH_P_IPV6);
@@ -3382,6 +3383,7 @@ static int bpf_skb_proto_6_to_4(struct sk_buff *skb)
33823383
shinfo->gso_type &= ~SKB_GSO_TCPV6;
33833384
shinfo->gso_type |= SKB_GSO_TCPV4;
33843385
}
3386+
shinfo->gso_type |= SKB_GSO_DODGY;
33853387
}
33863388

33873389
bpf_skb_change_protocol(skb, ETH_P_IP);

net/ipv4/tcp_offload.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,8 @@ static struct sk_buff *tcp4_gso_segment(struct sk_buff *skb,
107107
if (skb_shinfo(skb)->gso_type & SKB_GSO_FRAGLIST) {
108108
struct tcphdr *th = tcp_hdr(skb);
109109

110-
if (skb_pagelen(skb) - th->doff * 4 == skb_shinfo(skb)->gso_size)
110+
if ((skb_pagelen(skb) - th->doff * 4 == skb_shinfo(skb)->gso_size) &&
111+
!(skb_shinfo(skb)->gso_type & SKB_GSO_DODGY))
111112
return __tcp4_gso_segment_list(skb, features);
112113

113114
skb->ip_summed = CHECKSUM_NONE;

net/ipv4/udp_offload.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,8 @@ struct sk_buff *__udp_gso_segment(struct sk_buff *gso_skb,
514514

515515
if (skb_shinfo(gso_skb)->gso_type & SKB_GSO_FRAGLIST) {
516516
/* Detect modified geometry and pass those to skb_segment. */
517-
if (skb_pagelen(gso_skb) - sizeof(*uh) == skb_shinfo(gso_skb)->gso_size)
517+
if ((skb_pagelen(gso_skb) - sizeof(*uh) == skb_shinfo(gso_skb)->gso_size) &&
518+
!(skb_shinfo(gso_skb)->gso_type & SKB_GSO_DODGY))
518519
return __udp_gso_segment_list(gso_skb, features, is_ipv6);
519520

520521
ret = __skb_linearize(gso_skb);

net/ipv6/tcpv6_offload.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,8 @@ static struct sk_buff *tcp6_gso_segment(struct sk_buff *skb,
170170
if (skb_shinfo(skb)->gso_type & SKB_GSO_FRAGLIST) {
171171
struct tcphdr *th = tcp_hdr(skb);
172172

173-
if (skb_pagelen(skb) - th->doff * 4 == skb_shinfo(skb)->gso_size)
173+
if ((skb_pagelen(skb) - th->doff * 4 == skb_shinfo(skb)->gso_size) &&
174+
!(skb_shinfo(skb)->gso_type & SKB_GSO_DODGY))
174175
return __tcp6_gso_segment_list(skb, features);
175176

176177
skb->ip_summed = CHECKSUM_NONE;

0 commit comments

Comments
 (0)