tcp: gso: really support BIG TCP
Subsystems (3)
PATCH v2 1/1 tcp: gso: really support BIG TCP
We missed that tcp_gso_segment() was assuming skb->len was smaller than 65535 :
oldlen = (u16)~skb->len;
This part came with commit 0718bcc09b35 ("[NET]: Fix CHECKSUM_HW GSO problems.")
This leads to wrong TCP checksum.
Adapt the code to accept arbitrary packet length.
v2:
- use two csum_add() instead of csum_fold() (Alexander Duyck)
- Change delta type to __wsum to reduce casts (Alexander Duyck)
--- net/ipv4/tcp_offload.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)
net/ipv4/tcp_offload.c +9 -10
@@ -60,12 +60,12 @@ struct sk_buff *tcp_gso_segment(struct sk_buff *skb,struct tcphdr *th;unsigned int thlen;unsigned int seq; -__be32 delta;unsigned int oldlen;unsigned int mss;struct sk_buff *gso_skb = skb;__sum16 newcheck;bool ooo_okay, copy_destructor; +__wsum delta; th =tcp_hdr (skb); thlen = th->doff *4 ;
@@ -75,7 +75,7 @@ struct sk_buff *tcp_gso_segment(struct sk_buff *skb,if (!pskb_may_pull (skb, thlen)) goto out; - oldlen = (u16 )~skb->len; + oldlen = ~skb->len;__skb_pull (skb, thlen); mss =skb_shinfo (skb)->gso_size;
@@ -110,7 +110,7 @@ struct sk_buff *tcp_gso_segment(struct sk_buff *skb,if (skb_is_gso (segs)) mss *=skb_shinfo (segs)->gso_segs; - delta =htonl (oldlen + (thlen + mss)); + delta = (__force __wsum )htonl (oldlen + thlen + mss); skb = segs; th =tcp_hdr (skb);
@@ -119,8 +119,7 @@ struct sk_buff *tcp_gso_segment(struct sk_buff *skb,if (unlikely (skb_shinfo (gso_skb)->tx_flags &SKBTX_SW_TSTAMP ))tcp_gso_tstamp (segs,skb_shinfo (gso_skb)->tskey, seq, mss); - newcheck = ~csum_fold ((__force __wsum)((__force u32 )th->check + - (__force u32 )delta)); + newcheck = ~csum_fold (csum_add (csum_unfold (th->check), delta));while (skb->next) { th->fin = th->psh =0 ;
@@ -165,11 +164,11 @@ struct sk_buff *tcp_gso_segment(struct sk_buff *skb,WARN_ON_ONCE (refcount_sub_and_test (-delta, &skb->sk->sk_wmem_alloc)); } - delta =htonl (oldlen + (skb_tail_pointer (skb) - -skb_transport_header (skb)) + - skb->data_len); - th->check = ~csum_fold ((__force __wsum)((__force u32 )th->check + - (__force u32 )delta)); + delta = (__force __wsum )htonl (oldlen + + (skb_tail_pointer (skb) - +skb_transport_header (skb)) + + skb->data_len); + th->check = ~csum_fold (csum_add (csum_unfold (th->check), delta));if (skb->ip_summed ==CHECKSUM_PARTIAL )gso_reset_checksum (skb, ~th->check);else
Signature · 1 line
2.41.0.rc0.172.g3f132b7071-goog
Quoted 10 lines · Eric Dumazet
We missed that
tcp_gso_segment()was assumingskb->lenwas smaller than 65535 :oldlen = (u16)~skb->len;
This part came with commit
0718bcc09b35("[NET]: FixCHECKSUM_HWGSO problems.")This leads to wrong TCP checksum.
Adapt the code to accept arbitrary packet length.
Quoted 7 lines
v2:
- use twocsum_add()instead ofcsum_fold()(Alexander Duyck)
- Change delta type to__wsumto reduce casts (Alexander Duyck)Fixes 09f3d1a3a52c ("ipv6/gso: remove temporary HBH/jumbo header")Signed-off-by Eric Dumazet <[email protected]>Reviewed-by Alexander Duyck <[email protected]>
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 9 lines · On Mon, 5 Jun 2023 16:16:47 +0000 you wrote:
We missed that
tcp_gso_segment()was assumingskb->lenwas smaller than 65535 :oldlen = (u16)~skb->len;
This part came with commit
0718bcc09b35("[NET]: FixCHECKSUM_HWGSO problems.")This leads to wrong TCP checksum.
[...]
Here is the summary with links:
- [v2,net] tcp: gso: really support BIG TCP
https://git.kernel.org/netdev/net/c/82a01ab35bd0
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html