cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
619821
From f5f0d9ed92f4ba1ea746529ccc945cf60d4973c8 Mon Sep 17 00:00:00 2001
4f5da8
From: Ladi Prosek <lprosek@redhat.com>
4f5da8
Date: Wed, 5 Oct 2016 17:22:28 +0200
4f5da8
Subject: [PATCH 6/8] virtio: zero vq->inuse in virtio_reset()
4f5da8
4f5da8
RH-Author: Ladi Prosek <lprosek@redhat.com>
4f5da8
Message-id: <1475666548-9186-7-git-send-email-lprosek@redhat.com>
4f5da8
Patchwork-id: 72485
4f5da8
O-Subject: [RHEL-7.4 qemu-kvm v2 PATCH 6/6] virtio: zero vq->inuse in virtio_reset()
619821
Bugzilla: 1377968
4f5da8
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
4f5da8
RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>
4f5da8
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
4f5da8
4f5da8
From: Stefan Hajnoczi <stefanha@redhat.com>
4f5da8
4f5da8
vq->inuse must be zeroed upon device reset like most other virtqueue
4f5da8
fields.
4f5da8
4f5da8
In theory, virtio_reset() just needs assert(vq->inuse == 0) since
4f5da8
devices must clean up in-flight requests during reset (requests cannot
4f5da8
not be leaked!).
4f5da8
4f5da8
In practice, it is difficult to achieve vq->inuse == 0 across reset
4f5da8
because balloon, blk, 9p, etc implement various different strategies for
4f5da8
cleaning up requests.  Most devices call g_free(elem) directly without
4f5da8
telling virtio.c that the VirtQueueElement is cleaned up.  Therefore
4f5da8
vq->inuse is not decremented during reset.
4f5da8
4f5da8
This patch zeroes vq->inuse and trusts that devices are not leaking
4f5da8
VirtQueueElements across reset.
4f5da8
4f5da8
I will send a follow-up series that refactors request life-cycle across
4f5da8
all devices and converts vq->inuse = 0 into assert(vq->inuse == 0) but
4f5da8
this more invasive approach is not appropriate for stable trees.
4f5da8
4f5da8
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
4f5da8
Cc: qemu-stable <qemu-stable@nongnu.org>
4f5da8
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
4f5da8
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
4f5da8
Reviewed-by: Ladi Prosek <lprosek@redhat.com>
4f5da8
(cherry picked from commit 4b7f91ed0270a371e1933efa21ba600b6da23ab9)
4f5da8
Signed-off-by: Ladi Prosek <lprosek@redhat.com>
4f5da8
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
4f5da8
---
4f5da8
 hw/virtio/virtio.c | 1 +
4f5da8
 1 file changed, 1 insertion(+)
4f5da8
4f5da8
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
4f5da8
index 87a7639..cdb21b1 100644
4f5da8
--- a/hw/virtio/virtio.c
4f5da8
+++ b/hw/virtio/virtio.c
4f5da8
@@ -585,6 +585,7 @@ void virtio_reset(void *opaque)
4f5da8
         vdev->vq[i].signalled_used = 0;
4f5da8
         vdev->vq[i].signalled_used_valid = false;
4f5da8
         vdev->vq[i].notification = true;
4f5da8
+        vdev->vq[i].inuse = 0;
4f5da8
     }
4f5da8
 }
4f5da8
 
4f5da8
-- 
4f5da8
1.8.3.1
4f5da8