Re: [PATCH] tcp: ensure epoll edge trigger wakeup when out of memory

[Eric Dumazet <eric.dumazet@gmail.com>]

On Fri, 2015-05-15 at 21:17 +0000, Jason Baron wrote:
> From: Jason Baron <jbaron@akamai.com>
> 
> If we really can't get an skb allocated, make sure that we let
> userspace know. This at least gives us a chance to re-try or abort.
> 
> Signed-off-by: Jason Baron <jbaron@akamai.com>
> ---
>  net/ipv4/tcp.c | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
> index ecccfdc..d7d85e8 100644
> --- a/net/ipv4/tcp.c
> +++ b/net/ipv4/tcp.c
> @@ -986,6 +986,9 @@ do_error:
>  	if (copied)
>  		goto out;
>  out_err:
> +	/* make sure we wake any epoll edge trigger waiter */
> +	if (unlikely(sk->sk_write_queue == 0 && err == -EAGAIN))
> +		sk->sk_write_space(sk);
>  	return sk_stream_error(sk, flags, err);
>  }
>  
> @@ -1274,6 +1277,9 @@ do_error:
>  		goto out;
>  out_err:
>  	err = sk_stream_error(sk, flags, err);
> +	/* make sure we wake any epoll edge trigger waiter */
> +	if (unlikely(sk->sk_write_queue == 0 && err == -EAGAIN))
> +		sk->sk_write_space(sk);
>  	release_sock(sk);
>  	return err;
>  }

I wonder if we should return ENOMEM here, otherwise application has no
way to avoid to spin forever ?