tcp: fix SO_RCVLOWAT possible hangs under high mem pressure
[ Upstream commitba3bb0e76c
] 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:03f45c883c
("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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
9b7fd81cf9
commit
7eec9f3312
|
@ -4564,6 +4564,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;
|
||||
}
|
||||
|
@ -4807,6 +4808,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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue