hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vsock: cancel packets when failing to connect 

Otherwise we'll leave the packets queued until releasing vsock device.
E.g., if guest is slow to start up, resulting ETIMEDOUT on connect, guest
will get the connect requests from failed host sockets.

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Jorgen Hansen <jhansen@vmware.com>
Signed-off-by: Peng Tao <bergwolf@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Peng Tao 2017-03-15 09:32:17 +08:00 committed by David S. Miller
parent 073b4f2c50
commit 380feae0de
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
net/vmw_vsock/af_vsock.c
View File

@ -1102,10 +1102,19 @@ static const struct proto_ops vsock_dgram_ops = {
.sendpage = sock_no_sendpage, .sendpage = sock_no_sendpage,
}; };
static int vsock_transport_cancel_pkt(struct vsock_sock *vsk)
{
if (!transport->cancel_pkt)
return -EOPNOTSUPP;
return transport->cancel_pkt(vsk);
}
static void vsock_connect_timeout(struct work_struct *work) static void vsock_connect_timeout(struct work_struct *work)
{ {
struct sock *sk; struct sock *sk;
struct vsock_sock *vsk; struct vsock_sock *vsk;
int cancel = 0;
vsk = container_of(work, struct vsock_sock, dwork.work); vsk = container_of(work, struct vsock_sock, dwork.work);
sk = sk_vsock(vsk); sk = sk_vsock(vsk);
@ -1116,8 +1125,11 @@ static void vsock_connect_timeout(struct work_struct *work)
sk->sk_state = SS_UNCONNECTED; sk->sk_state = SS_UNCONNECTED;
sk->sk_err = ETIMEDOUT; sk->sk_err = ETIMEDOUT;
sk->sk_error_report(sk); sk->sk_error_report(sk);
cancel = 1;
} }
release_sock(sk); release_sock(sk);
if (cancel)
vsock_transport_cancel_pkt(vsk);
sock_put(sk); sock_put(sk);
} }
@ -1224,11 +1236,13 @@ static int vsock_stream_connect(struct socket *sock, struct sockaddr *addr,
err = sock_intr_errno(timeout); err = sock_intr_errno(timeout);
sk->sk_state = SS_UNCONNECTED; sk->sk_state = SS_UNCONNECTED;
sock->state = SS_UNCONNECTED; sock->state = SS_UNCONNECTED;
vsock_transport_cancel_pkt(vsk);
goto out_wait; goto out_wait;
} else if (timeout == 0) { } else if (timeout == 0) {
err = -ETIMEDOUT; err = -ETIMEDOUT;
sk->sk_state = SS_UNCONNECTED; sk->sk_state = SS_UNCONNECTED;
sock->state = SS_UNCONNECTED; sock->state = SS_UNCONNECTED;
vsock_transport_cancel_pkt(vsk);
goto out_wait; goto out_wait;
} }