net: add code for TCP fraglist GRO

This implements fraglist GRO similar to how it's handled in UDP, however
no functional changes are added yet. The next change adds a heuristic for
using fraglist GRO instead of regular GRO.

Acked-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: David Ahern <dsahern@kernel.org>
Reviewed-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/net/ipv4/tcp_offload.c b/net/ipv4/tcp_offload.c
index affd4ed28cfed9937a5bba14e33e6438c5634798..aa75086763156a85f0f34d549e9fe987c1e0a3fe 100644 (file)
--- a/net/ipv4/tcp_offload.c
+++ b/net/ipv4/tcp_offload.c
@@ -334,6 +334,18 @@ found:
        flush |= (ntohl(th2->seq) + skb_gro_len(p)) ^ ntohl(th->seq);
        flush |= skb_cmp_decrypted(p, skb);
 
+       if (unlikely(NAPI_GRO_CB(p)->is_flist)) {
+               flush |= (__force int)(flags ^ tcp_flag_word(th2));
+               flush |= skb->ip_summed != p->ip_summed;
+               flush |= skb->csum_level != p->csum_level;
+               flush |= NAPI_GRO_CB(p)->count >= 64;
+
+               if (flush || skb_gro_receive_list(p, skb))
+                       mss = 1;
+
+               goto out_check_final;
+       }
+
        if (flush || skb_gro_receive(p, skb)) {
                mss = 1;
                goto out_check_final;
@@ -400,6 +412,15 @@ INDIRECT_CALLABLE_SCOPE int tcp4_gro_complete(struct sk_buff *skb, int thoff)
        const struct iphdr *iph = ip_hdr(skb);
        struct tcphdr *th = tcp_hdr(skb);
 
+       if (unlikely(NAPI_GRO_CB(skb)->is_flist)) {
+               skb_shinfo(skb)->gso_type |= SKB_GSO_FRAGLIST | SKB_GSO_TCPV4;
+               skb_shinfo(skb)->gso_segs = NAPI_GRO_CB(skb)->count;
+
+               __skb_incr_checksum_unnecessary(skb);
+
+               return 0;
+       }
+
        th->check = ~tcp_v4_check(skb->len - thoff, iph->saddr,
                                  iph->daddr, 0);
 

diff --git a/net/ipv6/tcpv6_offload.c b/net/ipv6/tcpv6_offload.c
index 7180c30dbbeffb66b0a108f743a795986452f3a0..575e2743e331fc0bdd5189c2fe9d10cc1a92f14b 100644 (file)
--- a/net/ipv6/tcpv6_offload.c
+++ b/net/ipv6/tcpv6_offload.c
@@ -32,6 +32,15 @@ INDIRECT_CALLABLE_SCOPE int tcp6_gro_complete(struct sk_buff *skb, int thoff)
        const struct ipv6hdr *iph = ipv6_hdr(skb);
        struct tcphdr *th = tcp_hdr(skb);
 
+       if (unlikely(NAPI_GRO_CB(skb)->is_flist)) {
+               skb_shinfo(skb)->gso_type |= SKB_GSO_FRAGLIST | SKB_GSO_TCPV6;
+               skb_shinfo(skb)->gso_segs = NAPI_GRO_CB(skb)->count;
+
+               __skb_incr_checksum_unnecessary(skb);
+
+               return 0;
+       }
+
        th->check = ~tcp_v6_check(skb->len - thoff, &iph->saddr,
                                  &iph->daddr, 0);
        skb_shinfo(skb)->gso_type |= SKB_GSO_TCPV6;