Commit 519366f6 authored by Arjun Roy's avatar Arjun Roy Committed by Greg Kroah-Hartman
Browse files

tcp: Prevent low rmem stalls with SO_RCVLOWAT.

[ Upstream commit 435ccfa894e35e3d4a1799e6ac030e48a7b69ef5 ]

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: 03f45c88

 ("tcp: avoid extra wakeups for SO_RCVLOWAT users")
Signed-off-by: default avatarArjun Roy <>
Acked-by: default avatarSoheil Hassas Yeganeh <>
Acked-by: default avatarNeal Cardwell <>
Signed-off-by: default avatarEric Dumazet <>

Signed-off-by: default avatarJakub Kicinski <>
Signed-off-by: default avatarGreg Kroah-Hartman <>
parent 9ceecfdb
...@@ -483,6 +483,8 @@ static inline bool tcp_stream_is_readable(const struct tcp_sock *tp, ...@@ -483,6 +483,8 @@ static inline bool tcp_stream_is_readable(const struct tcp_sock *tp,
return true; return true;
if (tcp_rmem_pressure(sk)) if (tcp_rmem_pressure(sk))
return true; return true;
if (tcp_receive_window(tp) <= inet_csk(sk)->icsk_ack.rcv_mss)
return true;
} }
if (sk->sk_prot->stream_memory_read) if (sk->sk_prot->stream_memory_read)
return sk->sk_prot->stream_memory_read(sk); return sk->sk_prot->stream_memory_read(sk);
...@@ -4790,7 +4790,8 @@ void tcp_data_ready(struct sock *sk) ...@@ -4790,7 +4790,8 @@ void tcp_data_ready(struct sock *sk)
int avail = tp->rcv_nxt - tp->copied_seq; int avail = tp->rcv_nxt - tp->copied_seq;
if (avail < sk->sk_rcvlowat && !tcp_rmem_pressure(sk) && 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; return;
sk->sk_data_ready(sk); sk->sk_data_ready(sk);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment