From: Arseniy Krasnov <avkrasnov@salutedevices.com>
To: Stefan Hajnoczi <stefanha@redhat.com>,
Stefano Garzarella <sgarzare@redhat.com>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Jason Wang <jasowang@redhat.com>,
Bobby Eshleman <bobby.eshleman@bytedance.com>
Cc: <kvm@vger.kernel.org>,
<virtualization@lists.linux-foundation.org>,
<netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<kernel@sberdevices.ru>, <oxffffaa@gmail.com>,
<avkrasnov@salutedevices.com>
Subject: [PATCH net-next v1 01/12] vsock: fix EPOLLERR set on non-empty error queue
Date: Fri, 22 Sep 2023 08:24:17 +0300 [thread overview]
Message-ID: <20230922052428.4005676-2-avkrasnov@salutedevices.com> (raw)
In-Reply-To: <20230922052428.4005676-1-avkrasnov@salutedevices.com>
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 reproducible only with MSG_ZEROCOPY, as
this feature is the only user of an error queue of the socket.
Signed-off-by: Arseniy Krasnov <avkrasnov@salutedevices.com>
---
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
next prev parent reply other threads:[~2023-09-22 5:31 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-22 5:24 [PATCH net-next v1 00/12] vsock/virtio: continue MSG_ZEROCOPY support Arseniy Krasnov
2023-09-22 5:24 ` Arseniy Krasnov [this message]
2023-09-26 12:54 ` [PATCH net-next v1 01/12] vsock: fix EPOLLERR set on non-empty error queue Stefano Garzarella
2023-09-22 5:24 ` [PATCH net-next v1 02/12] vsock: read from socket's " Arseniy Krasnov
2023-09-26 12:55 ` Stefano Garzarella
2023-09-26 19:36 ` Arseniy Krasnov
2023-09-27 7:34 ` Stefano Garzarella
2023-09-27 7:34 ` Arseniy Krasnov
2023-09-22 5:24 ` [PATCH net-next v1 03/12] vsock: check for MSG_ZEROCOPY support on send Arseniy Krasnov
2023-09-22 5:24 ` [PATCH net-next v1 04/12] vsock: enable SOCK_SUPPORT_ZC bit Arseniy Krasnov
2023-09-22 5:24 ` [PATCH net-next v1 05/12] vhost/vsock: support MSG_ZEROCOPY for transport Arseniy Krasnov
2023-09-22 5:24 ` [PATCH net-next v1 06/12] vsock/virtio: " Arseniy Krasnov
2023-09-22 5:24 ` [PATCH net-next v1 07/12] vsock/loopback: " Arseniy Krasnov
2023-09-22 5:24 ` [PATCH net-next v1 08/12] vsock: enable setting SO_ZEROCOPY Arseniy Krasnov
2023-09-26 12:56 ` Stefano Garzarella
2023-09-26 19:38 ` Arseniy Krasnov
2023-09-27 7:35 ` Stefano Garzarella
2023-09-22 5:24 ` [PATCH net-next v1 09/12] docs: net: description of MSG_ZEROCOPY for AF_VSOCK Arseniy Krasnov
2023-09-22 5:24 ` [PATCH net-next v1 10/12] test/vsock: MSG_ZEROCOPY flag tests Arseniy Krasnov
2023-09-26 12:56 ` Stefano Garzarella
2023-09-22 5:24 ` [PATCH net-next v1 11/12] test/vsock: MSG_ZEROCOPY support for vsock_perf Arseniy Krasnov
2023-09-22 5:24 ` [PATCH net-next v1 12/12] test/vsock: io_uring rx/tx tests Arseniy Krasnov
2023-09-26 13:04 ` Stefano Garzarella
2023-09-26 20:00 ` Arseniy Krasnov
2023-09-27 7:37 ` Stefano Garzarella
2023-09-26 13:10 ` [PATCH net-next v1 00/12] vsock/virtio: continue MSG_ZEROCOPY support Stefano Garzarella
2023-09-26 19:40 ` Arseniy Krasnov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230922052428.4005676-2-avkrasnov@salutedevices.com \
--to=avkrasnov@salutedevices.com \
--cc=bobby.eshleman@bytedance.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=jasowang@redhat.com \
--cc=kernel@sberdevices.ru \
--cc=kuba@kernel.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=oxffffaa@gmail.com \
--cc=pabeni@redhat.com \
--cc=sgarzare@redhat.com \
--cc=stefanha@redhat.com \
--cc=virtualization@lists.linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®