Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-25 21:51:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

vsock/virtio: discard packets only when socket is really closed

Browse Source 
Starting from commit 8692cefc43 ("virtio_vsock: Fix race condition
in virtio_transport_recv_pkt"), we discard packets in
virtio_transport_recv_pkt() if the socket has been released.

When the socket is connected, we schedule a delayed work to wait the
RST packet from the other peer, also if SHUTDOWN_MASK is set in
sk->sk_shutdown.
This is done to complete the virtio-vsock shutdown algorithm, releasing
the port assigned to the socket definitively only when the other peer
has consumed all the packets.

If we discard the RST packet received, the socket will be closed only
when the VSOCK_CLOSE_TIMEOUT is reached.

Sergio discovered the issue while running ab(1) HTTP benchmark using
libkrun [1] and observing a latency increase with that commit.

To avoid this issue, we discard packet only if the socket is really
closed (SOCK_DONE flag is set).
We also set SOCK_DONE in virtio_transport_release() when we don't need
to wait any packets from the other peer (we didn't schedule the delayed
work). In this case we remove the socket from the vsock lists, releasing
the port assigned.

[1] https://github.com/containers/libkrun

Fixes: 8692cefc43 ("virtio_vsock: Fix race condition in virtio_transport_recv_pkt")
Cc: justin.he@arm.com
Reported-by: Sergio Lopez <slp@redhat.com>
Tested-by: Sergio Lopez <slp@redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Acked-by: Jia He <justin.he@arm.com>
Link: https://lore.kernel.org/r/20201120104736.73749-1-sgarzare@redhat.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Stefano Garzarella 2020-11-20 11:47:36 +01:00 committed by Jakub Kicinski
parent 01770a1661
commit 3fe356d58e
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/vmw_vsock/virtio_transport_common.c
View File

@ -841,9 +841,11 @@ void virtio_transport_release(struct vsock_sock *vsk)
virtio_transport_free_pkt(pkt); virtio_transport_free_pkt(pkt);
} }
if (remove_sock) if (remove_sock) {
sock_set_flag(sk, SOCK_DONE);
vsock_remove_sock(vsk); vsock_remove_sock(vsk);
} }
}
EXPORT_SYMBOL_GPL(virtio_transport_release); EXPORT_SYMBOL_GPL(virtio_transport_release);
static int static int
@ -1132,8 +1134,8 @@ void virtio_transport_recv_pkt(struct virtio_transport *t,
lock_sock(sk); lock_sock(sk);
/* Check if sk has been released before lock_sock */ /* Check if sk has been closed before lock_sock */
if (sk->sk_shutdown == SHUTDOWN_MASK) { if (sock_flag(sk, SOCK_DONE)) {
(void)virtio_transport_reset_no_sock(t, pkt); (void)virtio_transport_reset_no_sock(t, pkt);
release_sock(sk); release_sock(sk);
sock_put(sk); sock_put(sk);