Re: [PATCH net-next v2 01/12] vsock: set EPOLLERR on non-empty error queue

[Stefano Garzarella]

On Sun, Oct 01, 2023 at 12:02:57AM +0300, Arseniy Krasnov wrote:
> If socket's error queue is not empty, EPOLLERR must be set. Otherwise,
> reader of error queue won't detect data in it using EPOLLERR bit.
> Currently for AF_VSOCK this is actual only with MSG_ZEROCOPY, as this
> feature is the only user of an error queue of the socket.
>
> Signed-off-by: Arseniy Krasnov <avkrasnov@xxxxxxxxxxxxxxxxx>
> ---
> Changelog:
> v1 -> v2:
>  * Update commit message by removing 'fix' word.

Reviewed-by: Stefano Garzarella <sgarzare@xxxxxxxxxx>

> net/vmw_vsock/af_vsock.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
> index 013b65241b65..d841f4de33b0 100644
> --- a/net/vmw_vsock/af_vsock.c
> +++ b/net/vmw_vsock/af_vsock.c
> @@ -1030,7 +1030,7 @@ static __poll_t vsock_poll(struct file *file, struct socket *sock,
> 	poll_wait(file, sk_sleep(sk), wait);
> 	mask = 0;
>
> -	if (sk->sk_err)
> +	if (sk->sk_err || !skb_queue_empty_lockless(&sk->sk_error_queue))
> 		/* Signify that there has been an error on this socket. */
> 		mask |= EPOLLERR;
>
> --
> 2.25.1