aboutsummaryrefslogtreecommitdiff
path: root/hw/virtio/vhost.c
diff options
context:
space:
mode:
authorAlex Williamson <alex.williamson@redhat.com>2017-09-07 14:27:09 -0600
committerMichael S. Tsirkin <mst@redhat.com>2017-09-08 16:15:17 +0300
commitee4c112846a0f2ac4fe5601918b0a2642ac8e2ed (patch)
tree07a82636a734e5670317749eecc02770b962e38a /hw/virtio/vhost.c
parent74bbfe024da80a50dbe51fbb17f219d2f3e4d2dd (diff)
vhost: Release memory references on cleanup
vhost registers a MemoryListener where it adds and removes references to MemoryRegions as the MemoryRegionSections pass through. The region_add callback is invoked for each existing section when the MemoryListener is registered, but unregistering the MemoryListener performs no reciprocal region_del callback. It's therefore the owner of the MemoryListener's responsibility to cleanup any persistent changes, such as these memory references, after unregistering. The consequence of this bug is that if we have both a vhost device and a vfio device, the vhost device will reference any mmap'd MMIO of the vfio device via this MemoryListener. If the vhost device is then removed, those references remain outstanding. If we then attempt to remove the vfio device, it never gets finalized and the only way to release the kernel file descriptors is to terminate the QEMU process. Fixes: dfde4e6e1a86 ("memory: add ref/unref calls") Cc: Michael S. Tsirkin <mst@redhat.com> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: qemu-stable@nongnu.org # v1.6.0+ Signed-off-by: Alex Williamson <alex.williamson@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'hw/virtio/vhost.c')
-rw-r--r--hw/virtio/vhost.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index 0049a2c0b3..5fd69f0b2e 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -1356,6 +1356,10 @@ void vhost_dev_cleanup(struct vhost_dev *hdev)
if (hdev->mem) {
/* those are only safe after successful init */
memory_listener_unregister(&hdev->memory_listener);
+ for (i = 0; i < hdev->n_mem_sections; ++i) {
+ MemoryRegionSection *section = &hdev->mem_sections[i];
+ memory_region_unref(section->mr);
+ }
QLIST_REMOVE(hdev, entry);
}
if (hdev->migration_blocker) {