tools/virtio: initialize spinlocks in vring_test.c

[ Upstream commit c262f75cb6bb5a63828e72ce3b8fe808e5029479 ]

The virtio_device vqs_list spinlocks must be initialized before use to
prevent functions that manipulate the device virtualqueues, such as
vring_new_virtqueue(), from blocking indefinitely.

Signed-off-by: Ricardo Cañuelo <ricardo.canuelo@collabora.com>
Message-Id: <20221012062949.1526176-1-ricardo.canuelo@collabora.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/tools/virtio/vringh_test.c b/tools/virtio/vringh_test.c
index fa87b58..98ff808 100644 (file)
--- a/tools/virtio/vringh_test.c
+++ b/tools/virtio/vringh_test.c
@@ -308,6 +308,7 @@ static int parallel_test(u64 features,
 
                gvdev.vdev.features = features;
                INIT_LIST_HEAD(&gvdev.vdev.vqs);
+               spin_lock_init(&gvdev.vdev.vqs_list_lock);
                gvdev.to_host_fd = to_host[1];
                gvdev.notifies = 0;
 
@@ -455,6 +456,7 @@ int main(int argc, char *argv[])
        getrange = getrange_iov;
        vdev.features = 0;
        INIT_LIST_HEAD(&vdev.vqs);
+       spin_lock_init(&vdev.vqs_list_lock);
 
        while (argv[1]) {
                if (strcmp(argv[1], "--indirect") == 0)