]> git.ipfire.org Git - thirdparty/kernel/stable.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:20:10 +0000 (18:20 -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 76d41058add9a8a5f45edb405ed822efba6de67f..421ab01ef06ba50038b486d6bda6379d53abd4c1 100644 (file)
@@ -158,7 +158,7 @@ static void vdpasim_do_reset(struct vdpasim *vdpasim)
                vdpasim->iommu_pt[i] = true;
        }
 
-       vdpasim->running = true;
+       vdpasim->running = false;
        spin_unlock(&vdpasim->iommu_lock);
 
        vdpasim->features = 0;
@@ -477,6 +477,7 @@ static void vdpasim_set_status(struct vdpa_device *vdpa, u8 status)
 
        mutex_lock(&vdpasim->mutex);
        vdpasim->status = status;
+       vdpasim->running = (status & VIRTIO_CONFIG_S_DRIVER_OK) != 0;
        mutex_unlock(&vdpasim->mutex);
 }