From: Arjun Roy <arjunroy.kdev@gmail•com>
To: davem@davemloft•net, netdev@vger•kernel.org
Cc: arjunroy@google•com, edumazet@google•com, soheil@google•com,
ncardwell@google•com
Subject: [net] tcp: Prevent low rmem stalls with SO_RCVLOWAT.
Date: Fri, 23 Oct 2020 10:48:57 -0700 [thread overview]
Message-ID: <20201023174856.200394-1-arjunroy.kdev@gmail.com> (raw)
From: Arjun Roy <arjunroy@google•com>
With SO_RCVLOWAT, under memory pressure,
it is possible to enter a state where:
1. We have not received enough bytes to satisfy SO_RCVLOWAT.
2. We have not entered buffer pressure (see tcp_rmem_pressure()).
3. But, we do not have enough buffer space to accept more packets.
In this case, we advertise 0 rwnd (due to #3) but the application does
not drain the receive queue (no wakeup because of #1 and #2) so the
flow stalls.
Modify the heuristic for SO_RCVLOWAT so that, if we are advertising
rwnd<=rcv_mss, force a wakeup to prevent a stall.
Without this patch, setting tcp_rmem to 6143 and disabling TCP
autotune causes a stalled flow. With this patch, no stall occurs. This
is with RPC-style traffic with large messages.
Fixes: 03f45c883c6f ("tcp: avoid extra wakeups for SO_RCVLOWAT users")
Signed-off-by: Arjun Roy <arjunroy@google•com>
Acked-by: Soheil Hassas Yeganeh <soheil@google•com>
Acked-by: Neal Cardwell <ncardwell@google•com>
Signed-off-by: Eric Dumazet <edumazet@google•com>
---
net/ipv4/tcp.c | 2 ++
net/ipv4/tcp_input.c | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index de19af65bc70..f605cf87b9be 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -521,6 +521,8 @@ static inline bool tcp_stream_is_readable(const struct tcp_sock *tp,
return true;
if (tcp_rmem_pressure(sk))
return true;
+ if (tcp_receive_window(tp) <= inet_csk(sk)->icsk_ack.rcv_mss)
+ return true;
}
if (sk->sk_prot->stream_memory_read)
return sk->sk_prot->stream_memory_read(sk);
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index d285d67c0ef2..30b450ebaae0 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -5294,7 +5294,8 @@ void tcp_data_ready(struct sock *sk)
int avail = tp->rcv_nxt - tp->copied_seq;
if (avail < sk->sk_rcvlowat && !tcp_rmem_pressure(sk) &&
- !sock_flag(sk, SOCK_DONE))
+ !sock_flag(sk, SOCK_DONE) &&
+ tcp_receive_window(tp) > inet_csk(sk)->icsk_ack.rcv_mss)
return;
DIRECT_CALL(sock, sk_data_ready, sk->sk_data_ready, sk);
--
2.29.0.rc2.309.g374f81d7ae-goog
next reply other threads:[~2020-10-23 17:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-23 17:48 Arjun Roy [this message]
2020-10-23 18:31 ` [net] tcp: Prevent low rmem stalls with SO_RCVLOWAT Jakub Kicinski
2020-10-23 18:49 ` Arjun Roy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201023174856.200394-1-arjunroy.kdev@gmail.com \
--to=arjunroy.kdev@gmail$(echo .)com \
--cc=arjunroy@google$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=edumazet@google$(echo .)com \
--cc=ncardwell@google$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=soheil@google$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox