vsock/virtio: initialize the_virtio_vsock before using VQs

[platform/kernel/linux-starfive.git] / net / vmw_vsock / virtio_transport.c

diff --git a/net/vmw_vsock/virtio_transport.c b/net/vmw_vsock/virtio_transport.c
index e95df84..b80bf68 100644 (file)
--- a/net/vmw_vsock/virtio_transport.c
+++ b/net/vmw_vsock/virtio_transport.c
@@ -555,6 +555,11 @@ static int virtio_vsock_vqs_init(struct virtio_vsock *vsock)
 
        virtio_device_ready(vdev);
 
+       return 0;
+}
+
+static void virtio_vsock_vqs_start(struct virtio_vsock *vsock)
+{
        mutex_lock(&vsock->tx_lock);
        vsock->tx_run = true;
        mutex_unlock(&vsock->tx_lock);
@@ -569,7 +574,16 @@ static int virtio_vsock_vqs_init(struct virtio_vsock *vsock)
        vsock->event_run = true;
        mutex_unlock(&vsock->event_lock);
 
-       return 0;
+       /* virtio_transport_send_pkt() can queue packets once
+        * the_virtio_vsock is set, but they won't be processed until
+        * vsock->tx_run is set to true. We queue vsock->send_pkt_work
+        * when initialization finishes to send those packets queued
+        * earlier.
+        * We don't need to queue the other workers (rx, event) because
+        * as long as we don't fill the queues with empty buffers, the
+        * host can't send us any notification.
+        */
+       queue_work(virtio_vsock_workqueue, &vsock->send_pkt_work);
 }
 
 static void virtio_vsock_vqs_del(struct virtio_vsock *vsock)
@@ -664,6 +678,7 @@ static int virtio_vsock_probe(struct virtio_device *vdev)
                goto out;
 
        rcu_assign_pointer(the_virtio_vsock, vsock);
+       virtio_vsock_vqs_start(vsock);
 
        mutex_unlock(&the_virtio_vsock_mutex);
 
@@ -736,6 +751,7 @@ static int virtio_vsock_restore(struct virtio_device *vdev)
                goto out;
 
        rcu_assign_pointer(the_virtio_vsock, vsock);
+       virtio_vsock_vqs_start(vsock);
 
 out:
        mutex_unlock(&the_virtio_vsock_mutex);