Commit 2348bb31 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'vsock-virtio-hot-unplug' 



Stefano Garzarella says:

====================
vsock/virtio: fix issues on device hot-unplug

These patches try to handle the hot-unplug of vsock virtio transport device in
a proper way.

Maybe move the vsock_core_init()/vsock_core_exit() functions in the module_init
and module_exit of vsock_virtio_transport module can't be the best way, but the
architecture of vsock_core forces us to this approach for now.

The vsock_core proto_ops expect a valid pointer to the transport device, so we
can't call vsock_core_exit() until there are open sockets.

v2 -> v3:
 - Rebased on master

v1 -> v2:
 - Fixed commit message of patch 1.
 - Added Reviewed-by, Acked-by tags by Stefan
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c14f07c6 85965487

net/vmw_vsock/virtio_transport.c

+21 −8
Original line number Diff line number Diff line
@@ -75,6 +75,9 @@ static u32 virtio_transport_get_local_cid(void) 
{

	struct virtio_vsock *vsock = virtio_vsock_get();



	if (!vsock)

		return VMADDR_CID_ANY;



	return vsock->guest_cid;

}
@@ -584,10 +587,6 @@ static int virtio_vsock_probe(struct virtio_device *vdev) 


	virtio_vsock_update_guest_cid(vsock);



	ret = vsock_core_init(&virtio_transport.transport);

	if (ret < 0)

		goto out_vqs;



	vsock->rx_buf_nr = 0;

	vsock->rx_buf_max_nr = 0;

	atomic_set(&vsock->queued_replies, 0);
@@ -618,8 +617,6 @@ static int virtio_vsock_probe(struct virtio_device *vdev) 
	mutex_unlock(&the_virtio_vsock_mutex);

	return 0;



out_vqs:

	vsock->vdev->config->del_vqs(vsock->vdev);

out:

	kfree(vsock);

	mutex_unlock(&the_virtio_vsock_mutex);
@@ -637,6 +634,9 @@ static void virtio_vsock_remove(struct virtio_device *vdev) 
	flush_work(&vsock->event_work);

	flush_work(&vsock->send_pkt_work);



	/* Reset all connected sockets when the device disappear */

	vsock_for_each_connected_socket(virtio_vsock_reset_sock);



	vdev->config->reset(vdev);



	mutex_lock(&vsock->rx_lock);
@@ -669,7 +669,6 @@ static void virtio_vsock_remove(struct virtio_device *vdev) 


	mutex_lock(&the_virtio_vsock_mutex);

	the_virtio_vsock = NULL;

	vsock_core_exit();

	mutex_unlock(&the_virtio_vsock_mutex);



	vdev->config->del_vqs(vdev);
@@ -702,14 +701,28 @@ static int __init virtio_vsock_init(void) 
	virtio_vsock_workqueue = alloc_workqueue("virtio_vsock", 0, 0);

	if (!virtio_vsock_workqueue)

		return -ENOMEM;



	ret = register_virtio_driver(&virtio_vsock_driver);

	if (ret)

		goto out_wq;



	ret = vsock_core_init(&virtio_transport.transport);

	if (ret)

		goto out_vdr;



	return 0;



out_vdr:

	unregister_virtio_driver(&virtio_vsock_driver);

out_wq:

	destroy_workqueue(virtio_vsock_workqueue);

	return ret;



}



static void __exit virtio_vsock_exit(void)

{

	vsock_core_exit();

	unregister_virtio_driver(&virtio_vsock_driver);

	destroy_workqueue(virtio_vsock_workqueue);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE