tcp: refine memory limit test in tcp_fragment()
Subsystems (3)
PATCH 1/1 tcp: refine memory limit test in tcp_fragment()
tcp_fragment() might be called for skbs in the write queue.
Memory limits might have been exceeded because tcp_sendmsg() only checks limits at full skb (64KB) boundaries.
Therefore, we need to make sure tcp_fragment() wont punish applications that might have setup very low SO_SNDBUF values.
--- net/ipv4/tcp_output.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/ipv4/tcp_output.c +2 -1
@@ -1296,7 +1296,8 @@ int tcp_fragment(struct sock *sk, enum tcp_queue tcp_queue,if (nsize <0 ) nsize =0 ; -if (unlikely ((sk->sk_wmem_queued >>1 ) > sk->sk_sndbuf)) { +if (unlikely ((sk->sk_wmem_queued >>1 ) > sk->sk_sndbuf && + tcp_queue !=TCP_FRAG_IN_WRITE_QUEUE )) {NET_INC_STATS (sock_net (sk),LINUX_MIB_TCPWQUEUETOOBIG );return -ENOMEM ; }
Signature · 1 line
2.22.0.410.gd8fdbe21b5-goog
Quoted 12 lines · Eric Dumazet
tcp_fragment() might be called for skbs in the write queue.
Memory limits might have been exceeded because
tcp_sendmsg()only checks limits at full skb (64KB) boundaries.Therefore, we need to make sure
tcp_fragment()wont punish applications that might have setup very lowSO_SNDBUFvalues.
Quoted 6 lines
Fixes f070ef2ac667 ("tcp: tcp_fragment() should apply sane memory limits")Signed-off-by Eric Dumazet <[email protected]>Reported-by Christoph Paasch <[email protected]>---
net/ipv4/tcp_output.c| 3 ++-1 file changed, 2 insertions(+), 1 deletion(-)
Thanks!
Quoted 18 lines
net/ipv4/tcp_output.c +2
-1@@ -1296,7 +1296,8 @@ int tcp_fragment(struct sock *sk, enum tcp_queue tcp_queue,if (nsize <0 ) nsize =0 ; -if (unlikely ((sk->sk_wmem_queued >>1 ) > sk->sk_sndbuf)) { +if (unlikely ((sk->sk_wmem_queued >>1 ) > sk->sk_sndbuf && + tcp_queue !=TCP_FRAG_IN_WRITE_QUEUE )) {NET_INC_STATS (sock_net (sk),LINUX_MIB_TCPWQUEUETOOBIG );return -ENOMEM ; }Signature · 1 line
2.22.0.410.gd8fdbe21b5-goog
David Miller
maintainerFrom: Eric Dumazet <[email protected]>
Date: Fri, 21 Jun 2019 06:09:55 -0700
Quoted 11 lines
tcp_fragment()might be called for skbs in the write queue.Memory limits might have been exceeded because
tcp_sendmsg()only checks limits at full skb (64KB) boundaries.Therefore, we need to make sure
tcp_fragment()wont punish applications that might have setup very lowSO_SNDBUFvalues.Fixes f070ef2ac667 ("tcp: tcp_fragment() should apply sane memory limits")Signed-off-by Eric Dumazet <[email protected]>Reported-by Christoph Paasch <[email protected]>
Applied and queued up for -stable.
Hello Eric,
We have applied that commit e358f4af19db ("tcp: tcp_fragment() should apply sane memory limits") as a hotpatch in production environment. We found that it will make
tcp long connection reset during sending out packet when applying
that commit.
Our applications which in A/B test have suffered that and made them retransmit large data, and then caused retransmission storm and lower the performance and increase RT.
Therefore we discontinued to apply this hotpatch in A/B test.
After invesgation, we found this patch already fix this issue in stable. Before applying this patch, we have some questions:
1. This commit in stable hard coded a magic number 0x20000. I am wondering this value and if there any better solution.
2. Is there any known or unknown side effect? If any, we could test it in some suspicious scenarios before testing in prod env.
Thanks.
Cheers,
Tony Lu
Quoted 31 lines · Eric Dumazet
tcp_fragment()might be called for skbs in the write queue.Memory limits might have been exceeded because
tcp_sendmsg()only checks limits at full skb (64KB) boundaries.Therefore, we need to make sure
tcp_fragment()wont punish applications that might have setup very lowSO_SNDBUFvalues.Fixes f070ef2ac667 ("tcp: tcp_fragment() should apply sane memory limits")Signed-off-by Eric Dumazet <[email protected]>Reported-by Christoph Paasch <[email protected]>--- net/ipv4/tcp_output.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)net/ipv4/tcp_output.c +2
-1@@ -1296,7 +1296,8 @@ int tcp_fragment(struct sock *sk, enum tcp_queue tcp_queue,if (nsize <0 ) nsize =0 ; -if (unlikely ((sk->sk_wmem_queued >>1 ) > sk->sk_sndbuf)) { +if (unlikely ((sk->sk_wmem_queued >>1 ) > sk->sk_sndbuf && + tcp_queue !=TCP_FRAG_IN_WRITE_QUEUE )) {NET_INC_STATS (sock_net (sk),LINUX_MIB_TCPWQUEUETOOBIG );return -ENOMEM ; }Signature · 1 line
2.22.0.410.gd8fdbe21b5-goog
Quoted 7 lines · Tony Lu
Hello Eric,
We have applied that commit
e358f4af19db("tcp:tcp_fragment()should apply sane memory limits") as a hotpatch in production environment. We found that it will make
tcp long connection reset during sending out packet when applying
that commit.
Quoted 9 lines
Our applications which in A/B test have suffered that and made them retransmit large data, and then caused retransmission storm and lower the performance and increase RT.
Therefore we discontinued to apply this hotpatch in A/B test.
After invesgation, we found this patch already fix this issue in stable. Before applying this patch, we have some questions:
Which stable version are you referring to exactly ?
Quoted 2 lines
1. This commit in stable hard coded a magic number
0x20000. I am wondering this value and if there any better solution.
0x20000 is two times 64KB, please read the changelog for the rationale.
Quoted 2 lines
2. Is there any known or unknown side effect? If any, we could test it in some suspicious scenarios before testing in prod env.
No known side effect.
Honestly, applications setting small SO_SNDBUF values can not expect good TCP performance anyway.
Quoted 38 lines
Thanks.
Cheers,
Tony LuQuoted 31 lines · Eric Dumazet
tcp_fragment()might be called for skbs in the write queue.Memory limits might have been exceeded because
tcp_sendmsg()only checks limits at full skb (64KB) boundaries.Therefore, we need to make sure
tcp_fragment()wont punish applications that might have setup very lowSO_SNDBUFvalues.Fixes f070ef2ac667 ("tcp: tcp_fragment() should apply sane memory limits")Signed-off-by Eric Dumazet <[email protected]>Reported-by Christoph Paasch <[email protected]>--- net/ipv4/tcp_output.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)net/ipv4/tcp_output.c +2
-1@@ -1296,7 +1296,8 @@ int tcp_fragment(struct sock *sk, enum tcp_queue tcp_queue,if (nsize <0 ) nsize =0 ; -if (unlikely ((sk->sk_wmem_queued >>1 ) > sk->sk_sndbuf)) { +if (unlikely ((sk->sk_wmem_queued >>1 ) > sk->sk_sndbuf && + tcp_queue !=TCP_FRAG_IN_WRITE_QUEUE )) {NET_INC_STATS (sock_net (sk),LINUX_MIB_TCPWQUEUETOOBIG );return -ENOMEM ; }Signature · 1 line
2.22.0.410.gd8fdbe21b5-goog