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 X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,NICE_REPLY_A,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 320A8C433E3 for ; Mon, 24 Aug 2020 05:09:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1282C20706 for ; Mon, 24 Aug 2020 05:09:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727858AbgHXFJi (ORCPT ); Mon, 24 Aug 2020 01:09:38 -0400 Received: from mx2.suse.de ([195.135.220.15]:44020 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725817AbgHXFJi (ORCPT ); Mon, 24 Aug 2020 01:09:38 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 36A65AD71; Mon, 24 Aug 2020 05:10:06 +0000 (UTC) Subject: Re: [patch RFC 23/38] x86/xen: Rework MSI teardown To: Thomas Gleixner , LKML Cc: x86@kernel.org, Joerg Roedel , iommu@lists.linux-foundation.org, linux-hyperv@vger.kernel.org, Haiyang Zhang , Jon Derrick , Lu Baolu , Wei Liu , "K. Y. Srinivasan" , Stephen Hemminger , Steve Wahl , Dimitri Sivanich , Russ Anderson , linux-pci@vger.kernel.org, Bjorn Helgaas , Lorenzo Pieralisi , Konrad Rzeszutek Wilk , xen-devel@lists.xenproject.org, Boris Ostrovsky , Stefano Stabellini , Marc Zyngier , Greg Kroah-Hartman , "Rafael J. Wysocki" , Megha Dey , Jason Gunthorpe , Dave Jiang , Alex Williamson , Jacob Pan , Baolu Lu , Kevin Tian , Dan Williams References: <20200821002424.119492231@linutronix.de> <20200821002947.575838946@linutronix.de> From: =?UTF-8?B?SsO8cmdlbiBHcm/Dnw==?= Message-ID: Date: Mon, 24 Aug 2020 07:09:35 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.11.0 MIME-Version: 1.0 In-Reply-To: <20200821002947.575838946@linutronix.de> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 21.08.20 02:24, Thomas Gleixner wrote: > X86 cannot store the irq domain pointer in struct device without breaking > XEN because the irq domain pointer takes precedence over arch_*_msi_irqs() > fallbacks. > > XENs MSI teardown relies on default_teardown_msi_irqs() which invokes > arch_teardown_msi_irq(). default_teardown_msi_irqs() is a trivial iterator > over the msi entries associated to a device. > > Implement this loop in xen_teardown_msi_irqs() to prepare for removal of > the fallbacks for X86. > > This is a preparatory step to wrap XEN MSI alloc/free into a irq domain > which in turn allows to store the irq domain pointer in struct device and > to use the irq domain functions directly. > > Signed-off-by: Thomas Gleixner > --- > arch/x86/pci/xen.c | 23 ++++++++++++++++++----- > 1 file changed, 18 insertions(+), 5 deletions(-) > > --- a/arch/x86/pci/xen.c > +++ b/arch/x86/pci/xen.c > @@ -376,20 +376,31 @@ static void xen_initdom_restore_msi_irqs > static void xen_teardown_msi_irqs(struct pci_dev *dev) > { > struct msi_desc *msidesc; > + int i; > + > + for_each_pci_msi_entry(msidesc, dev) { > + if (msidesc->irq) { > + for (i = 0; i < msidesc->nvec_used; i++) > + xen_destroy_irq(msidesc->irq + i); > + } > + } > +} > + > +static void xen_pv_teardown_msi_irqs(struct pci_dev *dev) > +{ > + struct msi_desc *msidesc = first_pci_msi_entry(dev); > > - msidesc = first_pci_msi_entry(dev); > if (msidesc->msi_attrib.is_msix) > xen_pci_frontend_disable_msix(dev); > else > xen_pci_frontend_disable_msi(dev); > > - /* Free the IRQ's and the msidesc using the generic code. */ > - default_teardown_msi_irqs(dev); > + xen_teardown_msi_irqs(dev); > } > > static void xen_teardown_msi_irq(unsigned int irq) > { > - xen_destroy_irq(irq); > + WARN_ON_ONCE(1); > } > > #endif > @@ -412,7 +423,7 @@ int __init pci_xen_init(void) > #ifdef CONFIG_PCI_MSI > x86_msi.setup_msi_irqs = xen_setup_msi_irqs; > x86_msi.teardown_msi_irq = xen_teardown_msi_irq; > - x86_msi.teardown_msi_irqs = xen_teardown_msi_irqs; > + x86_msi.teardown_msi_irqs = xen_pv_teardown_msi_irqs; > pci_msi_ignore_mask = 1; > #endif > return 0; > @@ -436,6 +447,7 @@ static void __init xen_hvm_msi_init(void > } > > x86_msi.setup_msi_irqs = xen_hvm_setup_msi_irqs; > + x86_msi.teardown_msi_irqs = xen_teardown_msi_irqs; > x86_msi.teardown_msi_irq = xen_teardown_msi_irq; > } > #endif > @@ -472,6 +484,7 @@ int __init pci_xen_initial_domain(void) > #ifdef CONFIG_PCI_MSI > x86_msi.setup_msi_irqs = xen_initdom_setup_msi_irqs; > x86_msi.teardown_msi_irq = xen_teardown_msi_irq; > + x86_msi.teardown_msi_irqs = xen_teardown_msi_irqs; This should be xen_pv_teardown_msi_irqs, as pci_xen_initial_domain() is called only for the pv initial domain case today. > x86_msi.restore_msi_irqs = xen_initdom_restore_msi_irqs; > pci_msi_ignore_mask = 1; > #endif > Juergen 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 X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,NICE_REPLY_A,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CFF30C433E1 for ; Mon, 24 Aug 2020 05:09:43 +0000 (UTC) Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (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 A14B920706 for ; Mon, 24 Aug 2020 05:09:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A14B920706 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=iommu-bounces@lists.linux-foundation.org Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 67EB52011A; Mon, 24 Aug 2020 05:09:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2bJpjH59NrYn; Mon, 24 Aug 2020 05:09:41 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by silver.osuosl.org (Postfix) with ESMTP id 25D5A2045C; Mon, 24 Aug 2020 05:09:41 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id F4154C07FF; Mon, 24 Aug 2020 05:09:40 +0000 (UTC) Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by lists.linuxfoundation.org (Postfix) with ESMTP id A77E2C0051 for ; Mon, 24 Aug 2020 05:09:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8F02985A96 for ; Mon, 24 Aug 2020 05:09:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fPHeR3Ulkd22 for ; Mon, 24 Aug 2020 05:09:38 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 6B0B785A92 for ; Mon, 24 Aug 2020 05:09:38 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 36A65AD71; Mon, 24 Aug 2020 05:10:06 +0000 (UTC) Subject: Re: [patch RFC 23/38] x86/xen: Rework MSI teardown To: Thomas Gleixner , LKML References: <20200821002424.119492231@linutronix.de> <20200821002947.575838946@linutronix.de> From: =?UTF-8?B?SsO8cmdlbiBHcm/Dnw==?= Message-ID: Date: Mon, 24 Aug 2020 07:09:35 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.11.0 MIME-Version: 1.0 In-Reply-To: <20200821002947.575838946@linutronix.de> Content-Language: en-US Cc: Dimitri Sivanich , linux-hyperv@vger.kernel.org, Steve Wahl , linux-pci@vger.kernel.org, "K. Y. Srinivasan" , Dan Williams , Wei Liu , Stephen Hemminger , Baolu Lu , Marc Zyngier , x86@kernel.org, Jason Gunthorpe , Megha Dey , xen-devel@lists.xenproject.org, Kevin Tian , Konrad Rzeszutek Wilk , Haiyang Zhang , Alex Williamson , Stefano Stabellini , Bjorn Helgaas , Dave Jiang , Boris Ostrovsky , Jon Derrick , Russ Anderson , Greg Kroah-Hartman , iommu@lists.linux-foundation.org, Jacob Pan , "Rafael J. Wysocki" X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: iommu-bounces@lists.linux-foundation.org Sender: "iommu" On 21.08.20 02:24, Thomas Gleixner wrote: > X86 cannot store the irq domain pointer in struct device without breaking > XEN because the irq domain pointer takes precedence over arch_*_msi_irqs() > fallbacks. > > XENs MSI teardown relies on default_teardown_msi_irqs() which invokes > arch_teardown_msi_irq(). default_teardown_msi_irqs() is a trivial iterator > over the msi entries associated to a device. > > Implement this loop in xen_teardown_msi_irqs() to prepare for removal of > the fallbacks for X86. > > This is a preparatory step to wrap XEN MSI alloc/free into a irq domain > which in turn allows to store the irq domain pointer in struct device and > to use the irq domain functions directly. > > Signed-off-by: Thomas Gleixner > --- > arch/x86/pci/xen.c | 23 ++++++++++++++++++----- > 1 file changed, 18 insertions(+), 5 deletions(-) > > --- a/arch/x86/pci/xen.c > +++ b/arch/x86/pci/xen.c > @@ -376,20 +376,31 @@ static void xen_initdom_restore_msi_irqs > static void xen_teardown_msi_irqs(struct pci_dev *dev) > { > struct msi_desc *msidesc; > + int i; > + > + for_each_pci_msi_entry(msidesc, dev) { > + if (msidesc->irq) { > + for (i = 0; i < msidesc->nvec_used; i++) > + xen_destroy_irq(msidesc->irq + i); > + } > + } > +} > + > +static void xen_pv_teardown_msi_irqs(struct pci_dev *dev) > +{ > + struct msi_desc *msidesc = first_pci_msi_entry(dev); > > - msidesc = first_pci_msi_entry(dev); > if (msidesc->msi_attrib.is_msix) > xen_pci_frontend_disable_msix(dev); > else > xen_pci_frontend_disable_msi(dev); > > - /* Free the IRQ's and the msidesc using the generic code. */ > - default_teardown_msi_irqs(dev); > + xen_teardown_msi_irqs(dev); > } > > static void xen_teardown_msi_irq(unsigned int irq) > { > - xen_destroy_irq(irq); > + WARN_ON_ONCE(1); > } > > #endif > @@ -412,7 +423,7 @@ int __init pci_xen_init(void) > #ifdef CONFIG_PCI_MSI > x86_msi.setup_msi_irqs = xen_setup_msi_irqs; > x86_msi.teardown_msi_irq = xen_teardown_msi_irq; > - x86_msi.teardown_msi_irqs = xen_teardown_msi_irqs; > + x86_msi.teardown_msi_irqs = xen_pv_teardown_msi_irqs; > pci_msi_ignore_mask = 1; > #endif > return 0; > @@ -436,6 +447,7 @@ static void __init xen_hvm_msi_init(void > } > > x86_msi.setup_msi_irqs = xen_hvm_setup_msi_irqs; > + x86_msi.teardown_msi_irqs = xen_teardown_msi_irqs; > x86_msi.teardown_msi_irq = xen_teardown_msi_irq; > } > #endif > @@ -472,6 +484,7 @@ int __init pci_xen_initial_domain(void) > #ifdef CONFIG_PCI_MSI > x86_msi.setup_msi_irqs = xen_initdom_setup_msi_irqs; > x86_msi.teardown_msi_irq = xen_teardown_msi_irq; > + x86_msi.teardown_msi_irqs = xen_teardown_msi_irqs; This should be xen_pv_teardown_msi_irqs, as pci_xen_initial_domain() is called only for the pv initial domain case today. > x86_msi.restore_msi_irqs = xen_initdom_restore_msi_irqs; > pci_msi_ignore_mask = 1; > #endif > Juergen _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu