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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 52F62C433F5 for ; Tue, 7 Dec 2021 21:01:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Message-ID: Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Owner; bh=RF6ncPKWE2+SNvGVA3+tkMGw3cpRyA8lCGIkLwwN9CY=; b=nVuN/0by3lCu78 QRcFpJK5p1n3PAvAxdObDc67DaOAGgDVQo6nnfd+b5uYB2Q8dngrszZ+E7e58Q2Dun5AcbmKRUnql 83MxBV6VIfeXnkBpyi3b5J90C6U8x5FOkXaPgwmvX80vnNRsKyHpe22Zzdm0de3TLx3e+EwSwYGjA ziuW0A3NQYIwriUItuHwyKUfA7S66lefZl0PC472udmB1+IwqiMEoPLcjoTxGeuoMp31/rrUVOcER W2GLGhiEVmLLog4hExuzOJkgVC58GJkUTafM3O9ZCHUB0pL/vGSj1FwzyT9ySqDU79nv9ywBytGXg fbrvBNSX0hW92lzRuMJQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1muhaS-00A681-U6; Tue, 07 Dec 2021 21:01:20 +0000 Received: from sin.source.kernel.org ([2604:1380:40e1:4800::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1muhaP-00A65l-4J for ath11k@lists.infradead.org; Tue, 07 Dec 2021 21:01:18 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id 68F02CE1E7E; Tue, 7 Dec 2021 21:01:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C3297C341D8; Tue, 7 Dec 2021 21:01:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1638910872; bh=ybqLZ92i+grI5yfbGrTDeuksmJCOFi+gglGxwe9SamU=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=TMUWYC/mv0B6gIw9DnRHd2zTabDMDtD755n0HABL/tcoqSE7ZcCnd0dDbsDaoGmvK qSODOct9cMbGDUGaQMGz23hZcH9TolzNE91WbMR1Is6JY9P7bOVw1YsTR4FzKBLaf9 Le+C7vjuOPwgxJcdSYAXoABWYbIQoh0hnYJqcmKa/wpN/Q1nRm8km9tdJkdCx2jmEX fsf36dBLTPbeG7aB0lTQj2KpKmjk75YkmrWt1HFRo19aRculiS/sfLvaOedfplt04D DN4WnjTjinZPEIZIHd2BJZNhCHE1Yq/9m5G9O6M/Xzerap0qhtoeEABEaeo9Bwqnki GYfTLw7geSrJg== Date: Tue, 7 Dec 2021 15:01:10 -0600 From: Bjorn Helgaas To: Thomas Gleixner Cc: LKML , Marc Zygnier , Alex Williamson , Kevin Tian , Jason Gunthorpe , Megha Dey , Ashok Raj , linux-pci@vger.kernel.org, Cedric Le Goater , Juergen Gross , Michael Ellerman , Paul Mackerras , Benjamin Herrenschmidt , linuxppc-dev@lists.ozlabs.org, Thomas Bogendoerfer , linux-mips@vger.kernel.org, Kalle Valo , Greg Kroah-Hartman , sparclinux@vger.kernel.org, x86@kernel.org, xen-devel@lists.xenproject.org, ath11k@lists.infradead.org, Wei Liu , linux-hyperv@vger.kernel.org, Christian Borntraeger , Heiko Carstens Subject: Re: [patch V2 19/23] PCI/MSI: Sanitize MSIX table map handling Message-ID: <20211207210110.GA77246@bhelgaas> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20211206210224.871651518@linutronix.de> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211207_130117_561369_28934434 X-CRM114-Status: GOOD ( 19.75 ) X-BeenThere: ath11k@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ath11k" Errors-To: ath11k-bounces+ath11k=archiver.kernel.org@lists.infradead.org On Mon, Dec 06, 2021 at 11:27:54PM +0100, Thomas Gleixner wrote: > Unmapping the MSIX base mapping in the loops which allocate/free MSI > desciptors is daft and in the way of allowing runtime expansion of MSI-X > descriptors. s/MSIX/MSI-X/ (subject and first use in commit log) s/desciptors/descriptors/ > Store the mapping in struct pci_dev and free it after freeing the MSI-X > descriptors. > > Signed-off-by: Thomas Gleixner > Tested-by: Juergen Gross > Reviewed-by: Jason Gunthorpe Acked-by: Bjorn Helgaas > --- > drivers/pci/msi/msi.c | 18 ++++++++---------- > include/linux/pci.h | 1 + > 2 files changed, 9 insertions(+), 10 deletions(-) > > --- a/drivers/pci/msi/msi.c > +++ b/drivers/pci/msi/msi.c > @@ -241,14 +241,14 @@ static void free_msi_irqs(struct pci_dev > pci_msi_teardown_msi_irqs(dev); > > list_for_each_entry_safe(entry, tmp, msi_list, list) { > - if (entry->pci.msi_attrib.is_msix) { > - if (list_is_last(&entry->list, msi_list)) > - iounmap(entry->pci.mask_base); > - } > - > list_del(&entry->list); > free_msi_entry(entry); > } > + > + if (dev->msix_base) { > + iounmap(dev->msix_base); > + dev->msix_base = NULL; > + } > } > > static void pci_intx_for_msi(struct pci_dev *dev, int enable) > @@ -501,10 +501,6 @@ static int msix_setup_entries(struct pci > for (i = 0, curmsk = masks; i < nvec; i++) { > entry = alloc_msi_entry(&dev->dev, 1, curmsk); > if (!entry) { > - if (!i) > - iounmap(base); > - else > - free_msi_irqs(dev); > /* No enough memory. Don't try again */ > ret = -ENOMEM; > goto out; > @@ -602,12 +598,14 @@ static int msix_capability_init(struct p > goto out_disable; > } > > + dev->msix_base = base; > + > /* Ensure that all table entries are masked. */ > msix_mask_all(base, tsize); > > ret = msix_setup_entries(dev, base, entries, nvec, affd); > if (ret) > - goto out_disable; > + goto out_free; > > ret = pci_msi_setup_msi_irqs(dev, nvec, PCI_CAP_ID_MSIX); > if (ret) > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -473,6 +473,7 @@ struct pci_dev { > u8 ptm_granularity; > #endif > #ifdef CONFIG_PCI_MSI > + void __iomem *msix_base; > const struct attribute_group **msi_irq_groups; > #endif > struct pci_vpd vpd; > -- ath11k mailing list ath11k@lists.infradead.org http://lists.infradead.org/mailman/listinfo/ath11k