From patchwork Fri Jun 12 16:58:03 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Han, Weidong" X-Patchwork-Id: 29726 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n5C8w9GI014127 for ; Fri, 12 Jun 2009 08:58:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756553AbZFLI6E (ORCPT ); Fri, 12 Jun 2009 04:58:04 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756391AbZFLI6D (ORCPT ); Fri, 12 Jun 2009 04:58:03 -0400 Received: from mga09.intel.com ([134.134.136.24]:22484 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755935AbZFLI6C (ORCPT ); Fri, 12 Jun 2009 04:58:02 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 12 Jun 2009 01:46:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.42,208,1243839600"; d="scan'208";a="523871243" Received: from unknown (HELO localhost.localdomain) ([10.239.13.58]) by orsmga001.jf.intel.com with ESMTP; 12 Jun 2009 01:57:56 -0700 From: Weidong Han To: avi@redhat.com Cc: kvm@vger.kernel.org, Weidong Han Subject: [PATCH] qemu: fix free assigned device Date: Sat, 13 Jun 2009 00:58:03 +0800 Message-Id: <1244825883-13151-1-git-send-email-weidong.han@intel.com> X-Mailer: git-send-email 1.6.0.4 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org In free_assigned_device, kvm_remove_ioperm_data won't be called, because the check skips type IORESOURCE_IO. For IORESOURCE_MEM, it should destroy the registered memory, otherwise it may be failed to create new memory slot because it is already there. hot add and hot remove a device several times can trigger this failure. This patch fixes the above issues. Signed-off-by: Weidong Han --- hw/device-assignment.c | 29 ++++++++++++++++++----------- 1 files changed, 18 insertions(+), 11 deletions(-) diff --git a/hw/device-assignment.c b/hw/device-assignment.c index 65920d0..357a946 100644 --- a/hw/device-assignment.c +++ b/hw/device-assignment.c @@ -561,19 +561,26 @@ static void free_assigned_device(AssignedDevInfo *adev) PCIRegion *pci_region = &dev->real_device.regions[i]; AssignedDevRegion *region = &dev->v_addrs[i]; - if (!pci_region->valid || !(pci_region->type & IORESOURCE_MEM)) + if (!pci_region->valid) continue; - kvm_remove_ioperm_data(region->u.r_baseport, region->r_size); - - if (region->u.r_virtbase) { - int ret = munmap(region->u.r_virtbase, - (pci_region->size + 0xFFF) & 0xFFFFF000); - if (ret != 0) - fprintf(stderr, - "Failed to unmap assigned device region: %s\n", - strerror(errno)); - } + if (pci_region->type & IORESOURCE_IO) { + kvm_remove_ioperm_data(region->u.r_baseport, region->r_size); + continue; + } else if (pci_region->type & IORESOURCE_MEM) { + if (region->e_size > 0) + kvm_destroy_phys_mem(kvm_context, region->e_physbase, + TARGET_PAGE_ALIGN(region->e_size)); + + if (region->u.r_virtbase) { + int ret = munmap(region->u.r_virtbase, + (pci_region->size + 0xFFF) & 0xFFFFF000); + if (ret != 0) + fprintf(stderr, + "Failed to unmap assigned device region: %s\n", + strerror(errno)); + } + } } if (dev->real_device.config_fd) {