]> xenbits.xensource.com Git - people/aperard/linux.git/commitdiff
vdpa_sim: reset must not run
authorSteve Sistare <steven.sistare@oracle.com>
Fri, 9 Feb 2024 22:30:07 +0000 (14:30 -0800)
committerSasha Levin <sashal@kernel.org>
Tue, 26 Mar 2024 22:21:00 +0000 (18:21 -0400)
[ Upstream commit 9588e7fc511f9c55b9835f14916e90ab940061b7 ]

vdpasim_do_reset sets running to true, which is wrong, as it allows
vdpasim_kick_vq to post work requests before the device has been
configured.  To fix, do not set running until VIRTIO_CONFIG_S_DRIVER_OK
is set.

Fixes: 0c89e2a3a9d0 ("vdpa_sim: Implement suspend vdpa op")
Signed-off-by: Steve Sistare <steven.sistare@oracle.com>
Reviewed-by: Eugenio Pérez <eperezma@redhat.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Message-Id: <1707517807-137331-1-git-send-email-steven.sistare@oracle.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/vdpa/vdpa_sim/vdpa_sim.c

index 61bde476cf9c8e4ee440e2c954fd1dd5859bab7d..e7fc25bfdd2375f507e5ebbb9e9ed21b31a16b44 100644 (file)
@@ -120,7 +120,7 @@ static void vdpasim_do_reset(struct vdpasim *vdpasim)
        for (i = 0; i < vdpasim->dev_attr.nas; i++)
                vhost_iotlb_reset(&vdpasim->iommu[i]);
 
-       vdpasim->running = true;
+       vdpasim->running = false;
        spin_unlock(&vdpasim->iommu_lock);
 
        vdpasim->features = 0;
@@ -513,6 +513,7 @@ static void vdpasim_set_status(struct vdpa_device *vdpa, u8 status)
 
        spin_lock(&vdpasim->lock);
        vdpasim->status = status;
+       vdpasim->running = (status & VIRTIO_CONFIG_S_DRIVER_OK) != 0;
        spin_unlock(&vdpasim->lock);
 }