vsock/virtio: read the negotiated features before using VQs

BugLink: https://bugs.launchpad.net/bugs/1969110
[ Upstream commit c1011c0b3a9c8d2065f425407475cbcc812540b7 ]

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

Fixes: 53efbba12cc7 ("virtio/vsock: enable SEQPACKET for transport")
Suggested-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
(cherry picked from commit b64bf5464ad56be06c4d6042be2284116db0ac48)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

diff --git a/net/vmw_vsock/virtio_transport.c b/net/vmw_vsock/virtio_transport.c
index fb1b8f99f67998dda360454678b99a021e3c3806..4a8548bdf86cb79e828f4072cec4b63763aeb54f 100644 (file)
--- a/net/vmw_vsock/virtio_transport.c
+++ b/net/vmw_vsock/virtio_transport.c
@@ -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);