Add TCP fraglist GRO support
Subsystems (3)
v4 cover Add TCP fraglist GRO support
When forwarding TCP after GRO, software segmentation is very expensive, especially when the checksum needs to be recalculated.
One case where that's currently unavoidable is when routing packets over PPPoE. Performance improves significantly when using fraglist GRO implemented in the same way as for UDP.
When NETIF_F_GRO_FRAGLIST is enabled, perform a lookup for an established socket in the same netns as the receiving device. While this may not cover all relevant use cases in multi-netns configurations, it should be good enough for most configurations that need this.
Here's a measurement of running 2 TCP streams through a MediaTek MT7622 device (2-core Cortex-A53), which runs NAT with flow offload enabled from one ethernet port to PPPoE on another ethernet port + cake qdisc set to 1Gbps.
rx-gro-list off: 630 Mbit/s, CPU 35% idle rx-gro-list on: 770 Mbit/s, CPU 40% idle
Changes since v3:
- optimize __tcpv4_gso_segment_csum
- add unlikely()
- reorder dev_net/skb_gro_network_header calls after NETIF_F_GRO_FRAGLIST check
- add support for ipv6 nat
- drop redundant pskb_may_pull check
Changes since v2:
- create tcp_gro_header_pull helper function to pull tcp header only once
- optimize __tcpv4_gso_segment_list_csum, drop obsolete flags check
Changes since v1:
- revert bogus tcp flags overwrite on segmentation
- fix kbuild issue with !CONFIG_IPV6
- only perform socket lookup for the first skb in the GRO train
Changes since RFC:
- split up patches
- handle TCP flags mutations
Felix Fietkau (6):
net: move skb_gro_receive_list from udp to core
net: add support for segmenting TCP fraglist GSO packets
net: add code for TCP fraglist GRO
net: create tcp_gro_lookup helper function
net: create tcp_gro_header_pull helper function
net: add heuristic for enabling TCP fraglist GRO
include/net/gro.h | 1 + include/net/tcp.h | 5 +- net/core/gro.c | 27 +++++ net/ipv4/tcp_offload.c | 215 ++++++++++++++++++++++++++++++++------- net/ipv4/udp_offload.c | 27 ----- net/ipv6/tcpv6_offload.c | 120 +++++++++++++++++++++- 6 files changed, 326 insertions(+), 69 deletions(-)
Signature · 1 line
2.44.0
PATCH v4 1/6 net: move skb_gro_receive_list from udp to core
This helper function will be used for TCP fraglist GRO support
--- include/net/gro.h | 1 + net/core/gro.c | 27 +++++++++++++++++++++++++++ net/ipv4/udp_offload.c | 27 --------------------------- 3 files changed, 28 insertions(+), 27 deletions(-)
include/net/gro.h +1 -0
@@ -429,6 +429,7 @@ static inline __wsum ip6_gro_compute_pseudo(const struct sk_buff *skb, }int skb_gro_receive (struct sk_buff *p,struct sk_buff *skb); +int skb_gro_receive_list (struct sk_buff *p,struct sk_buff *skb);/* Pass the currently batched GRO_NORMAL SKBs up to the stack. */ static inline void gro_normal_list (struct napi_struct *napi)
net/core/gro.c +27 -0
@@ -231,6 +231,33 @@ int skb_gro_receive(struct sk_buff *p, struct sk_buff *skb)return 0 ; } +int skb_gro_receive_list (struct sk_buff *p,struct sk_buff *skb) +{ +if (unlikely (p->len + skb->len >=65536 )) +return -E2BIG ; + +if (NAPI_GRO_CB (p)->last == p) +skb_shinfo (p)->frag_list = skb; +else +NAPI_GRO_CB (p)->last->next = skb; + +skb_pull (skb,skb_gro_offset (skb)); + +NAPI_GRO_CB (p)->last = skb; +NAPI_GRO_CB (p)->count++; + p->data_len += skb->len; + +/* sk ownership - if any - completely transferred to the aggregated packet */ + skb->destructor =NULL ; + skb->sk =NULL ; + p->truesize += skb->truesize; + p->len += skb->len; + +NAPI_GRO_CB (skb)->same_flow =1 ; + +return 0 ; +} +static void napi_gro_complete (struct napi_struct *napi,struct sk_buff *skb) {
net/ipv4/udp_offload.c +0 -27
@@ -433,33 +433,6 @@ static struct sk_buff *udp4_ufo_fragment(struct sk_buff *skb,return segs; } -static int skb_gro_receive_list (struct sk_buff *p,struct sk_buff *skb) -{ -if (unlikely (p->len + skb->len >=65536 )) -return -E2BIG ; - -if (NAPI_GRO_CB (p)->last == p) -skb_shinfo (p)->frag_list = skb; -else -NAPI_GRO_CB (p)->last->next = skb; - -skb_pull (skb,skb_gro_offset (skb)); - -NAPI_GRO_CB (p)->last = skb; -NAPI_GRO_CB (p)->count++; - p->data_len += skb->len; - -/* sk ownership - if any - completely transferred to the aggregated packet */ - skb->destructor =NULL ; - skb->sk =NULL ; - p->truesize += skb->truesize; - p->len += skb->len; - -NAPI_GRO_CB (skb)->same_flow =1 ; - -return 0 ; -} -#define UDP_GRO_CNT_MAX 64 static struct sk_buff *udp_gro_receive_segment(struct list_head *head,
Signature · 1 line
2.44.0
PATCH v4 2/6 net: add support for segmenting TCP fraglist GSO packets
In reply to Felix FietkauPreparation for adding TCP fraglist GRO support. It expects packets to be combined in a similar way as UDP fraglist GSO packets.
For IPv4 packets, NAT is handled in the same way as UDP fraglist GSO.
--- net/ipv4/tcp_offload.c | 67 ++++++++++++++++++++++++++++++++++++++++ net/ipv6/tcpv6_offload.c | 58 ++++++++++++++++++++++++++++++++++ 2 files changed, 125 insertions(+)
net/ipv4/tcp_offload.c +67 -0
@@ -28,6 +28,70 @@ static void tcp_gso_tstamp(struct sk_buff *skb, unsigned int ts_seq, } } +static void __tcpv4_gso_segment_csum (struct sk_buff *seg, +__be32 *oldip,__be32 newip, +__be16 *oldport,__be16 newport) +{ +struct tcphdr *th; +struct iphdr *iph; + +if (*oldip == newip && *oldport == newport) +return ; + + th =tcp_hdr (seg); + iph =ip_hdr (seg); + +inet_proto_csum_replace4 (&th->check, seg, *oldip, newip, true); +inet_proto_csum_replace2 (&th->check, seg, *oldport, newport, false); + *oldport = newport; + +csum_replace4 (&iph->check, *oldip, newip); + *oldip = newip; +} + +static struct sk_buff *__tcpv4_gso_segment_list_csum (struct sk_buff *segs) +{ +const struct tcphdr *th; +const struct iphdr *iph; +struct sk_buff *seg; +struct tcphdr *th2; +struct iphdr *iph2; + + seg = segs; + th =tcp_hdr (seg); + iph =ip_hdr (seg); + th2 =tcp_hdr (seg->next); + iph2 =ip_hdr (seg->next); + +if (!(*(const u32 *)&th->source ^ *(const u32 *)&th2->source) && + iph->daddr == iph2->daddr && iph->saddr == iph2->saddr) +return segs; + +while ((seg = seg->next)) { + th2 =tcp_hdr (seg); + iph2 =ip_hdr (seg); + +__tcpv4_gso_segment_csum (seg, + &iph2->saddr, iph->saddr, + &th2->source, th->source); +__tcpv4_gso_segment_csum (seg, + &iph2->daddr, iph->daddr, + &th2->dest, th->dest); + } + +return segs; +} + +static struct sk_buff *__tcp4_gso_segment_list (struct sk_buff *skb, +netdev_features_t features) +{ + skb =skb_segment_list (skb, features,skb_mac_header_len (skb)); +if (IS_ERR (skb)) +return skb; + +return __tcpv4_gso_segment_list_csum (skb); +} +static struct sk_buff *tcp4_gso_segment (struct sk_buff *skb,netdev_features_t features) {
@@ -37,6 +101,9 @@ static struct sk_buff *tcp4_gso_segment(struct sk_buff *skb,if (!pskb_may_pull (skb,sizeof (struct tcphdr )))return ERR_PTR (-EINVAL ); +if (skb_shinfo (skb)->gso_type &SKB_GSO_FRAGLIST ) +return __tcp4_gso_segment_list (skb, features); +if (unlikely (skb->ip_summed !=CHECKSUM_PARTIAL )) {const struct iphdr *iph =ip_hdr (skb);struct tcphdr *th =tcp_hdr (skb);
net/ipv6/tcpv6_offload.c +58 -0
70 lines not on this page · raw message
Signature · 1 line
2.44.0
Paolo Abeni
maintainerRe: [PATCH v4 net-next v4 2/6] net: add support for segmenting TCP fraglist GSO packets
Quoted 61 lines · Felix Fietkau
Preparation for adding TCP fraglist GRO support. It expects packets to be combined in a similar way as UDP fraglist GSO packets.
For IPv4 packets, NAT is handled in the same way as UDP fraglist GSO.Signed-off-by Felix Fietkau <[email protected]>--- net/ipv4/tcp_offload.c | 67 ++++++++++++++++++++++++++++++++++++++++ net/ipv6/tcpv6_offload.c | 58 ++++++++++++++++++++++++++++++++++ 2 files changed, 125 insertions(+)net/ipv4/tcp_offload.c +43
-0@@ -28,6 +28,70 @@ static void tcp_gso_tstamp(struct sk_buff *skb, unsigned int ts_seq, } } +static void __tcpv4_gso_segment_csum (struct sk_buff *seg, +__be32 *oldip,__be32 newip, +__be16 *oldport,__be16 newport) +{ +struct tcphdr *th; +struct iphdr *iph; + +if (*oldip == newip && *oldport == newport) +return ; + + th =tcp_hdr (seg); + iph =ip_hdr (seg); + +inet_proto_csum_replace4 (&th->check, seg, *oldip, newip, true); +inet_proto_csum_replace2 (&th->check, seg, *oldport, newport, false); + *oldport = newport; + +csum_replace4 (&iph->check, *oldip, newip); + *oldip = newip; +} + +static struct sk_buff *__tcpv4_gso_segment_list_csum (struct sk_buff *segs) +{ +const struct tcphdr *th; +const struct iphdr *iph; +struct sk_buff *seg; +struct tcphdr *th2; +struct iphdr *iph2; + + seg = segs; + th =tcp_hdr (seg); + iph =ip_hdr (seg); + th2 =tcp_hdr (seg->next); + iph2 =ip_hdr (seg->next); + +if (!(*(const u32 *)&th->source ^ *(const u32 *)&th2->source) && + iph->daddr == iph2->daddr && iph->saddr == iph2->saddr) +return segs; + +while ((seg = seg->next)) { + th2 =tcp_hdr (seg); + iph2 =ip_hdr (seg); +
net/ipv4/tcp_offload.c static void tcp_gso_tstamp(struct sk_buff *skb, unsigned int ts_seq, · line 83
Quoted 10 lines
net/ipv4/tcp_offload.c +10
-0+__tcpv4_gso_segment_csum (seg, + &iph2->saddr, iph->saddr, + &th2->source, th->source); +__tcpv4_gso_segment_csum (seg, + &iph2->daddr, iph->daddr, + &th2->dest, th->dest); + } + +return segs; +}
AFAICS, all the above is really alike the UDP side, except for the transport header zero csum.
What about renaming the udp version of this helpers as 'tcpudpv4_...', move them in common code, add an explicit argument for 'zerocsum_allowed' and reuse such helper for both tcp and udp?
The same for the ipv6 variant.
Cheers,
Paolo
Re: [PATCH v4 net-next v4 2/6] net: add support for segmenting TCP fraglist GSO packets
Quoted 76 lines · Paolo Abeni
Quoted 61 lines · Felix Fietkau
Preparation for adding TCP fraglist GRO support. It expects packets to be combined in a similar way as UDP fraglist GSO packets.
For IPv4 packets, NAT is handled in the same way as UDP fraglist GSO.Signed-off-by Felix Fietkau <[email protected]>--- net/ipv4/tcp_offload.c | 67 ++++++++++++++++++++++++++++++++++++++++ net/ipv6/tcpv6_offload.c | 58 ++++++++++++++++++++++++++++++++++ 2 files changed, 125 insertions(+)net/ipv4/tcp_offload.c +43
-0@@ -28,6 +28,70 @@ static void tcp_gso_tstamp(struct sk_buff *skb, unsigned int ts_seq, } } +static void __tcpv4_gso_segment_csum (struct sk_buff *seg, +__be32 *oldip,__be32 newip, +__be16 *oldport,__be16 newport) +{ +struct tcphdr *th; +struct iphdr *iph; + +if (*oldip == newip && *oldport == newport) +return ; + + th =tcp_hdr (seg); + iph =ip_hdr (seg); + +inet_proto_csum_replace4 (&th->check, seg, *oldip, newip, true); +inet_proto_csum_replace2 (&th->check, seg, *oldport, newport, false); + *oldport = newport; + +csum_replace4 (&iph->check, *oldip, newip); + *oldip = newip; +} + +static struct sk_buff *__tcpv4_gso_segment_list_csum (struct sk_buff *segs) +{ +const struct tcphdr *th; +const struct iphdr *iph; +struct sk_buff *seg; +struct tcphdr *th2; +struct iphdr *iph2; + + seg = segs; + th =tcp_hdr (seg); + iph =ip_hdr (seg); + th2 =tcp_hdr (seg->next); + iph2 =ip_hdr (seg->next); + +if (!(*(const u32 *)&th->source ^ *(const u32 *)&th2->source) && + iph->daddr == iph2->daddr && iph->saddr == iph2->saddr) +return segs; + +while ((seg = seg->next)) { + th2 =tcp_hdr (seg); + iph2 =ip_hdr (seg); +net/ipv4/tcp_offload.c static void tcp_gso_tstamp(struct sk_buff *skb, unsigned int ts_seq, · line 83
Quoted 10 lines
net/ipv4/tcp_offload.c +10
-0+__tcpv4_gso_segment_csum (seg, + &iph2->saddr, iph->saddr, + &th2->source, th->source); +__tcpv4_gso_segment_csum (seg, + &iph2->daddr, iph->daddr, + &th2->dest, th->dest); + } + +return segs; +}AFAICS, all the above is really alike the UDP side, except for the transport header zero csum.
Quoted 5 lines
What about renaming the udp version of this helpers as '
tcpudpv4_...', move them in common code, add an explicit argument for 'zerocsum_allowed' and reuse such helper for both tcp and udp?The same for the ipv6 variant.
Wouldn't that make it more convoluted when taking into account that the checksum field offset is different for tcp vs udp? How would you handle that?
- Felix
Paolo Abeni
maintainerRe: [PATCH v4 net-next v4 2/6] net: add support for segmenting TCP fraglist GSO packets
Quoted 81 lines · Felix Fietkau
Quoted 80 lines · Paolo Abeni
Quoted 61 lines · Felix Fietkau
Preparation for adding TCP fraglist GRO support. It expects packets to be combined in a similar way as UDP fraglist GSO packets.
For IPv4 packets, NAT is handled in the same way as UDP fraglist GSO.Signed-off-by Felix Fietkau <[email protected]>--- net/ipv4/tcp_offload.c | 67 ++++++++++++++++++++++++++++++++++++++++ net/ipv6/tcpv6_offload.c | 58 ++++++++++++++++++++++++++++++++++ 2 files changed, 125 insertions(+)net/ipv4/tcp_offload.c +43
-0@@ -28,6 +28,70 @@ static void tcp_gso_tstamp(struct sk_buff *skb, unsigned int ts_seq, } } +static void __tcpv4_gso_segment_csum (struct sk_buff *seg, +__be32 *oldip,__be32 newip, +__be16 *oldport,__be16 newport) +{ +struct tcphdr *th; +struct iphdr *iph; + +if (*oldip == newip && *oldport == newport) +return ; + + th =tcp_hdr (seg); + iph =ip_hdr (seg); + +inet_proto_csum_replace4 (&th->check, seg, *oldip, newip, true); +inet_proto_csum_replace2 (&th->check, seg, *oldport, newport, false); + *oldport = newport; + +csum_replace4 (&iph->check, *oldip, newip); + *oldip = newip; +} + +static struct sk_buff *__tcpv4_gso_segment_list_csum (struct sk_buff *segs) +{ +const struct tcphdr *th; +const struct iphdr *iph; +struct sk_buff *seg; +struct tcphdr *th2; +struct iphdr *iph2; + + seg = segs; + th =tcp_hdr (seg); + iph =ip_hdr (seg); + th2 =tcp_hdr (seg->next); + iph2 =ip_hdr (seg->next); + +if (!(*(const u32 *)&th->source ^ *(const u32 *)&th2->source) && + iph->daddr == iph2->daddr && iph->saddr == iph2->saddr) +return segs; + +while ((seg = seg->next)) { + th2 =tcp_hdr (seg); + iph2 =ip_hdr (seg); +net/ipv4/tcp_offload.c static void tcp_gso_tstamp(struct sk_buff *skb, unsigned int ts_seq, · line 83
Quoted 10 lines
net/ipv4/tcp_offload.c +10
-0+__tcpv4_gso_segment_csum (seg, + &iph2->saddr, iph->saddr, + &th2->source, th->source); +__tcpv4_gso_segment_csum (seg, + &iph2->daddr, iph->daddr, + &th2->dest, th->dest); + } + +return segs; +}AFAICS, all the above is really alike the UDP side, except for the transport header zero csum.
What about renaming the udp version of this helpers as '
tcpudpv4_...', move them in common code, add an explicit argument for 'zerocsum_allowed' and reuse such helper for both tcp and udp?
Quoted 5 lines
Quoted 1 line
The same for the ipv6 variant.
Wouldn't that make it more convoluted when taking into account that the checksum field offset is different for tcp vs udp?
How would you handle that?
Probably making a common helper just for __tcpudpv{4,6}_gso_segment_csum and pass it the target l4 csum pointer as an additional argument. It would not be spectacularly nice, so no strong opinion either way.
Cheers,
Paolo
Re: [PATCH v4 net-next v4 2/6] net: add support for segmenting TCP fraglist GSO packets
Quoted 84 lines · Paolo Abeni
Quoted 83 lines · Felix Fietkau
Quoted 81 lines · Paolo Abeni
Quoted 61 lines · Felix Fietkau
Preparation for adding TCP fraglist GRO support. It expects packets to be combined in a similar way as UDP fraglist GSO packets.
For IPv4 packets, NAT is handled in the same way as UDP fraglist GSO.Signed-off-by Felix Fietkau <[email protected]>--- net/ipv4/tcp_offload.c | 67 ++++++++++++++++++++++++++++++++++++++++ net/ipv6/tcpv6_offload.c | 58 ++++++++++++++++++++++++++++++++++ 2 files changed, 125 insertions(+)net/ipv4/tcp_offload.c +43
-0@@ -28,6 +28,70 @@ static void tcp_gso_tstamp(struct sk_buff *skb, unsigned int ts_seq, } } +static void __tcpv4_gso_segment_csum (struct sk_buff *seg, +__be32 *oldip,__be32 newip, +__be16 *oldport,__be16 newport) +{ +struct tcphdr *th; +struct iphdr *iph; + +if (*oldip == newip && *oldport == newport) +return ; + + th =tcp_hdr (seg); + iph =ip_hdr (seg); + +inet_proto_csum_replace4 (&th->check, seg, *oldip, newip, true); +inet_proto_csum_replace2 (&th->check, seg, *oldport, newport, false); + *oldport = newport; + +csum_replace4 (&iph->check, *oldip, newip); + *oldip = newip; +} + +static struct sk_buff *__tcpv4_gso_segment_list_csum (struct sk_buff *segs) +{ +const struct tcphdr *th; +const struct iphdr *iph; +struct sk_buff *seg; +struct tcphdr *th2; +struct iphdr *iph2; + + seg = segs; + th =tcp_hdr (seg); + iph =ip_hdr (seg); + th2 =tcp_hdr (seg->next); + iph2 =ip_hdr (seg->next); + +if (!(*(const u32 *)&th->source ^ *(const u32 *)&th2->source) && + iph->daddr == iph2->daddr && iph->saddr == iph2->saddr) +return segs; + +while ((seg = seg->next)) { + th2 =tcp_hdr (seg); + iph2 =ip_hdr (seg); +net/ipv4/tcp_offload.c static void tcp_gso_tstamp(struct sk_buff *skb, unsigned int ts_seq, · line 83
Quoted 10 lines
net/ipv4/tcp_offload.c +10
-0+__tcpv4_gso_segment_csum (seg, + &iph2->saddr, iph->saddr, + &th2->source, th->source); +__tcpv4_gso_segment_csum (seg, + &iph2->daddr, iph->daddr, + &th2->dest, th->dest); + } + +return segs; +}AFAICS, all the above is really alike the UDP side, except for the transport header zero csum.
What about renaming the udp version of this helpers as '
tcpudpv4_...', move them in common code, add an explicit argument for 'zerocsum_allowed' and reuse such helper for both tcp and udp?The same for the ipv6 variant.
Quoted 7 lines
Quoted 2 lines
Wouldn't that make it more convoluted when taking into account that the checksum field offset is different for tcp vs udp? How would you handle that?
Probably making a common helper just for __tcpudpv{4,6}_gso_segment_csum and pass it the target l4 csum pointer as an additional argument. It would not be spectacularly nice, so no strong opinion either way.
I'd rather keep it duplicated but more straightforward and easier to read.
- Felix
Paolo Abeni
maintainerRe: [PATCH v4 net-next v4 2/6] net: add support for segmenting TCP fraglist GSO packets
In reply to Felix Fietkaunet/ipv4/tcp_offload.c static struct sk_buff *tcp4_gso_segment(struct sk_buff *skb, · line 105
Quoted 6 lines · Felix Fietkau
net/ipv4/tcp_offload.c +2
-0@@ -37,6 +101,9 @@ static struct sk_buff *tcp4_gso_segment(struct sk_buff *skb,if (!pskb_may_pull (skb,sizeof (struct tcphdr )))return ERR_PTR (-EINVAL ); +if (skb_shinfo (skb)->gso_type &SKB_GSO_FRAGLIST ) +return __tcp4_gso_segment_list (skb, features);
I'm sorry for the incremental feedback, I almost forgot.
Possibly the above condition could deserve an unlikely() annotation? less relevant than for GRO case, but at least we have consistent handling of such flag.
Thanks!
Paolo
Re: [PATCH v4 net-next v4 2/6] net: add support for segmenting TCP fraglist GSO packets
In reply to Felix FietkauQuoted 8 lines · Felix Fietkau
Preparation for adding TCP fraglist GRO support. It expects packets to be combined in a similar way as UDP fraglist GSO packets.
For IPv4 packets, NAT is handled in the same way as UDP fraglist GSO.Signed-off-by Felix Fietkau <[email protected]>---
PATCH v4 3/6 net: add code for TCP fraglist GRO
In reply to Felix FietkauThis 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.
--- net/ipv4/tcp_offload.c | 21 +++++++++++++++++++++ net/ipv6/tcpv6_offload.c | 9 +++++++++ 2 files changed, 30 insertions(+)
net/ipv4/tcp_offload.c +21 -0
@@ -334,6 +334,18 @@ struct sk_buff *tcp_gro_receive(struct list_head *head, struct sk_buff *skb) 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 );
net/ipv6/tcpv6_offload.c +9 -0
@@ -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 ;
Signature · 1 line
2.44.0
PATCH v4 4/6 net: create tcp_gro_lookup helper function
In reply to Felix FietkauThis pulls the flow port matching out of tcp_gro_receive, so that it can be reused for the next change, which adds the TCP fraglist GRO heuristic.
--- include/net/tcp.h | 1 + net/ipv4/tcp_offload.c | 41 +++++++++++++++++++++++++---------------- 2 files changed, 26 insertions(+), 16 deletions(-)
include/net/tcp.h +1 -0
@@ -2199,6 +2199,7 @@ void tcp_v4_destroy_sock(struct sock *sk);struct sk_buff *tcp_gso_segment (struct sk_buff *skb,netdev_features_t features); +struct sk_buff *tcp_gro_lookup (struct list_head *head,struct tcphdr *th);struct sk_buff *tcp_gro_receive (struct list_head *head,struct sk_buff *skb); INDIRECT_CALLABLE_DECLARE(int tcp4_gro_complete(struct sk_buff *skb, int thoff)); INDIRECT_CALLABLE_DECLARE(struct sk_buff *tcp4_gro_receive(struct list_head *head, struct sk_buff *skb));
net/ipv4/tcp_offload.c +25 -16
55 lines not on this page · raw message
Signature · 1 line
2.44.0
PATCH v4 5/6 net: create tcp_gro_header_pull helper function
In reply to Felix FietkauPull the code out of tcp_gro_receive in order to access the tcp header from tcp4/6_gro_receive.
--- include/net/tcp.h | 4 ++- net/ipv4/tcp_offload.c | 55 +++++++++++++++++++++++++--------------- net/ipv6/tcpv6_offload.c | 18 +++++++++---- 3 files changed, 50 insertions(+), 27 deletions(-)
include/net/tcp.h +3 -1
@@ -2199,8 +2199,10 @@ void tcp_v4_destroy_sock(struct sock *sk);struct sk_buff *tcp_gso_segment (struct sk_buff *skb,netdev_features_t features); +struct tcphdr *tcp_gro_pull_header (struct sk_buff *skb);struct sk_buff *tcp_gro_lookup (struct list_head *head,struct tcphdr *th); -struct sk_buff *tcp_gro_receive (struct list_head *head,struct sk_buff *skb); +struct sk_buff *tcp_gro_receive (struct list_head *head,struct sk_buff *skb, +struct tcphdr *th); INDIRECT_CALLABLE_DECLARE(int tcp4_gro_complete(struct sk_buff *skb, int thoff)); INDIRECT_CALLABLE_DECLARE(struct sk_buff *tcp4_gro_receive(struct list_head *head, struct sk_buff *skb)); INDIRECT_CALLABLE_DECLARE(int tcp6_gro_complete(struct sk_buff *skb, int thoff));
net/ipv4/tcp_offload.c +34 -21
96 lines not on this page · raw message
net/ipv6/tcpv6_offload.c +13 -5
@@ -16,15 +16,23 @@INDIRECT_CALLABLE_SCOPE struct sk_buff *tcp6_gro_receive(struct list_head *head, struct sk_buff *skb) { +struct tcphdr *th; +/* Don't bother verifying checksum if we're going to flush anyway. */ if (!NAPI_GRO_CB (skb)->flush &&skb_gro_checksum_validate (skb,IPPROTO_TCP , - ip6_gro_compute_pseudo)) { -NAPI_GRO_CB (skb)->flush =1 ; -return NULL ; - } + ip6_gro_compute_pseudo)) + goto flush; + + th =tcp_gro_pull_header (skb); +if (!th) + goto flush; + +return tcp_gro_receive (head, skb, th); -return tcp_gro_receive (head, skb); +flush: +NAPI_GRO_CB (skb)->flush =1 ; +return NULL ; } INDIRECT_CALLABLE_SCOPE int tcp6_gro_complete(struct sk_buff *skb, int thoff)
Signature · 1 line
2.44.0
PATCH v4 6/6 net: add heuristic for enabling TCP fraglist GRO
In reply to Felix FietkauWhen forwarding TCP after GRO, software segmentation is very expensive, especially when the checksum needs to be recalculated.
One case where that's currently unavoidable is when routing packets over PPPoE. Performance improves significantly when using fraglist GRO implemented in the same way as for UDP.
When NETIF_F_GRO_FRAGLIST is enabled, perform a lookup for an established socket in the same netns as the receiving device. While this may not cover all relevant use cases in multi-netns configurations, it should be good enough for most configurations that need this.
Here's a measurement of running 2 TCP streams through a MediaTek MT7622 device (2-core Cortex-A53), which runs NAT with flow offload enabled from one ethernet port to PPPoE on another ethernet port + cake qdisc set to 1Gbps.
rx-gro-list off: 630 Mbit/s, CPU 35% idle rx-gro-list on: 770 Mbit/s, CPU 40% idle
--- net/ipv4/tcp_offload.c | 32 ++++++++++++++++++++++++++++++++ net/ipv6/tcpv6_offload.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+)
net/ipv4/tcp_offload.c +32 -0
@@ -407,6 +407,36 @@ void tcp_gro_complete(struct sk_buff *skb) }EXPORT_SYMBOL (tcp_gro_complete); +static void tcp4_check_fraglist_gro (struct list_head *head,struct sk_buff *skb, +struct tcphdr *th) +{ +const struct iphdr *iph; +struct sk_buff *p; +struct sock *sk; +struct net *net; +int iif, sdif; + +if (!(skb->dev->features &NETIF_F_GRO_FRAGLIST )) +return ; + + p =tcp_gro_lookup (head, th); +if (p) { +NAPI_GRO_CB (skb)->is_flist =NAPI_GRO_CB (p)->is_flist; +return ; + } + +inet_get_iif_sdif (skb, &iif, &sdif); + iph =skb_gro_network_header (skb); + net =dev_net (skb->dev); + sk =__inet_lookup_established (net, net->ipv4.tcp_death_row.hashinfo, + iph->saddr, th->source, + iph->daddr,ntohs (th->dest), + iif, sdif); +NAPI_GRO_CB (skb)->is_flist = !sk; +if (sk) +sock_put (sk); +} +INDIRECT_CALLABLE_SCOPE struct sk_buff *tcp4_gro_receive(struct list_head *head, struct sk_buff *skb) {
@@ -422,6 +452,8 @@ struct sk_buff *tcp4_gro_receive(struct list_head *head, struct sk_buff *skb)if (!th) goto flush; +tcp4_check_fraglist_gro (head, skb, th); +return tcp_gro_receive (head, skb, th); flush:
net/ipv6/tcpv6_offload.c +35 -0
@@ -7,12 +7,45 @@*/ #include <linux/indirect_call_wrapper.h> #include <linux/skbuff.h> +#include <net/inet6_hashtables.h> #include <net/gro.h> #include <net/protocol.h> #include <net/tcp.h> #include <net/ip6_checksum.h> #include "ip6_offload.h" +static void tcp6_check_fraglist_gro (struct list_head *head,struct sk_buff *skb, +struct tcphdr *th) +{ +#if IS_ENABLED (CONFIG_IPV6 ) +const struct ipv6hdr *hdr; +struct sk_buff *p; +struct sock *sk; +struct net *net; +int iif, sdif; + +if (!(skb->dev->features &NETIF_F_GRO_FRAGLIST )) +return ; + + p =tcp_gro_lookup (head, th); +if (p) { +NAPI_GRO_CB (skb)->is_flist =NAPI_GRO_CB (p)->is_flist; +return ; + } + +inet6_get_iif_sdif (skb, &iif, &sdif); + hdr =skb_gro_network_header (skb); + net =dev_net (skb->dev); + sk =__inet6_lookup_established (net, net->ipv4.tcp_death_row.hashinfo, + &hdr->saddr, th->source, + &hdr->daddr,ntohs (th->dest), + iif, sdif); +NAPI_GRO_CB (skb)->is_flist = !sk; +if (sk) +sock_put (sk); +#endif /* IS_ENABLED(CONFIG_IPV6) */ +} +INDIRECT_CALLABLE_SCOPE struct sk_buff *tcp6_gro_receive(struct list_head *head, struct sk_buff *skb) {
@@ -28,6 +61,8 @@ struct sk_buff *tcp6_gro_receive(struct list_head *head, struct sk_buff *skb)if (!th) goto flush; +tcp6_check_fraglist_gro (head, skb, th); +return tcp_gro_receive (head, skb, th); flush:
Signature · 1 line
2.44.0
Jakub Kicinski
maintainerRe: [PATCH v4 net-next v4 6/6] net: add heuristic for enabling TCP fraglist GRO
Quoted 1 line · On Sat, 27 Apr 2024 20:23:02 +0200 Felix Fietkau wrote:
Signe-off-by Felix Fietkau <[email protected]>
^
dIf you have to respin - please update.
Paolo Abeni
maintainerRe: [PATCH v4 net-next v4 6/6] net: add heuristic for enabling TCP fraglist GRO
In reply to Felix FietkauQuoted 33 lines · Felix Fietkau
When forwarding TCP after GRO, software segmentation is very expensive, especially when the checksum needs to be recalculated.
One case where that's currently unavoidable is when routing packets over PPPoE. Performance improves significantly when using fraglist GRO implemented in the same way as for UDP.When
NETIF_F_GRO_FRAGLISTis enabled, perform a lookup for an established socket in the same netns as the receiving device. While this may not cover all relevant use cases in multi-netns configurations, it should be good enough for most configurations that need this.Here's a measurement of running 2 TCP streams through a MediaTek MT7622 device (2-core Cortex-A53), which runs NAT with flow offload enabled from one ethernet port to PPPoE on another ethernet port + cake qdisc set to 1Gbps.
rx-gro-list off: 630 Mbit/s, CPU 35% idle rx-gro-list on: 770 Mbit/s, CPU 40% idleSigne-off-by Felix Fietkau <[email protected]>--- net/ipv4/tcp_offload.c | 32 ++++++++++++++++++++++++++++++++ net/ipv6/tcpv6_offload.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+)net/ipv4/tcp_offload.c +0
-0@@ -407,6 +407,36 @@ void tcp_gro_complete(struct sk_buff *skb) }EXPORT_SYMBOL (tcp_gro_complete);
net/ipv4/tcp_offload.c void tcp_gro_complete(struct sk_buff *skb) · line 419
Quoted 10 lines
net/ipv4/tcp_offload.c +10
-0+static void tcp4_check_fraglist_gro (struct list_head *head,struct sk_buff *skb, +struct tcphdr *th) +{ +const struct iphdr *iph; +struct sk_buff *p; +struct sock *sk; +struct net *net; +int iif, sdif; + +if (!(skb->dev->features &NETIF_F_GRO_FRAGLIST ))
Should we add an 'unlikely()' here to pair with unlikely(is_flist) in *gro_receive / *gro_complete?
Should this test be moved into the caller, to avoid an unconditional function call in the ipv6 code?
(Also waiting for explicit ack from Eric)
Thank,
Paolo
Re: [PATCH v4 net-next v4 6/6] net: add heuristic for enabling TCP fraglist GRO
Quoted 34 lines · Paolo Abeni
Quoted 33 lines · Felix Fietkau
When forwarding TCP after GRO, software segmentation is very expensive, especially when the checksum needs to be recalculated.
One case where that's currently unavoidable is when routing packets over PPPoE. Performance improves significantly when using fraglist GRO implemented in the same way as for UDP.When
NETIF_F_GRO_FRAGLISTis enabled, perform a lookup for an established socket in the same netns as the receiving device. While this may not cover all relevant use cases in multi-netns configurations, it should be good enough for most configurations that need this.Here's a measurement of running 2 TCP streams through a MediaTek MT7622 device (2-core Cortex-A53), which runs NAT with flow offload enabled from one ethernet port to PPPoE on another ethernet port + cake qdisc set to 1Gbps.
rx-gro-list off: 630 Mbit/s, CPU 35% idle rx-gro-list on: 770 Mbit/s, CPU 40% idleSigne-off-by Felix Fietkau <[email protected]>--- net/ipv4/tcp_offload.c | 32 ++++++++++++++++++++++++++++++++ net/ipv6/tcpv6_offload.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+)net/ipv4/tcp_offload.c +0
-0@@ -407,6 +407,36 @@ void tcp_gro_complete(struct sk_buff *skb) }EXPORT_SYMBOL (tcp_gro_complete);
Quoted 13 lines
net/ipv4/tcp_offload.c void tcp_gro_complete(struct sk_buff *skb) · line 419
Quoted 10 lines
net/ipv4/tcp_offload.c +10
-0+static void tcp4_check_fraglist_gro (struct list_head *head,struct sk_buff *skb, +struct tcphdr *th) +{ +const struct iphdr *iph; +struct sk_buff *p; +struct sock *sk; +struct net *net; +int iif, sdif; + +if (!(skb->dev->features &NETIF_F_GRO_FRAGLIST ))Should we add an '
unlikely()' here to pair withunlikely(is_flist)in*gro_receive/*gro_complete?
Not sure if unlikely() will make any difference here. I think it makes more sense in the other places than here.
Quoted 2 lines
Should this test be moved into the caller, to avoid an unconditional function call in the ipv6 code?
The function is already called from tcp4_gro_receive, which is only called by IPv4 code. Also, since it's a static function called in only one place, it gets inlined by the compiler (at least in my builds). Not sure what unconditional function call you're referring to.
- Felix
Paolo Abeni
maintainerRe: [PATCH v4 net-next v4 6/6] net: add heuristic for enabling TCP fraglist GRO
Quoted 48 lines · Felix Fietkau
Quoted 34 lines · Paolo Abeni
Quoted 33 lines · Felix Fietkau
When forwarding TCP after GRO, software segmentation is very expensive, especially when the checksum needs to be recalculated.
One case where that's currently unavoidable is when routing packets over PPPoE. Performance improves significantly when using fraglist GRO implemented in the same way as for UDP.When
NETIF_F_GRO_FRAGLISTis enabled, perform a lookup for an established socket in the same netns as the receiving device. While this may not cover all relevant use cases in multi-netns configurations, it should be good enough for most configurations that need this.Here's a measurement of running 2 TCP streams through a MediaTek MT7622 device (2-core Cortex-A53), which runs NAT with flow offload enabled from one ethernet port to PPPoE on another ethernet port + cake qdisc set to 1Gbps.
rx-gro-list off: 630 Mbit/s, CPU 35% idle rx-gro-list on: 770 Mbit/s, CPU 40% idleSigne-off-by Felix Fietkau <[email protected]>--- net/ipv4/tcp_offload.c | 32 ++++++++++++++++++++++++++++++++ net/ipv6/tcpv6_offload.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+)net/ipv4/tcp_offload.c +0
-0@@ -407,6 +407,36 @@ void tcp_gro_complete(struct sk_buff *skb) }EXPORT_SYMBOL (tcp_gro_complete);Quoted 13 lines
net/ipv4/tcp_offload.c void tcp_gro_complete(struct sk_buff *skb) · line 419
Quoted 10 lines
net/ipv4/tcp_offload.c +10
-0+static void tcp4_check_fraglist_gro (struct list_head *head,struct sk_buff *skb, +struct tcphdr *th) +{ +const struct iphdr *iph; +struct sk_buff *p; +struct sock *sk; +struct net *net; +int iif, sdif; + +if (!(skb->dev->features &NETIF_F_GRO_FRAGLIST ))Should we add an '
unlikely()' here to pair withunlikely(is_flist)in*gro_receive/*gro_complete?
Quoted 2 lines
Not sure if
unlikely()will make any difference here. I think it makes more sense in the other places than here.
Why? AFAICS this will be called for every packet on the wire, exactly as the code getting this annotation in patch 3/6.
Quoted 7 lines
Quoted 2 lines
Should this test be moved into the caller, to avoid an unconditional function call in the ipv6 code?
The function is already called from
tcp4_gro_receive, which is only called by IPv4 code. Also, since it's a static function called in only one place, it gets inlined by the compiler (at least in my builds). Not sure what unconditional function call you're referring to.
Right you are. I just got fooled by my hope to reuse the same function for ipv4 and v6. Please just ignore this last part.
Cheers,
Paolo
Re: [PATCH v4 net-next v4 6/6] net: add heuristic for enabling TCP fraglist GRO
Quoted 49 lines · Paolo Abeni
Quoted 48 lines · Felix Fietkau
Quoted 47 lines · Paolo Abeni
Quoted 33 lines · Felix Fietkau
When forwarding TCP after GRO, software segmentation is very expensive, especially when the checksum needs to be recalculated.
One case where that's currently unavoidable is when routing packets over PPPoE. Performance improves significantly when using fraglist GRO implemented in the same way as for UDP.When
NETIF_F_GRO_FRAGLISTis enabled, perform a lookup for an established socket in the same netns as the receiving device. While this may not cover all relevant use cases in multi-netns configurations, it should be good enough for most configurations that need this.Here's a measurement of running 2 TCP streams through a MediaTek MT7622 device (2-core Cortex-A53), which runs NAT with flow offload enabled from one ethernet port to PPPoE on another ethernet port + cake qdisc set to 1Gbps.
rx-gro-list off: 630 Mbit/s, CPU 35% idle rx-gro-list on: 770 Mbit/s, CPU 40% idleSigne-off-by Felix Fietkau <[email protected]>--- net/ipv4/tcp_offload.c | 32 ++++++++++++++++++++++++++++++++ net/ipv6/tcpv6_offload.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+)net/ipv4/tcp_offload.c +0
-0@@ -407,6 +407,36 @@ void tcp_gro_complete(struct sk_buff *skb) }EXPORT_SYMBOL (tcp_gro_complete);net/ipv4/tcp_offload.c void tcp_gro_complete(struct sk_buff *skb) · line 419
Quoted 10 lines
net/ipv4/tcp_offload.c +10
-0+static void tcp4_check_fraglist_gro (struct list_head *head,struct sk_buff *skb, +struct tcphdr *th) +{ +const struct iphdr *iph; +struct sk_buff *p; +struct sock *sk; +struct net *net; +int iif, sdif; + +if (!(skb->dev->features &NETIF_F_GRO_FRAGLIST ))Should we add an '
unlikely()' here to pair withunlikely(is_flist)in*gro_receive/*gro_complete?
Quoted 4 lines
Quoted 1 line
Not sure if
unlikely()will make any difference here. I think it makes more sense in the other places than here.Why? AFAICS this will be called for every packet on the wire, exactly as the code getting this annotation in patch 3/6.
I had compared assembly after adding an annotation and didn't see a difference. However, my annotation was wrong. When I add: if (likely(!(skb->dev->features & NETIF_F_GRO_FRAGLIST)))
the generated code is different, and I probably should use that.
- Felix
Re: [PATCH v4 net-next v4 6/6] net: add heuristic for enabling TCP fraglist GRO
Quoted 53 lines · Felix Fietkau
Quoted 52 lines · Paolo Abeni
Quoted 50 lines · Felix Fietkau
Quoted 34 lines · Paolo Abeni
Quoted 33 lines · Felix Fietkau
When forwarding TCP after GRO, software segmentation is very expensive, especially when the checksum needs to be recalculated.
One case where that's currently unavoidable is when routing packets over PPPoE. Performance improves significantly when using fraglist GRO implemented in the same way as for UDP.When
NETIF_F_GRO_FRAGLISTis enabled, perform a lookup for an established socket in the same netns as the receiving device. While this may not cover all relevant use cases in multi-netns configurations, it should be good enough for most configurations that need this.Here's a measurement of running 2 TCP streams through a MediaTek MT7622 device (2-core Cortex-A53), which runs NAT with flow offload enabled from one ethernet port to PPPoE on another ethernet port + cake qdisc set to 1Gbps.
rx-gro-list off: 630 Mbit/s, CPU 35% idle rx-gro-list on: 770 Mbit/s, CPU 40% idleSigne-off-by Felix Fietkau <[email protected]>--- net/ipv4/tcp_offload.c | 32 ++++++++++++++++++++++++++++++++ net/ipv6/tcpv6_offload.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+)net/ipv4/tcp_offload.c +0
-0@@ -407,6 +407,36 @@ void tcp_gro_complete(struct sk_buff *skb) }EXPORT_SYMBOL (tcp_gro_complete);Quoted 13 lines
net/ipv4/tcp_offload.c void tcp_gro_complete(struct sk_buff *skb) · line 419
Quoted 10 lines
net/ipv4/tcp_offload.c +10
-0+static void tcp4_check_fraglist_gro (struct list_head *head,struct sk_buff *skb, +struct tcphdr *th) +{ +const struct iphdr *iph; +struct sk_buff *p; +struct sock *sk; +struct net *net; +int iif, sdif; + +if (!(skb->dev->features &NETIF_F_GRO_FRAGLIST ))Should we add an '
unlikely()' here to pair withunlikely(is_flist)in*gro_receive/*gro_complete?Not sure if
unlikely()will make any difference here. I think it makes more sense in the other places than here.
Quoted 7 lines
Quoted 2 lines
Why? AFAICS this will be called for every packet on the wire, exactly as the code getting this annotation in patch 3/6.
I had compared assembly after adding an annotation and didn't see a difference. However, my annotation was wrong.
When I add: if (likely(!(skb->dev->features & NETIF_F_GRO_FRAGLIST))) the generated code is different, and I probably should use that.
I read the above as you intend to send a new revision. If so, feel free to add
to the whole series.
Otherwise, please LMK, I think we can merge it as-is and ev. follow-up.
Thanks,
Paolo
Re: [PATCH v4 net-next v4 6/6] net: add heuristic for enabling TCP fraglist GRO
In reply to Felix FietkauQuoted 17 lines · Felix Fietkau
When forwarding TCP after GRO, software segmentation is very expensive, especially when the checksum needs to be recalculated.
One case where that's currently unavoidable is when routing packets over PPPoE. Performance improves significantly when using fraglist GRO implemented in the same way as for UDP.When
NETIF_F_GRO_FRAGLISTis enabled, perform a lookup for an established socket in the same netns as the receiving device. While this may not cover all relevant use cases in multi-netns configurations, it should be good enough for most configurations that need this.Here's a measurement of running 2 TCP streams through a MediaTek MT7622 device (2-core Cortex-A53), which runs NAT with flow offload enabled from one ethernet port to PPPoE on another ethernet port + cake qdisc set to 1Gbps.
Quoted 4 lines
rx-gro-list off: 630 Mbit/s, CPU 35% idle rx-gro-list on: 770 Mbit/s, CPU 40% idleSigne-off-by Felix Fietkau <[email protected]>
Thanks