From patchwork Fri Apr 15 19:54:39 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Williamson X-Patchwork-Id: 711421 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p3FJskec032227 for ; Fri, 15 Apr 2011 19:54:46 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753546Ab1DOTyn (ORCPT ); Fri, 15 Apr 2011 15:54:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45947 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751910Ab1DOTym (ORCPT ); Fri, 15 Apr 2011 15:54:42 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p3FJsefh013371 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 15 Apr 2011 15:54:40 -0400 Received: from s20.home (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p3FJsdH8005828; Fri, 15 Apr 2011 15:54:39 -0400 From: Alex Williamson Subject: [PATCH 2/2] KVM: Use pci_store/load_saved_state() around VM device usage To: linux-pci@vger.kernel.org, kvm@vger.kernel.org Cc: alex.williamson@redhat.com, jan.kiszka@siemens.com, avi@redhat.com, jbarnes@virtuousgeek.org Date: Fri, 15 Apr 2011 13:54:39 -0600 Message-ID: <20110415195439.2838.58928.stgit@s20.home> In-Reply-To: <20110415194220.2838.10750.stgit@s20.home> References: <20110415194220.2838.10750.stgit@s20.home> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 15 Apr 2011 19:54:46 +0000 (UTC) Store the device saved state so that we can reload the device back to the original state when it's unassigned. This has the benefit that the state survives across pci_reset_function() calls via the PCI sysfs reset interface while the VM is using the device. Signed-off-by: Alex Williamson --- include/linux/kvm_host.h | 1 + virt/kvm/assigned-dev.c | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index ab42855..d8a1d18 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -513,6 +513,7 @@ struct kvm_assigned_dev_kernel { struct kvm *kvm; spinlock_t intx_lock; char irq_name[32]; + void *pci_saved_state; }; struct kvm_irq_mask_notifier { diff --git a/virt/kvm/assigned-dev.c b/virt/kvm/assigned-dev.c index ae72ae6..66c6ccd 100644 --- a/virt/kvm/assigned-dev.c +++ b/virt/kvm/assigned-dev.c @@ -197,7 +197,9 @@ static void kvm_free_assigned_device(struct kvm *kvm, { kvm_free_assigned_irq(kvm, assigned_dev); - __pci_reset_function(assigned_dev->dev); + pci_reset_function(assigned_dev->dev); + pci_load_and_free_saved_state(assigned_dev->dev, + &assigned_dev->pci_saved_state); pci_restore_state(assigned_dev->dev); pci_release_regions(assigned_dev->dev); @@ -516,7 +518,7 @@ static int kvm_vm_ioctl_assign_device(struct kvm *kvm, pci_reset_function(dev); pci_save_state(dev); - + match->pci_saved_state = pci_store_saved_state(dev); match->assigned_dev_id = assigned_dev->assigned_dev_id; match->host_segnr = assigned_dev->segnr; match->host_busnr = assigned_dev->busnr; @@ -546,7 +548,7 @@ out: mutex_unlock(&kvm->lock); return r; out_list_del: - pci_restore_state(dev); + pci_load_and_free_saved_state(dev, &match->pci_saved_state); list_del(&match->list); pci_release_regions(dev); out_disable: