From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52959) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGpoF-0006me-P2 for qemu-devel@nongnu.org; Tue, 03 Sep 2013 08:34:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VGpo7-0006R9-9B for qemu-devel@nongnu.org; Tue, 03 Sep 2013 08:34:15 -0400 Received: from mail-ee0-x22b.google.com ([2a00:1450:4013:c00::22b]:43806) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VGpo6-0006Qm-PT for qemu-devel@nongnu.org; Tue, 03 Sep 2013 08:34:06 -0400 Received: by mail-ee0-f43.google.com with SMTP id e52so2966967eek.16 for ; Tue, 03 Sep 2013 05:34:06 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 3 Sep 2013 14:33:07 +0200 Message-Id: <1378211609-16121-17-git-send-email-pbonzini@redhat.com> In-Reply-To: <1378211609-16121-1-git-send-email-pbonzini@redhat.com> References: <1378211609-16121-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 16/38] vfio: reclaim memory in instance_finalize instead of exit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mst@redhat.com This requires splitting vfio_teardown_msi, vfio_unmap_bar and vfio_unmap_bars in two. Signed-off-by: Paolo Bonzini --- hw/misc/vfio.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 47 insertions(+), 4 deletions(-) diff --git a/hw/misc/vfio.c b/hw/misc/vfio.c index 1311d0e..b463df5 100644 --- a/hw/misc/vfio.c +++ b/hw/misc/vfio.c @@ -2144,6 +2144,12 @@ static void vfio_teardown_msi(VFIODevice *vdev) if (vdev->msix) { msix_uninit(&vdev->pdev, &vdev->bars[vdev->msix->table_bar].mem, &vdev->bars[vdev->msix->pba_bar].mem); + } +} + +static void vfio_destroy_msi(VFIODevice *vdev) +{ + if (vdev->msix) { msix_free(&vdev->pdev); } } @@ -2180,10 +2186,23 @@ static void vfio_unmap_bar(VFIODevice *vdev, int nr) vfio_bar_quirk_teardown(vdev, nr); memory_region_del_subregion(&bar->mem, &bar->mmap_mem); - munmap(bar->mmap, memory_region_size(&bar->mmap_mem)); if (vdev->msix && vdev->msix->table_bar == nr) { memory_region_del_subregion(&bar->mem, &vdev->msix->mmap_mem); + } +} + +static void vfio_destroy_bar(VFIODevice *vdev, int nr) +{ + VFIOBAR *bar = &vdev->bars[nr]; + + if (!bar->size) { + return; + } + + munmap(bar->mmap, memory_region_size(&bar->mmap_mem)); + + if (vdev->msix && vdev->msix->table_bar == nr) { munmap(vdev->msix->mmap, memory_region_size(&vdev->msix->mmap_mem)); } @@ -2340,6 +2359,18 @@ static void vfio_unmap_bars(VFIODevice *vdev) if (vdev->has_vga) { vfio_vga_quirk_teardown(vdev); pci_unregister_vga(&vdev->pdev); + } +} + +static void vfio_destroy_bars(VFIODevice *vdev) +{ + int i; + + for (i = 0; i < PCI_ROM_SLOT; i++) { + vfio_destroy_bar(vdev, i); + } + + if (vdev->has_vga) { memory_region_destroy(&vdev->vga.region[QEMU_PCI_VGA_MEM].mem); memory_region_destroy(&vdev->vga.region[QEMU_PCI_VGA_IO_LO].mem); memory_region_destroy(&vdev->vga.region[QEMU_PCI_VGA_IO_HI].mem); @@ -3194,7 +3225,9 @@ static int vfio_initfn(PCIDevice *pdev) out_teardown: pci_device_set_intx_routing_notifier(&vdev->pdev, NULL); vfio_teardown_msi(vdev); + vfio_destroy_msi(vdev); vfio_unmap_bars(vdev); + vfio_destroy_bars(vdev); out_put: g_free(vdev->emulated_config_bits); vfio_put_device(vdev); @@ -3205,16 +3238,25 @@ out_put: static void vfio_exitfn(PCIDevice *pdev) { VFIODevice *vdev = DO_UPCAST(VFIODevice, pdev, pdev); - VFIOGroup *group = vdev->group; vfio_unregister_err_notifier(vdev); pci_device_set_intx_routing_notifier(&vdev->pdev, NULL); vfio_disable_interrupts(vdev); + vfio_teardown_msi(vdev); + vfio_unmap_bars(vdev); +} + +static void vfio_instance_finalize(Object *obj) +{ + PCIDevice *pdev = PCI_DEVICE(obj); + VFIODevice *vdev = DO_UPCAST(VFIODevice, pdev, pdev); + VFIOGroup *group = vdev->group; + if (vdev->intx.mmap_timer) { timer_free(vdev->intx.mmap_timer); } - vfio_teardown_msi(vdev); - vfio_unmap_bars(vdev); + vfio_destroy_msi(vdev); + vfio_destroy_bars(vdev); g_free(vdev->emulated_config_bits); vfio_put_device(vdev); vfio_put_group(group); @@ -3313,6 +3355,7 @@ static const TypeInfo vfio_pci_dev_info = { .parent = TYPE_PCI_DEVICE, .instance_size = sizeof(VFIODevice), .class_init = vfio_pci_dev_class_init, + .instance_finalize = vfio_instance_finalize, }; static void register_vfio_pci_dev_type(void) -- 1.8.3.1