From patchwork Mon May 5 01:27:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gavin Shan X-Patchwork-Id: 4111421 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8F1BABFF02 for ; Mon, 5 May 2014 01:29:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B96E520414 for ; Mon, 5 May 2014 01:29:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CA42120254 for ; Mon, 5 May 2014 01:29:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754020AbaEEB17 (ORCPT ); Sun, 4 May 2014 21:27:59 -0400 Received: from e23smtp04.au.ibm.com ([202.81.31.146]:53178 "EHLO e23smtp04.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751695AbaEEB16 (ORCPT ); Sun, 4 May 2014 21:27:58 -0400 Received: from /spool/local by e23smtp04.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 5 May 2014 11:27:56 +1000 Received: from d23dlp03.au.ibm.com (202.81.31.214) by e23smtp04.au.ibm.com (202.81.31.210) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 5 May 2014 11:27:55 +1000 Received: from d23relay05.au.ibm.com (d23relay05.au.ibm.com [9.190.235.152]) by d23dlp03.au.ibm.com (Postfix) with ESMTP id DEAFB3578047; Mon, 5 May 2014 11:27:54 +1000 (EST) Received: from d23av04.au.ibm.com (d23av04.au.ibm.com [9.190.235.139]) by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s4516cjJ1638822; Mon, 5 May 2014 11:06:39 +1000 Received: from d23av04.au.ibm.com (localhost [127.0.0.1]) by d23av04.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s451RrQo011654; Mon, 5 May 2014 11:27:54 +1000 Received: from ozlabs.au.ibm.com (ozlabs.au.ibm.com [9.190.163.12]) by d23av04.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id s451RrjK011642; Mon, 5 May 2014 11:27:53 +1000 Received: from shangw (haven.au.ibm.com [9.190.164.82]) by ozlabs.au.ibm.com (Postfix) with ESMTP id 5D8E6A0117; Mon, 5 May 2014 11:27:53 +1000 (EST) Received: by shangw (Postfix, from userid 1000) id 4D1CF3E0370; Mon, 5 May 2014 11:28:15 +1000 (EST) From: Gavin Shan To: linuxppc-dev@lists.ozlabs.org, kvm@vger.kernel.org, kvm-ppc@vger.kernel.org Cc: alex.williamson@redhat.com, benh@kernel.crashing.org, aik@ozlabs.ru, qiudayu@linux.vnet.ibm.com, Gavin Shan Subject: [PATCH 05/22] powerpc/eeh: Release VFIO dev on VM destruction Date: Mon, 5 May 2014 11:27:54 +1000 Message-Id: <1399253291-3975-6-git-send-email-gwshan@linux.vnet.ibm.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1399253291-3975-1-git-send-email-gwshan@linux.vnet.ibm.com> References: <1399253291-3975-1-git-send-email-gwshan@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14050501-9264-0000-0000-00000601374B Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When the VM is destroyed, the EEH devices and PEs that have been marked as being owned by guest should be returned to host. The patch introduces kvmppc_vfio_pci_free() to do it. Signed-off-by: Gavin Shan --- arch/powerpc/include/asm/eeh.h | 6 +++++- arch/powerpc/kernel/eeh_pe.c | 42 ++++++++++++++++++++++++++++++++++++++++++ arch/powerpc/kvm/book3s_hv.c | 2 ++ 3 files changed, 49 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/include/asm/eeh.h b/arch/powerpc/include/asm/eeh.h index 3807167..677c719 100644 --- a/arch/powerpc/include/asm/eeh.h +++ b/arch/powerpc/include/asm/eeh.h @@ -380,6 +380,8 @@ static inline void eeh_add_sysfs_files(struct pci_bus *bus) { } static inline void eeh_remove_device(struct pci_dev *dev) { } +static inline void kvmppc_eeh_vfio_release(struct kvm *kvm) { } + #define EEH_POSSIBLE_ERROR(val, type) (0) #define EEH_IO_ERROR_VALUE(size) (-1UL) #endif /* CONFIG_EEH */ @@ -388,7 +390,9 @@ static inline void eeh_remove_device(struct pci_dev *dev) { } #ifdef CONFIG_KVM_EEH struct eeh_dev *eeh_vfio_dev_get(struct eeh_vfio_pci_addr *addr); struct eeh_pe *eeh_vfio_pe_get(struct eeh_vfio_pci_addr *addr); - +void kvmppc_eeh_vfio_release(struct kvm *kvm); +#else +static inline void kvmppc_eeh_vfio_release(void *kvm) { }; #endif /* CONFIG_KVM_EEH */ #ifdef CONFIG_PPC64 diff --git a/arch/powerpc/kernel/eeh_pe.c b/arch/powerpc/kernel/eeh_pe.c index 1bd7b1f..9e73188 100644 --- a/arch/powerpc/kernel/eeh_pe.c +++ b/arch/powerpc/kernel/eeh_pe.c @@ -331,6 +331,48 @@ struct eeh_dev *eeh_vfio_dev_get(struct eeh_vfio_pci_addr *addr) return NULL; } + +static void *__kvmppc_eeh_vfio_release(void *data, void *flag) +{ + struct eeh_pe *pe = (struct eeh_pe *)data; + struct kvm *kvm = (struct kvm *)flag; + struct eeh_dev *edev, *tmp; + + if (!eeh_pe_passed(pe)) + return NULL; + + eeh_pe_for_each_dev(pe, edev, tmp) { + if (!eeh_dev_passed(edev)) + continue; + + if (edev->gaddr.kvm == kvm) + eeh_dev_set_passed(edev, false); + } + + eeh_pe_set_passed(pe, false); + + return NULL; +} + +/** + * kvmppc_eeh_vfio_release - Release VFIO devices for the given VM + * @kvm: VM indicator + * + * The function is expected to be called while the VM is destroyed. + * In turn, the PCI devices that have been passed to that VM should + * be released and their address mapping maintained will be destroyed. + */ +void kvmppc_eeh_vfio_release(struct kvm *kvm) +{ + struct eeh_pe *root; + void *ret; + + list_for_each_entry(root, &eeh_phb_pe, child) { + ret = eeh_pe_traverse(root, __kvmppc_eeh_vfio_release, kvm); + if (ret) return; + } +} +EXPORT_SYMBOL_GPL(kvmppc_eeh_vfio_release); #endif /* CONFIG_KVM_EEH */ /** diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c index 8227dba..f07a12d 100644 --- a/arch/powerpc/kvm/book3s_hv.c +++ b/arch/powerpc/kvm/book3s_hv.c @@ -49,6 +49,7 @@ #include #include #include +#include #include #include #include @@ -2344,6 +2345,7 @@ static void kvmppc_core_destroy_vm_hv(struct kvm *kvm) kvm->arch.rma = NULL; } + kvmppc_eeh_vfio_release(kvm); kvmppc_free_hpt(kvm); }