Commit c1011c0b authored by Stefano Garzarella's avatar Stefano Garzarella Committed by Jakub Kicinski
Browse files

vsock/virtio: read the negotiated features before using VQs 



Complete the driver configuration, reading the negotiated features,
before using the VQs in the virtio_vsock_probe().

Fixes: 53efbba1 ("virtio/vsock: enable SEQPACKET for transport")
Suggested-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarStefano Garzarella <sgarzare@redhat.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 4b5f1ad5

net/vmw_vsock/virtio_transport.c

+3 −3
Original line number Diff line number Diff line
@@ -622,6 +622,9 @@ 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;



	mutex_lock(&vsock->tx_lock);
@@ -638,9 +641,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;



	rcu_assign_pointer(the_virtio_vsock, vsock);



	mutex_unlock(&the_virtio_vsock_mutex);