Commit a8168788 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'vsock-virtio-enable-vqs-early-on-probe-and-finish-the-setup-before-using-them' 

Stefano Garzarella says:

====================
vsock/virtio: enable VQs early on probe and finish the setup before using them

The first patch fixes a virtio-spec violation. The other two patches
complete the driver configuration before using the VQs in the probe.

The patch order should simplify backporting in stable branches.

v2: https://lore.kernel.org/netdev/20220323084954.11769-1-sgarzare@redhat.com/
v1: https://lore.kernel.org/netdev/20220322103823.83411-1-sgarzare@redhat.com/
====================

Link: https://lore.kernel.org/r/20220323173625.91119-1-sgarzare@redhat.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 9fe087dd 88704454

net/vmw_vsock/virtio_transport.c

+7 −4
Original line number Diff line number Diff line
@@ -622,6 +622,13 @@ static int virtio_vsock_probe(struct virtio_device *vdev) 
	INIT_WORK(&vsock->event_work, virtio_transport_event_work);

	INIT_WORK(&vsock->send_pkt_work, virtio_transport_send_pkt_work);



	if (virtio_has_feature(vdev, VIRTIO_VSOCK_F_SEQPACKET))

		vsock->seqpacket_allow = true;



	vdev->priv = vsock;



	virtio_device_ready(vdev);



	mutex_lock(&vsock->tx_lock);

	vsock->tx_run = true;

	mutex_unlock(&vsock->tx_lock);
@@ -636,10 +643,6 @@ static int virtio_vsock_probe(struct virtio_device *vdev) 
	vsock->event_run = true;

	mutex_unlock(&vsock->event_lock);



	if (virtio_has_feature(vdev, VIRTIO_VSOCK_F_SEQPACKET))

		vsock->seqpacket_allow = true;



	vdev->priv = vsock;

	rcu_assign_pointer(the_virtio_vsock, vsock);



	mutex_unlock(&the_virtio_vsock_mutex);