vsock: each transport cycles only on its own sockets
Subsystems (8)
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/2 vsock: each transport cycles only on its own sockets
When iterating over sockets using vsock_for_each_connected_socket, make sure that a transport filters out sockets that don't belong to the transport.
There actually was an issue caused by this; in a nested VM configuration, destroying the nested VM (which often involves the closing of /dev/vhost-vsock if there was h2g connections to the nested VM) kills not only the h2g connections, but also all existing g2h connections to the (outmost) host which are totally unrelated.
Tested: Executed the following steps on Cuttlefish (Android running on a VM) [1]: (1) Enter into an adb shell session - to have a g2h connection inside the VM, (2) open and then close /dev/vhost-vsock by exec 3< /dev/vhost-vsock && exec 3<&-, (3) observe that the adb session is not reset.
[1] https://android.googlesource.com/device/google/cuttlefish/
--- drivers/vhost/vsock.c | 4 ++++ net/vmw_vsock/virtio_transport.c | 7 +++++++ net/vmw_vsock/vmci_transport.c | 5 +++++ 3 files changed, 16 insertions(+)
drivers/vhost/vsock.c +4 -0
@@ -722,6 +722,10 @@ static void vhost_vsock_reset_orphans(struct sock *sk)* executing. */ +/* Only handle our own sockets */ +if (vsk->transport != &vhost_transport.transport) +return ; +/* If the peer is still valid, no need to reset connection */ if (vhost_vsock_get (vsk->remote_addr.svm_cid))return ;
net/vmw_vsock/virtio_transport.c +7 -0
@@ -24,6 +24,7 @@static struct workqueue_struct *virtio_vsock_workqueue;static struct virtio_vsock __rcu *the_virtio_vsock;static DEFINE_MUTEX (the_virtio_vsock_mutex);/* protects the_virtio_vsock */ +static struct virtio_transport virtio_transport;/* forward declaration */ struct virtio_vsock {struct virtio_device *vdev;
@@ -357,11 +358,17 @@ static void virtio_vsock_event_fill(struct virtio_vsock *vsock)static void virtio_vsock_reset_sock (struct sock *sk) { +struct vsock_sock *vsk =vsock_sk (sk); +/* vmci_transport.c doesn't take sk_lock here either. At least we're * under vsock_table_lock so the sock cannot disappear while we're * executing. */ +/* Only handle our own sockets */ +if (vsk->transport != &virtio_transport.transport) +return ; + sk->sk_state =TCP_CLOSE ; sk->sk_err =ECONNRESET ;sk_error_report (sk);
net/vmw_vsock/vmci_transport.c +5 -0
@@ -803,6 +803,11 @@ static void vmci_transport_handle_detach(struct sock *sk)struct vsock_sock *vsk; vsk =vsock_sk (sk); + +/* Only handle our own sockets */ +if (vsk->transport != &vmci_transport) +return ; +if (!vmci_handle_is_invalid (vmci_trans (vsk)->qp_handle)) {sock_set_flag (sk,SOCK_DONE );
Signature · 1 line
2.35.1.723.g4982287a31-goog
Michael S. Tsirkin
maintainerThis message had
In-Reply-To: <[email protected]> in its header but [email protected] was not sent to the list.
Please don't do that. Instead, please write and send a proper cover letter. Thanks!
Quoted 89 lines · Jiyong Park
When iterating over sockets using
vsock_for_each_connected_socket, make sure that a transport filters out sockets that don't belong to the transport.There actually was an issue caused by this; in a nested VM configuration, destroying the nested VM (which often involves the closing of
/dev/vhost-vsockif there was h2g connections to the nested VM) kills not only the h2g connections, but also all existing g2h connections to the (outmost) host which are totally unrelated.Tested: Executed the following steps on Cuttlefish (Android running on a VM) [1]: (1) Enter into an
adb shellsession - to have a g2h connection inside the VM, (2) open and then close/dev/vhost-vsockbyexec 3< /dev/vhost-vsock && exec 3<&-, (3) observe that the adb session is not reset.[1] https://android.googlesource.com/device/google/cuttlefish/
Fixes c0cfa2d8a788 ("vsock: add multi-transports support")Signed-off-by Jiyong Park <[email protected]>--- drivers/vhost/vsock.c | 4 ++++ net/vmw_vsock/virtio_transport.c | 7 +++++++ net/vmw_vsock/vmci_transport.c | 5 +++++ 3 files changed, 16 insertions(+)drivers/vhost/vsock.c +4
-0@@ -722,6 +722,10 @@ static void vhost_vsock_reset_orphans(struct sock *sk)* executing. */ +/* Only handle our own sockets */ +if (vsk->transport != &vhost_transport.transport) +return ; +/* If the peer is still valid, no need to reset connection */ if (vhost_vsock_get (vsk->remote_addr.svm_cid))return ;net/vmw_vsock/virtio_transport.c +7
-0@@ -24,6 +24,7 @@static struct workqueue_struct *virtio_vsock_workqueue;static struct virtio_vsock __rcu *the_virtio_vsock;static DEFINE_MUTEX (the_virtio_vsock_mutex);/* protects the_virtio_vsock */ +static struct virtio_transport virtio_transport;/* forward declaration */ struct virtio_vsock {struct virtio_device *vdev;@@ -357,11 +358,17 @@ static void virtio_vsock_event_fill(struct virtio_vsock *vsock)static void virtio_vsock_reset_sock (struct sock *sk) { +struct vsock_sock *vsk =vsock_sk (sk); +/* vmci_transport.c doesn't take sk_lock here either. At least we're * under vsock_table_lock so the sock cannot disappear while we're * executing. */ +/* Only handle our own sockets */ +if (vsk->transport != &virtio_transport.transport) +return ; + sk->sk_state =TCP_CLOSE ; sk->sk_err =ECONNRESET ;sk_error_report (sk);net/vmw_vsock/vmci_transport.c +5
-0@@ -803,6 +803,11 @@ static void vmci_transport_handle_detach(struct sock *sk)struct vsock_sock *vsk; vsk =vsock_sk (sk); + +/* Only handle our own sockets */ +if (vsk->transport != &vmci_transport) +return ; +if (!vmci_handle_is_invalid (vmci_trans (vsk)->qp_handle)) {sock_set_flag (sk,SOCK_DONE );Signature · 1 line
2.35.1.723.g4982287a31-goog
Michael S. Tsirkin
maintainerQuoted 7 lines · Michael S. Tsirkin
This message had
In-Reply-To: <[email protected]> in its header but [email protected] was not sent to the list.
Please don't do that. Instead, please write and send a proper cover letter. Thanks!
Also, pls version in subject e.g. PATCH v2, and include full changelog in the cover letter. Thanks!
Quoted 88 lines · Jiyong Park
Quoted 87 lines
When iterating over sockets using
vsock_for_each_connected_socket, make sure that a transport filters out sockets that don't belong to the transport.There actually was an issue caused by this; in a nested VM configuration, destroying the nested VM (which often involves the closing of
/dev/vhost-vsockif there was h2g connections to the nested VM) kills not only the h2g connections, but also all existing g2h connections to the (outmost) host which are totally unrelated.Tested: Executed the following steps on Cuttlefish (Android running on a VM) [1]: (1) Enter into an
adb shellsession - to have a g2h connection inside the VM, (2) open and then close/dev/vhost-vsockbyexec 3< /dev/vhost-vsock && exec 3<&-, (3) observe that the adb session is not reset.[1] https://android.googlesource.com/device/google/cuttlefish/
Fixes c0cfa2d8a788 ("vsock: add multi-transports support")Signed-off-by Jiyong Park <[email protected]>--- drivers/vhost/vsock.c | 4 ++++ net/vmw_vsock/virtio_transport.c | 7 +++++++ net/vmw_vsock/vmci_transport.c | 5 +++++ 3 files changed, 16 insertions(+)drivers/vhost/vsock.c +4
-0@@ -722,6 +722,10 @@ static void vhost_vsock_reset_orphans(struct sock *sk)* executing. */ +/* Only handle our own sockets */ +if (vsk->transport != &vhost_transport.transport) +return ; +/* If the peer is still valid, no need to reset connection */ if (vhost_vsock_get (vsk->remote_addr.svm_cid))return ;net/vmw_vsock/virtio_transport.c +7
-0@@ -24,6 +24,7 @@static struct workqueue_struct *virtio_vsock_workqueue;static struct virtio_vsock __rcu *the_virtio_vsock;static DEFINE_MUTEX (the_virtio_vsock_mutex);/* protects the_virtio_vsock */ +static struct virtio_transport virtio_transport;/* forward declaration */ struct virtio_vsock {struct virtio_device *vdev;@@ -357,11 +358,17 @@ static void virtio_vsock_event_fill(struct virtio_vsock *vsock)static void virtio_vsock_reset_sock (struct sock *sk) { +struct vsock_sock *vsk =vsock_sk (sk); +/* vmci_transport.c doesn't take sk_lock here either. At least we're * under vsock_table_lock so the sock cannot disappear while we're * executing. */ +/* Only handle our own sockets */ +if (vsk->transport != &virtio_transport.transport) +return ; + sk->sk_state =TCP_CLOSE ; sk->sk_err =ECONNRESET ;sk_error_report (sk);net/vmw_vsock/vmci_transport.c +5
-0@@ -803,6 +803,11 @@ static void vmci_transport_handle_detach(struct sock *sk)struct vsock_sock *vsk; vsk =vsock_sk (sk); + +/* Only handle our own sockets */ +if (vsk->transport != &vmci_transport) +return ; +if (!vmci_handle_is_invalid (vmci_trans (vsk)->qp_handle)) {sock_set_flag (sk,SOCK_DONE );
Quoted 2 lines
Quoted 2 lines
Signature · 1 line
2.35.1.723.g4982287a31-goog
_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
My bad. I mistakenly omitted to and cc for the cover letter. Fixed.
Quoted 105 lines · Michael S. Tsirkin
Quoted 7 lines · Michael S. Tsirkin
This message had
In-Reply-To: <[email protected]> in its header but [email protected] was not sent to the list.
Please don't do that. Instead, please write and send a proper cover letter. Thanks!Also, pls version in subject e.g. PATCH v2, and include full changelog in the cover letter. Thanks!
Quoted 90 lines · Jiyong Park
Quoted 89 lines
When iterating over sockets using
vsock_for_each_connected_socket, make sure that a transport filters out sockets that don't belong to the transport.There actually was an issue caused by this; in a nested VM configuration, destroying the nested VM (which often involves the closing of
/dev/vhost-vsockif there was h2g connections to the nested VM) kills not only the h2g connections, but also all existing g2h connections to the (outmost) host which are totally unrelated.Tested: Executed the following steps on Cuttlefish (Android running on a VM) [1]: (1) Enter into an
adb shellsession - to have a g2h connection inside the VM, (2) open and then close/dev/vhost-vsockbyexec 3< /dev/vhost-vsock && exec 3<&-, (3) observe that the adb session is not reset.[1] https://android.googlesource.com/device/google/cuttlefish/
Fixes c0cfa2d8a788 ("vsock: add multi-transports support")Signed-off-by Jiyong Park <[email protected]>--- drivers/vhost/vsock.c | 4 ++++ net/vmw_vsock/virtio_transport.c | 7 +++++++ net/vmw_vsock/vmci_transport.c | 5 +++++ 3 files changed, 16 insertions(+)drivers/vhost/vsock.c +4
-0@@ -722,6 +722,10 @@ static void vhost_vsock_reset_orphans(struct sock *sk)* executing. */ +/* Only handle our own sockets */ +if (vsk->transport != &vhost_transport.transport) +return ; +/* If the peer is still valid, no need to reset connection */ if (vhost_vsock_get (vsk->remote_addr.svm_cid))return ;net/vmw_vsock/virtio_transport.c +7
-0@@ -24,6 +24,7 @@static struct workqueue_struct *virtio_vsock_workqueue;static struct virtio_vsock __rcu *the_virtio_vsock;static DEFINE_MUTEX (the_virtio_vsock_mutex);/* protects the_virtio_vsock */ +static struct virtio_transport virtio_transport;/* forward declaration */ struct virtio_vsock {struct virtio_device *vdev;@@ -357,11 +358,17 @@ static void virtio_vsock_event_fill(struct virtio_vsock *vsock)static void virtio_vsock_reset_sock (struct sock *sk) { +struct vsock_sock *vsk =vsock_sk (sk); +/* vmci_transport.c doesn't take sk_lock here either. At least we're * under vsock_table_lock so the sock cannot disappear while we're * executing. */ +/* Only handle our own sockets */ +if (vsk->transport != &virtio_transport.transport) +return ; + sk->sk_state =TCP_CLOSE ; sk->sk_err =ECONNRESET ;sk_error_report (sk);net/vmw_vsock/vmci_transport.c +5
-1@@ -803,6 +803,11 @@ static void vmci_transport_handle_detach(struct sock *sk)struct vsock_sock *vsk; vsk =vsock_sk (sk); + +/* Only handle our own sockets */ +if (vsk->transport != &vmci_transport) +return ; +if (!vmci_handle_is_invalid (vmci_trans (vsk)->qp_handle)) {sock_set_flag (sk,SOCK_DONE ); --2.35.1.723.g4982287a31-goog
PATCH 2/2 vsock: refactor vsock_for_each_connected_socket
In reply to a message not in the archivevsock_for_each_connected_socket now cycles over sockets of a specific transport only, rather than asking callers to do the filtering manually, which is error-prone.
--- drivers/vhost/vsock.c | 7 ++----- include/net/af_vsock.h | 3 ++- net/vmw_vsock/af_vsock.c | 9 +++++++-- net/vmw_vsock/virtio_transport.c | 12 ++++-------- net/vmw_vsock/vmci_transport.c | 8 ++------ 5 files changed, 17 insertions(+), 22 deletions(-)
drivers/vhost/vsock.c +2 -5
@@ -722,10 +722,6 @@ static void vhost_vsock_reset_orphans(struct sock *sk)* executing. */ -/* Only handle our own sockets */ -if (vsk->transport != &vhost_transport.transport) -return ; -/* If the peer is still valid, no need to reset connection */ if (vhost_vsock_get (vsk->remote_addr.svm_cid))return ;
@@ -757,7 +753,8 @@ static int vhost_vsock_dev_release(struct inode *inode, struct file *file)/* Iterating over all connections for all CIDs to find orphans is * inefficient. Room for improvement here. */ -vsock_for_each_connected_socket (vhost_vsock_reset_orphans); +vsock_for_each_connected_socket (&vhost_transport.transport, + vhost_vsock_reset_orphans);/* Don't check the owner, because we are in the release path, so we * need to stop the vsock device in any case.
include/net/af_vsock.h +2 -1
@@ -205,7 +205,8 @@ struct sock *vsock_find_bound_socket(struct sockaddr_vm *addr);struct sock *vsock_find_connected_socket (struct sockaddr_vm *src,struct sockaddr_vm *dst);void vsock_remove_sock (struct vsock_sock *vsk); -void vsock_for_each_connected_socket (void (*fn)(struct sock *sk)); +void vsock_for_each_connected_socket (struct vsock_transport *transport, +void (*fn)(struct sock *sk));int vsock_assign_transport (struct vsock_sock *vsk,struct vsock_sock *psk);bool vsock_find_cid (unsigned int cid);
net/vmw_vsock/af_vsock.c +7 -2
@@ -334,7 +334,8 @@ void vsock_remove_sock(struct vsock_sock *vsk) }EXPORT_SYMBOL_GPL (vsock_remove_sock); -void vsock_for_each_connected_socket (void (*fn)(struct sock *sk)) +void vsock_for_each_connected_socket (struct vsock_transport *transport, +void (*fn)(struct sock *sk)) {int i;
@@ -343,8 +344,12 @@ void vsock_for_each_connected_socket(void (*fn)(struct sock *sk))for (i =0 ; i <ARRAY_SIZE (vsock_connected_table); i++) {struct vsock_sock *vsk;list_for_each_entry (vsk, &vsock_connected_table[i], - connected_table) + connected_table) { +if (vsk->transport != transport) +continue ; +fn (sk_vsock (vsk)); + } }spin_unlock_bh (&vsock_table_lock);
net/vmw_vsock/virtio_transport.c +4 -8
@@ -358,17 +358,11 @@ static void virtio_vsock_event_fill(struct virtio_vsock *vsock)static void virtio_vsock_reset_sock (struct sock *sk) { -struct vsock_sock *vsk =vsock_sk (sk); -/* vmci_transport.c doesn't take sk_lock here either. At least we're * under vsock_table_lock so the sock cannot disappear while we're * executing. */ -/* Only handle our own sockets */ -if (vsk->transport != &virtio_transport.transport) -return ; - sk->sk_state =TCP_CLOSE ; sk->sk_err =ECONNRESET ;sk_error_report (sk);
@@ -391,7 +385,8 @@ static void virtio_vsock_event_handle(struct virtio_vsock *vsock,switch (le32_to_cpu (event->id)) {case VIRTIO_VSOCK_EVENT_TRANSPORT_RESET :virtio_vsock_update_guest_cid (vsock); -vsock_for_each_connected_socket (virtio_vsock_reset_sock); +vsock_for_each_connected_socket (&virtio_transport.transport, + virtio_vsock_reset_sock);break ; } }
@@ -669,7 +664,8 @@ static void virtio_vsock_remove(struct virtio_device *vdev)synchronize_rcu ();/* Reset all connected sockets when the device disappear */ -vsock_for_each_connected_socket (virtio_vsock_reset_sock); +vsock_for_each_connected_socket (&virtio_transport.transport, + virtio_vsock_reset_sock);/* Stop all work handlers to make sure no one is accessing the device, * so we can safely call virtio_reset_device().
net/vmw_vsock/vmci_transport.c +2 -6
@@ -803,11 +803,6 @@ static void vmci_transport_handle_detach(struct sock *sk)struct vsock_sock *vsk; vsk =vsock_sk (sk); - -/* Only handle our own sockets */ -if (vsk->transport != &vmci_transport) -return ; -if (!vmci_handle_is_invalid (vmci_trans (vsk)->qp_handle)) {sock_set_flag (sk,SOCK_DONE );
@@ -887,7 +882,8 @@ static void vmci_transport_qp_resumed_cb(u32 sub_id,const struct vmci_event_data *e_data, void *client_data) { - vsock_for_each_connected_socket(vmci_transport_handle_detach); + vsock_for_each_connected_socket(&vmci_transport, +vmci_transport_handle_detach ); }static void vmci_transport_recv_pkt_work (struct work_struct *work)
Signature · 1 line
2.35.1.723.g4982287a31-goog