diff options
| author | Eric Dumazet <edumazet@google.com> | 2020-06-30 13:51:28 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-07-01 17:46:04 -0700 |
| commit | ba3bb0e76ccd464bb66665a1941fabe55dadb3ba (patch) | |
| tree | 331f8bc7f2b3e7d58d4df3c4e8dcc4d389f32fd6 /net/ipv4 | |
| parent | 0da7536fb47f51df89ccfcb1fa09f249d9accec5 (diff) | |
| download | linux-stable-ba3bb0e76ccd464bb66665a1941fabe55dadb3ba.tar.gz linux-stable-ba3bb0e76ccd464bb66665a1941fabe55dadb3ba.tar.bz2 linux-stable-ba3bb0e76ccd464bb66665a1941fabe55dadb3ba.zip | |
tcp: fix SO_RCVLOWAT possible hangs under high mem pressure
Whenever tcp_try_rmem_schedule() returns an error, we are under
trouble and should make sure to wakeup readers so that they
can drain socket queues and eventually make room.
Fixes: 03f45c883c6f ("tcp: avoid extra wakeups for SO_RCVLOWAT users")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/tcp_input.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index f3a0eb139b76..9615e72656d1 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -4582,6 +4582,7 @@ static void tcp_data_queue_ofo(struct sock *sk, struct sk_buff *skb) if (unlikely(tcp_try_rmem_schedule(sk, skb, skb->truesize))) { NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPOFODROP); + sk->sk_data_ready(sk); tcp_drop(sk, skb); return; } @@ -4828,6 +4829,7 @@ queue_and_out: sk_forced_mem_schedule(sk, skb->truesize); else if (tcp_try_rmem_schedule(sk, skb, skb->truesize)) { NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPRCVQDROP); + sk->sk_data_ready(sk); goto drop; } |