VSOCK: set POLLOUT | POLLWRNORM for TCP_CLOSING
select(2) with wfds but no rfds must return when the socket is shut down by the peer. This way userspace notices socket activity and gets -EPIPE from the next write(2). Currently select(2) does not return for virtio-vsock when a SEND+RCV shutdown packet is received. This is because vsock_poll() only sets POLLOUT | POLLWRNORM for TCP_CLOSE, not the TCP_CLOSING state that the socket is in when the shutdown is received. Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
dd5684ecae
Коммит
ba3169fc75
|
@ -951,7 +951,7 @@ static unsigned int vsock_poll(struct file *file, struct socket *sock,
|
|||
* POLLOUT|POLLWRNORM when peer is closed and nothing to read,
|
||||
* but local send is not shutdown.
|
||||
*/
|
||||
if (sk->sk_state == TCP_CLOSE) {
|
||||
if (sk->sk_state == TCP_CLOSE || sk->sk_state == TCP_CLOSING) {
|
||||
if (!(sk->sk_shutdown & SEND_SHUTDOWN))
|
||||
mask |= POLLOUT | POLLWRNORM;
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче