|
 |
9ae3a8 |
From 6ca164c42aa26e2273871061aa509cc50bd0dc4c Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Alex Williamson <alex.williamson@redhat.com>
|
|
|
9ae3a8 |
Date: Wed, 22 Jan 2014 21:33:06 -0500
|
|
|
9ae3a8 |
Subject: [PATCH 2/6] vfio: Destroy memory regions
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Message-id: <20140122213238.6166.63139.stgit@bling.home>
|
|
|
9ae3a8 |
Patchwork-id: 56902
|
|
|
9ae3a8 |
O-Subject: [RHEL-7 qemu-kvm PATCH 1/1] vfio: Destroy memory regions
|
|
|
9ae3a8 |
Bugzilla: 1052030
|
|
|
9ae3a8 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Bandan Das <bsd@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Bugzilla: 1052030
|
|
|
9ae3a8 |
Upstream: 7c4228b4771acddcb8815079bc116007cec8a1ff (tag from pull request)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Somehow this has been lurking for a while; we remove our subregions
|
|
|
9ae3a8 |
from the base BAR and VGA region mappings, but we don't destroy them,
|
|
|
9ae3a8 |
creating a leak and more serious problems when we try to migrate after
|
|
|
9ae3a8 |
removing these devices. Add the trivial bit of final cleanup to
|
|
|
9ae3a8 |
remove these entirely.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
hw/misc/vfio.c | 4 ++++
|
|
|
9ae3a8 |
1 file changed, 4 insertions(+)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
hw/misc/vfio.c | 4 ++++
|
|
|
9ae3a8 |
1 file changed, 4 insertions(+)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/hw/misc/vfio.c b/hw/misc/vfio.c
|
|
|
9ae3a8 |
index 83f2b6a..e1f30a2 100644
|
|
|
9ae3a8 |
--- a/hw/misc/vfio.c
|
|
|
9ae3a8 |
+++ b/hw/misc/vfio.c
|
|
|
9ae3a8 |
@@ -1928,6 +1928,7 @@ static void vfio_vga_quirk_teardown(VFIODevice *vdev)
|
|
|
9ae3a8 |
while (!QLIST_EMPTY(&vdev->vga.region[i].quirks)) {
|
|
|
9ae3a8 |
VFIOQuirk *quirk = QLIST_FIRST(&vdev->vga.region[i].quirks);
|
|
|
9ae3a8 |
memory_region_del_subregion(&vdev->vga.region[i].mem, &quirk->mem);
|
|
|
9ae3a8 |
+ memory_region_destroy(&quirk->mem);
|
|
|
9ae3a8 |
QLIST_REMOVE(quirk, next);
|
|
|
9ae3a8 |
g_free(quirk);
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
@@ -1950,6 +1951,7 @@ static void vfio_bar_quirk_teardown(VFIODevice *vdev, int nr)
|
|
|
9ae3a8 |
while (!QLIST_EMPTY(&bar->quirks)) {
|
|
|
9ae3a8 |
VFIOQuirk *quirk = QLIST_FIRST(&bar->quirks);
|
|
|
9ae3a8 |
memory_region_del_subregion(&bar->mem, &quirk->mem);
|
|
|
9ae3a8 |
+ memory_region_destroy(&quirk->mem);
|
|
|
9ae3a8 |
QLIST_REMOVE(quirk, next);
|
|
|
9ae3a8 |
g_free(quirk);
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
@@ -2379,10 +2381,12 @@ static void vfio_unmap_bar(VFIODevice *vdev, int nr)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
memory_region_del_subregion(&bar->mem, &bar->mmap_mem);
|
|
|
9ae3a8 |
munmap(bar->mmap, memory_region_size(&bar->mmap_mem));
|
|
|
9ae3a8 |
+ memory_region_destroy(&bar->mmap_mem);
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
if (vdev->msix && vdev->msix->table_bar == nr) {
|
|
|
9ae3a8 |
memory_region_del_subregion(&bar->mem, &vdev->msix->mmap_mem);
|
|
|
9ae3a8 |
munmap(vdev->msix->mmap, memory_region_size(&vdev->msix->mmap_mem));
|
|
|
9ae3a8 |
+ memory_region_destroy(&vdev->msix->mmap_mem);
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
memory_region_destroy(&bar->mem);
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.8.3.1
|
|
|
9ae3a8 |
|