From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8AAC3C433EF for ; Tue, 19 Oct 2021 10:41:49 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5862D610E7 for ; Tue, 19 Oct 2021 10:41:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 5862D610E7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.212956.371048 (Exim 4.92) (envelope-from ) id 1mcmYv-00011w-OA; Tue, 19 Oct 2021 10:41:41 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 212956.371048; Tue, 19 Oct 2021 10:41:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mcmYv-00011m-Im; Tue, 19 Oct 2021 10:41:41 +0000 Received: by outflank-mailman (input) for mailman id 212956; Tue, 19 Oct 2021 10:41:39 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mcmYt-0008TS-ND for xen-devel@lists.xenproject.org; Tue, 19 Oct 2021 10:41:39 +0000 Received: from foss.arm.com (unknown [217.140.110.172]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTP id 200a4a94-30c9-11ec-830c-12813bfff9fa; Tue, 19 Oct 2021 10:41:32 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 65923D6E; Tue, 19 Oct 2021 03:41:32 -0700 (PDT) Received: from e109506.cambridge.arm.com (e109506.cambridge.arm.com [10.1.199.62]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id C80463F70D; Tue, 19 Oct 2021 03:41:30 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 200a4a94-30c9-11ec-830c-12813bfff9fa From: Bertrand Marquis To: xen-devel@lists.xenproject.org Cc: iwj@xenproject.org, sstabellini@kernel.org, Oleksandr_Andrushchenko@epam.com, jbeulich@suse.com, Paul Durrant , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Subject: [PATCH 3/3] xen/pci: Add missing vpci handler cleanup Date: Tue, 19 Oct 2021 11:40:35 +0100 Message-Id: <77e42e006ec7824e9d531cf488f746c2d7545f08.1634639117.git.bertrand.marquis@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Add missing vpci handlers cleanup during pci_device_remove and in case of error with iommu during pci_device_add. Add empty static inline for vpci_remove_device when CONFIG_VPCI is not defined. Fixes: d59168dc05 ("xen/arm: Enable the existing x86 virtual PCI support for ARM") Signed-off-by: Bertrand Marquis --- xen/drivers/passthrough/pci.c | 2 ++ xen/include/xen/vpci.h | 2 ++ 2 files changed, 4 insertions(+) diff --git a/xen/drivers/passthrough/pci.c b/xen/drivers/passthrough/pci.c index d7e09448d1..ddf08a3fae 100644 --- a/xen/drivers/passthrough/pci.c +++ b/xen/drivers/passthrough/pci.c @@ -766,6 +766,7 @@ int pci_add_device(u16 seg, u8 bus, u8 devfn, ret = iommu_add_device(pdev); if ( ret ) { + vpci_remove_device(pdev); pdev->domain = NULL; goto out; } @@ -813,6 +814,7 @@ int pci_remove_device(u16 seg, u8 bus, u8 devfn) list_for_each_entry ( pdev, &pseg->alldevs_list, alldevs_list ) if ( pdev->bus == bus && pdev->devfn == devfn ) { + vpci_remove_device(pdev); pci_cleanup_msi(pdev); ret = iommu_remove_device(pdev); if ( pdev->domain ) diff --git a/xen/include/xen/vpci.h b/xen/include/xen/vpci.h index 6746c2589a..9ea66e033f 100644 --- a/xen/include/xen/vpci.h +++ b/xen/include/xen/vpci.h @@ -230,6 +230,8 @@ static inline int vpci_add_handlers(struct pci_dev *pdev) return 0; } +static inline void vpci_remove_device(struct pci_dev *pdev) { } + static inline void vpci_dump_msi(void) { } static inline uint32_t vpci_read(pci_sbdf_t sbdf, unsigned int reg, -- 2.25.1