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 lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (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 C9B91C433EF for ; Sat, 18 Dec 2021 20:26:21 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4JGcnR6Fy4z3cN4 for ; Sun, 19 Dec 2021 07:26:19 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=kaod.org (client-ip=46.105.45.231; helo=8.mo548.mail-out.ovh.net; envelope-from=clg@kaod.org; receiver=) Received: from 8.mo548.mail-out.ovh.net (8.mo548.mail-out.ovh.net [46.105.45.231]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4JGcmx5Nz7z2xgb for ; Sun, 19 Dec 2021 07:25:51 +1100 (AEDT) Received: from mxplan5.mail.ovh.net (unknown [10.109.138.121]) by mo548.mail-out.ovh.net (Postfix) with ESMTPS id 3A38A20143; Sat, 18 Dec 2021 20:25:43 +0000 (UTC) Received: from kaod.org (37.59.142.97) by DAG4EX1.mxp5.local (172.16.2.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Sat, 18 Dec 2021 21:25:41 +0100 Authentication-Results: garm.ovh; auth=pass (GARM-97G0022d2cf51f-56be-41f7-b9ac-2c271cc1d1bb, B1F2FCB93787BB0875C07E604CDE73E7ADF677F7) smtp.auth=clg@kaod.org X-OVh-ClientIp: 90.11.79.163 Message-ID: Date: Sat, 18 Dec 2021 21:25:40 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.3.0 Subject: Re: [patch V3 28/35] PCI/MSI: Simplify pci_irq_get_affinity() Content-Language: en-US To: Thomas Gleixner , Nathan Chancellor References: <20211210221642.869015045@linutronix.de> <20211210221814.900929381@linutronix.de> <87v8zm9pmd.ffs@tglx> From: =?UTF-8?Q?C=c3=a9dric_Le_Goater?= In-Reply-To: <87v8zm9pmd.ffs@tglx> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit X-Originating-IP: [37.59.142.97] X-ClientProxiedBy: DAG1EX1.mxp5.local (172.16.2.1) To DAG4EX1.mxp5.local (172.16.2.31) X-Ovh-Tracer-GUID: 2aa807ab-02a3-4ad6-8447-d206fc92c88e X-Ovh-Tracer-Id: 4883872323797683005 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvuddrleekgddufeeiucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhepkfffgggfuffvfhfhjggtgfhisehtkeertddtfeejnecuhfhrohhmpeevrogurhhitggpnfgvpgfiohgrthgvrhcuoegtlhhgsehkrghougdrohhrgheqnecuggftrfgrthhtvghrnhepieegvdffkeegfeetuddttddtveduiefhgeduffekiedtkeekteekhfffleevleelnecukfhppedtrddtrddtrddtpdefjedrheelrddugedvrdeljeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhhouggvpehsmhhtphhouhhtpdhhvghlohepmhigphhlrghnhedrmhgrihhlrdhovhhhrdhnvghtpdhinhgvtheptddrtddrtddrtddpmhgrihhlfhhrohhmpegtlhhgsehkrghougdrohhrghdprhgtphhtthhopehokhgrhigrsehkvghrnhgvlhdrohhrgh X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Nishanth Menon , Mark Rutland , Stuart Yoder , Will Deacon , Ashok Raj , Marc Zygnier , Joerg Roedel , Jassi Brar , Sinan Kaya , iommu@lists.linux-foundation.org, Peter Ujfalusi , Bjorn Helgaas , linux-arm-kernel@lists.infradead.org, Jason Gunthorpe , linux-pci@vger.kernel.org, xen-devel@lists.xenproject.org, Kevin Tian , Arnd Bergmann , Robin Murphy , Alex Williamson , Santosh Shilimkar , Bjorn Helgaas , Megha Dey , Laurentiu Tudor , Juergen Gross , Tero Kristo , Greg Kroah-Hartman , LKML , Vinod Koul , dmaengine@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" On 12/18/21 11:25, Thomas Gleixner wrote: > On Fri, Dec 17 2021 at 15:30, Nathan Chancellor wrote: >> On Fri, Dec 10, 2021 at 11:19:26PM +0100, Thomas Gleixner wrote: >> I just bisected a boot failure on my AMD test desktop to this patch as >> commit f48235900182 ("PCI/MSI: Simplify pci_irq_get_affinity()") in >> -next. It looks like there is a problem with the NVMe drive after this >> change according to the logs. Given that the hard drive is not getting >> mounted for journald to write logs to, I am not really sure how to get >> them from the machine so I have at least taken a picture of what I see >> on my screen; open to ideas on that front! > > Bah. Fix below. That's a fix for the issue I was seeing on pseries with NVMe. Tested-by: Cédric Le Goater Thanks, C. > Thanks, > > tglx > --- > diff --git a/drivers/pci/msi/msi.c b/drivers/pci/msi/msi.c > index 71802410e2ab..9b4910befeda 100644 > --- a/drivers/pci/msi/msi.c > +++ b/drivers/pci/msi/msi.c > @@ -1100,7 +1100,7 @@ EXPORT_SYMBOL(pci_irq_vector); > */ > const struct cpumask *pci_irq_get_affinity(struct pci_dev *dev, int nr) > { > - int irq = pci_irq_vector(dev, nr); > + int idx, irq = pci_irq_vector(dev, nr); > struct msi_desc *desc; > > if (WARN_ON_ONCE(irq <= 0)) > @@ -1113,7 +1113,10 @@ const struct cpumask *pci_irq_get_affinity(struct pci_dev *dev, int nr) > > if (WARN_ON_ONCE(!desc->affinity)) > return NULL; > - return &desc->affinity[nr].mask; > + > + /* MSI has a mask array in the descriptor. */ > + idx = dev->msi_enabled ? nr : 0; > + return &desc->affinity[idx].mask; > } > EXPORT_SYMBOL(pci_irq_get_affinity); > > 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 smtp3.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 smtp.lore.kernel.org (Postfix) with ESMTPS id 53B21C433EF for ; Sat, 18 Dec 2021 20:25:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id DE6DA60B1C; Sat, 18 Dec 2021 20:25:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cz18P-SsDV78; Sat, 18 Dec 2021 20:25:51 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp3.osuosl.org (Postfix) with ESMTPS id C2D4E607F9; Sat, 18 Dec 2021 20:25:50 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 7E311C002F; Sat, 18 Dec 2021 20:25:50 +0000 (UTC) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by lists.linuxfoundation.org (Postfix) with ESMTP id E3851C0012 for ; Sat, 18 Dec 2021 20:25:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id BC55D60807 for ; Sat, 18 Dec 2021 20:25:49 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hmzl_VIiFnl8 for ; Sat, 18 Dec 2021 20:25:48 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 Received: from 2.mo548.mail-out.ovh.net (2.mo548.mail-out.ovh.net [178.33.255.19]) by smtp3.osuosl.org (Postfix) with ESMTPS id 6BE46607F9 for ; Sat, 18 Dec 2021 20:25:48 +0000 (UTC) Received: from mxplan5.mail.ovh.net (unknown [10.109.138.121]) by mo548.mail-out.ovh.net (Postfix) with ESMTPS id 3A38A20143; Sat, 18 Dec 2021 20:25:43 +0000 (UTC) Received: from kaod.org (37.59.142.97) by DAG4EX1.mxp5.local (172.16.2.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Sat, 18 Dec 2021 21:25:41 +0100 Authentication-Results: garm.ovh; auth=pass (GARM-97G0022d2cf51f-56be-41f7-b9ac-2c271cc1d1bb, B1F2FCB93787BB0875C07E604CDE73E7ADF677F7) smtp.auth=clg@kaod.org X-OVh-ClientIp: 90.11.79.163 Message-ID: Date: Sat, 18 Dec 2021 21:25:40 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.3.0 Subject: Re: [patch V3 28/35] PCI/MSI: Simplify pci_irq_get_affinity() Content-Language: en-US To: Thomas Gleixner , Nathan Chancellor References: <20211210221642.869015045@linutronix.de> <20211210221814.900929381@linutronix.de> <87v8zm9pmd.ffs@tglx> From: =?UTF-8?Q?C=c3=a9dric_Le_Goater?= In-Reply-To: <87v8zm9pmd.ffs@tglx> X-Originating-IP: [37.59.142.97] X-ClientProxiedBy: DAG1EX1.mxp5.local (172.16.2.1) To DAG4EX1.mxp5.local (172.16.2.31) X-Ovh-Tracer-GUID: 2aa807ab-02a3-4ad6-8447-d206fc92c88e X-Ovh-Tracer-Id: 4883872323797683005 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvuddrleekgddufeeiucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhepkfffgggfuffvfhfhjggtgfhisehtkeertddtfeejnecuhfhrohhmpeevrogurhhitggpnfgvpgfiohgrthgvrhcuoegtlhhgsehkrghougdrohhrgheqnecuggftrfgrthhtvghrnhepieegvdffkeegfeetuddttddtveduiefhgeduffekiedtkeekteekhfffleevleelnecukfhppedtrddtrddtrddtpdefjedrheelrddugedvrdeljeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhhouggvpehsmhhtphhouhhtpdhhvghlohepmhigphhlrghnhedrmhgrihhlrdhovhhhrdhnvghtpdhinhgvtheptddrtddrtddrtddpmhgrihhlfhhrohhmpegtlhhgsehkrghougdrohhrghdprhgtphhtthhopehokhgrhigrsehkvghrnhgvlhdrohhrgh Cc: Nishanth Menon , Mark Rutland , Stuart Yoder , Benjamin Herrenschmidt , Will Deacon , Ashok Raj , Marc Zygnier , Jassi Brar , Sinan Kaya , iommu@lists.linux-foundation.org, Peter Ujfalusi , Bjorn Helgaas , linux-arm-kernel@lists.infradead.org, Jason Gunthorpe , linux-pci@vger.kernel.org, xen-devel@lists.xenproject.org, Kevin Tian , Arnd Bergmann , Robin Murphy , Alex Williamson , Santosh Shilimkar , Bjorn Helgaas , Megha Dey , Juergen Gross , Tero Kristo , Greg Kroah-Hartman , LKML , Vinod Koul , Michael Ellerman , dmaengine@vger.kernel.org, linuxppc-dev@lists.ozlabs.org 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: base64 Content-Type: text/plain; charset="utf-8"; Format="flowed" Errors-To: iommu-bounces@lists.linux-foundation.org Sender: "iommu" T24gMTIvMTgvMjEgMTE6MjUsIFRob21hcyBHbGVpeG5lciB3cm90ZToKPiBPbiBGcmksIERlYyAx NyAyMDIxIGF0IDE1OjMwLCBOYXRoYW4gQ2hhbmNlbGxvciB3cm90ZToKPj4gT24gRnJpLCBEZWMg MTAsIDIwMjEgYXQgMTE6MTk6MjZQTSArMDEwMCwgVGhvbWFzIEdsZWl4bmVyIHdyb3RlOgo+PiBJ IGp1c3QgYmlzZWN0ZWQgYSBib290IGZhaWx1cmUgb24gbXkgQU1EIHRlc3QgZGVza3RvcCB0byB0 aGlzIHBhdGNoIGFzCj4+IGNvbW1pdCBmNDgyMzU5MDAxODIgKCJQQ0kvTVNJOiBTaW1wbGlmeSBw Y2lfaXJxX2dldF9hZmZpbml0eSgpIikgaW4KPj4gLW5leHQuIEl0IGxvb2tzIGxpa2UgdGhlcmUg aXMgYSBwcm9ibGVtIHdpdGggdGhlIE5WTWUgZHJpdmUgYWZ0ZXIgdGhpcwo+PiBjaGFuZ2UgYWNj b3JkaW5nIHRvIHRoZSBsb2dzLiBHaXZlbiB0aGF0IHRoZSBoYXJkIGRyaXZlIGlzIG5vdCBnZXR0 aW5nCj4+IG1vdW50ZWQgZm9yIGpvdXJuYWxkIHRvIHdyaXRlIGxvZ3MgdG8sIEkgYW0gbm90IHJl YWxseSBzdXJlIGhvdyB0byBnZXQKPj4gdGhlbSBmcm9tIHRoZSBtYWNoaW5lIHNvIEkgaGF2ZSBh dCBsZWFzdCB0YWtlbiBhIHBpY3R1cmUgb2Ygd2hhdCBJIHNlZQo+PiBvbiBteSBzY3JlZW47IG9w ZW4gdG8gaWRlYXMgb24gdGhhdCBmcm9udCEKPiAKPiBCYWguIEZpeCBiZWxvdy4KClRoYXQncyBh IGZpeCBmb3IgdGhlIGlzc3VlIEkgd2FzIHNlZWluZyBvbiBwc2VyaWVzIHdpdGggTlZNZS4KClRl c3RlZC1ieTogQ8OpZHJpYyBMZSBHb2F0ZXIgPGNsZ0BrYW9kLm9yZz4KClRoYW5rcywKCkMuCgoK PiBUaGFua3MsCj4gCj4gICAgICAgICAgdGdseAo+IC0tLQo+IGRpZmYgLS1naXQgYS9kcml2ZXJz L3BjaS9tc2kvbXNpLmMgYi9kcml2ZXJzL3BjaS9tc2kvbXNpLmMKPiBpbmRleCA3MTgwMjQxMGUy YWIuLjliNDkxMGJlZmVkYSAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL3BjaS9tc2kvbXNpLmMKPiAr KysgYi9kcml2ZXJzL3BjaS9tc2kvbXNpLmMKPiBAQCAtMTEwMCw3ICsxMTAwLDcgQEAgRVhQT1JU X1NZTUJPTChwY2lfaXJxX3ZlY3Rvcik7Cj4gICAgKi8KPiAgIGNvbnN0IHN0cnVjdCBjcHVtYXNr ICpwY2lfaXJxX2dldF9hZmZpbml0eShzdHJ1Y3QgcGNpX2RldiAqZGV2LCBpbnQgbnIpCj4gICB7 Cj4gLQlpbnQgaXJxID0gcGNpX2lycV92ZWN0b3IoZGV2LCBucik7Cj4gKwlpbnQgaWR4LCBpcnEg PSBwY2lfaXJxX3ZlY3RvcihkZXYsIG5yKTsKPiAgIAlzdHJ1Y3QgbXNpX2Rlc2MgKmRlc2M7Cj4g ICAKPiAgIAlpZiAoV0FSTl9PTl9PTkNFKGlycSA8PSAwKSkKPiBAQCAtMTExMyw3ICsxMTEzLDEw IEBAIGNvbnN0IHN0cnVjdCBjcHVtYXNrICpwY2lfaXJxX2dldF9hZmZpbml0eShzdHJ1Y3QgcGNp X2RldiAqZGV2LCBpbnQgbnIpCj4gICAKPiAgIAlpZiAoV0FSTl9PTl9PTkNFKCFkZXNjLT5hZmZp bml0eSkpCj4gICAJCXJldHVybiBOVUxMOwo+IC0JcmV0dXJuICZkZXNjLT5hZmZpbml0eVtucl0u bWFzazsKPiArCj4gKwkvKiBNU0kgaGFzIGEgbWFzayBhcnJheSBpbiB0aGUgZGVzY3JpcHRvci4g Ki8KPiArCWlkeCA9IGRldi0+bXNpX2VuYWJsZWQgPyBuciA6IDA7Cj4gKwlyZXR1cm4gJmRlc2Mt PmFmZmluaXR5W2lkeF0ubWFzazsKPiAgIH0KPiAgIEVYUE9SVF9TWU1CT0wocGNpX2lycV9nZXRf YWZmaW5pdHkpOwo+ICAgCj4gCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwppb21tdSBtYWlsaW5nIGxpc3QKaW9tbXVAbGlzdHMubGludXgtZm91bmRhdGlv bi5vcmcKaHR0cHM6Ly9saXN0cy5saW51eGZvdW5kYXRpb24ub3JnL21haWxtYW4vbGlzdGluZm8v aW9tbXU= 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5D022C433EF for ; Sat, 18 Dec 2021 21:42:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231318AbhLRVmV (ORCPT ); Sat, 18 Dec 2021 16:42:21 -0500 Received: from 1.mo548.mail-out.ovh.net ([178.32.121.110]:50663 "EHLO 1.mo548.mail-out.ovh.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229480AbhLRVmV (ORCPT ); Sat, 18 Dec 2021 16:42:21 -0500 X-Greylist: delayed 2401 seconds by postgrey-1.27 at vger.kernel.org; Sat, 18 Dec 2021 16:42:21 EST Received: from mxplan5.mail.ovh.net (unknown [10.109.138.121]) by mo548.mail-out.ovh.net (Postfix) with ESMTPS id 3A38A20143; Sat, 18 Dec 2021 20:25:43 +0000 (UTC) Received: from kaod.org (37.59.142.97) by DAG4EX1.mxp5.local (172.16.2.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Sat, 18 Dec 2021 21:25:41 +0100 Authentication-Results: garm.ovh; auth=pass (GARM-97G0022d2cf51f-56be-41f7-b9ac-2c271cc1d1bb, B1F2FCB93787BB0875C07E604CDE73E7ADF677F7) smtp.auth=clg@kaod.org X-OVh-ClientIp: 90.11.79.163 Message-ID: Date: Sat, 18 Dec 2021 21:25:40 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.3.0 Subject: Re: [patch V3 28/35] PCI/MSI: Simplify pci_irq_get_affinity() Content-Language: en-US To: Thomas Gleixner , Nathan Chancellor CC: LKML , Bjorn Helgaas , Marc Zygnier , Alex Williamson , Kevin Tian , Jason Gunthorpe , Megha Dey , Ashok Raj , , Greg Kroah-Hartman , Juergen Gross , , Arnd Bergmann , Michael Ellerman , Benjamin Herrenschmidt , , Bjorn Helgaas , Stuart Yoder , Laurentiu Tudor , Nishanth Menon , Tero Kristo , Santosh Shilimkar , , Vinod Koul , , Mark Rutland , Will Deacon , Robin Murphy , Joerg Roedel , , Jassi Brar , Peter Ujfalusi , Sinan Kaya References: <20211210221642.869015045@linutronix.de> <20211210221814.900929381@linutronix.de> <87v8zm9pmd.ffs@tglx> From: =?UTF-8?Q?C=c3=a9dric_Le_Goater?= In-Reply-To: <87v8zm9pmd.ffs@tglx> Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit X-Originating-IP: [37.59.142.97] X-ClientProxiedBy: DAG1EX1.mxp5.local (172.16.2.1) To DAG4EX1.mxp5.local (172.16.2.31) X-Ovh-Tracer-GUID: 2aa807ab-02a3-4ad6-8447-d206fc92c88e X-Ovh-Tracer-Id: 4883872323797683005 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvuddrleekgddufeeiucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhepkfffgggfuffvfhfhjggtgfhisehtkeertddtfeejnecuhfhrohhmpeevrogurhhitggpnfgvpgfiohgrthgvrhcuoegtlhhgsehkrghougdrohhrgheqnecuggftrfgrthhtvghrnhepieegvdffkeegfeetuddttddtveduiefhgeduffekiedtkeekteekhfffleevleelnecukfhppedtrddtrddtrddtpdefjedrheelrddugedvrdeljeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhhouggvpehsmhhtphhouhhtpdhhvghlohepmhigphhlrghnhedrmhgrihhlrdhovhhhrdhnvghtpdhinhgvtheptddrtddrtddrtddpmhgrihhlfhhrohhmpegtlhhgsehkrghougdrohhrghdprhgtphhtthhopehokhgrhigrsehkvghrnhgvlhdrohhrgh Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org On 12/18/21 11:25, Thomas Gleixner wrote: > On Fri, Dec 17 2021 at 15:30, Nathan Chancellor wrote: >> On Fri, Dec 10, 2021 at 11:19:26PM +0100, Thomas Gleixner wrote: >> I just bisected a boot failure on my AMD test desktop to this patch as >> commit f48235900182 ("PCI/MSI: Simplify pci_irq_get_affinity()") in >> -next. It looks like there is a problem with the NVMe drive after this >> change according to the logs. Given that the hard drive is not getting >> mounted for journald to write logs to, I am not really sure how to get >> them from the machine so I have at least taken a picture of what I see >> on my screen; open to ideas on that front! > > Bah. Fix below. That's a fix for the issue I was seeing on pseries with NVMe. Tested-by: Cédric Le Goater Thanks, C. > Thanks, > > tglx > --- > diff --git a/drivers/pci/msi/msi.c b/drivers/pci/msi/msi.c > index 71802410e2ab..9b4910befeda 100644 > --- a/drivers/pci/msi/msi.c > +++ b/drivers/pci/msi/msi.c > @@ -1100,7 +1100,7 @@ EXPORT_SYMBOL(pci_irq_vector); > */ > const struct cpumask *pci_irq_get_affinity(struct pci_dev *dev, int nr) > { > - int irq = pci_irq_vector(dev, nr); > + int idx, irq = pci_irq_vector(dev, nr); > struct msi_desc *desc; > > if (WARN_ON_ONCE(irq <= 0)) > @@ -1113,7 +1113,10 @@ const struct cpumask *pci_irq_get_affinity(struct pci_dev *dev, int nr) > > if (WARN_ON_ONCE(!desc->affinity)) > return NULL; > - return &desc->affinity[nr].mask; > + > + /* MSI has a mask array in the descriptor. */ > + idx = dev->msi_enabled ? nr : 0; > + return &desc->affinity[idx].mask; > } > EXPORT_SYMBOL(pci_irq_get_affinity); > > 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 EEF70C433F5 for ; Sat, 18 Dec 2021 20:27:28 +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-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:From:References:CC:To:Subject: MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=1vU/I09VTn1PYvzhNSoilkT5zxQiUcNi1+Dkr2Y/1Ro=; b=4cCem+LAvyM+g3 r94xhev5D8uj2CqRLikMQQKo3B+u64AI7DzcjMWccZnwJ2vVnvR8rBBSghBDySGRK0qiNgS3rL7Lp Q92O9xbmV1ANUVSwrrKdxOOIon37oUZuGjUhdOshJ1SckJKVKkmKmYmJQHT1MZj9q9UtcUSjKx7C0 aEYRsT5qrJ4V93gCtMc7AvBRP0A8apCaLMeoeqScI6ssxEQaLOqrWZD25jfjrqIvQliSOjovZ5EDQ 103Q0l4zn1SRkb4t7G7yniNFpWQAyNGh/zjN+qsc5CepW7lCUtFWb1uOvHbl2dwvw65Jy7tg+XvaL LoBEDDQdTIcwApyI55Ew==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mygHH-00EeY1-V2; Sat, 18 Dec 2021 20:26:00 +0000 Received: from 1.mo548.mail-out.ovh.net ([178.32.121.110]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mygHE-00EeWO-9P for linux-arm-kernel@lists.infradead.org; Sat, 18 Dec 2021 20:25:58 +0000 Received: from mxplan5.mail.ovh.net (unknown [10.109.138.121]) by mo548.mail-out.ovh.net (Postfix) with ESMTPS id 3A38A20143; Sat, 18 Dec 2021 20:25:43 +0000 (UTC) Received: from kaod.org (37.59.142.97) by DAG4EX1.mxp5.local (172.16.2.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Sat, 18 Dec 2021 21:25:41 +0100 Authentication-Results: garm.ovh; auth=pass (GARM-97G0022d2cf51f-56be-41f7-b9ac-2c271cc1d1bb, B1F2FCB93787BB0875C07E604CDE73E7ADF677F7) smtp.auth=clg@kaod.org X-OVh-ClientIp: 90.11.79.163 Message-ID: Date: Sat, 18 Dec 2021 21:25:40 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.3.0 Subject: Re: [patch V3 28/35] PCI/MSI: Simplify pci_irq_get_affinity() Content-Language: en-US To: Thomas Gleixner , Nathan Chancellor CC: LKML , Bjorn Helgaas , Marc Zygnier , Alex Williamson , Kevin Tian , Jason Gunthorpe , Megha Dey , Ashok Raj , , Greg Kroah-Hartman , Juergen Gross , , Arnd Bergmann , Michael Ellerman , Benjamin Herrenschmidt , , Bjorn Helgaas , Stuart Yoder , Laurentiu Tudor , Nishanth Menon , Tero Kristo , Santosh Shilimkar , , Vinod Koul , , Mark Rutland , Will Deacon , Robin Murphy , Joerg Roedel , , Jassi Brar , Peter Ujfalusi , Sinan Kaya References: <20211210221642.869015045@linutronix.de> <20211210221814.900929381@linutronix.de> <87v8zm9pmd.ffs@tglx> From: =?UTF-8?Q?C=c3=a9dric_Le_Goater?= In-Reply-To: <87v8zm9pmd.ffs@tglx> X-Originating-IP: [37.59.142.97] X-ClientProxiedBy: DAG1EX1.mxp5.local (172.16.2.1) To DAG4EX1.mxp5.local (172.16.2.31) X-Ovh-Tracer-GUID: 2aa807ab-02a3-4ad6-8447-d206fc92c88e X-Ovh-Tracer-Id: 4883872323797683005 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvuddrleekgddufeeiucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhepkfffgggfuffvfhfhjggtgfhisehtkeertddtfeejnecuhfhrohhmpeevrogurhhitggpnfgvpgfiohgrthgvrhcuoegtlhhgsehkrghougdrohhrgheqnecuggftrfgrthhtvghrnhepieegvdffkeegfeetuddttddtveduiefhgeduffekiedtkeekteekhfffleevleelnecukfhppedtrddtrddtrddtpdefjedrheelrddugedvrdeljeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhhouggvpehsmhhtphhouhhtpdhhvghlohepmhigphhlrghnhedrmhgrihhlrdhovhhhrdhnvghtpdhinhgvtheptddrtddrtddrtddpmhgrihhlfhhrohhmpegtlhhgsehkrghougdrohhrghdprhgtphhtthhopehokhgrhigrsehkvghrnhgvlhdrohhrgh X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211218_122556_657825_F96C7008 X-CRM114-Status: GOOD ( 20.97 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: base64 Content-Type: text/plain; charset="utf-8"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org T24gMTIvMTgvMjEgMTE6MjUsIFRob21hcyBHbGVpeG5lciB3cm90ZToKPiBPbiBGcmksIERlYyAx NyAyMDIxIGF0IDE1OjMwLCBOYXRoYW4gQ2hhbmNlbGxvciB3cm90ZToKPj4gT24gRnJpLCBEZWMg MTAsIDIwMjEgYXQgMTE6MTk6MjZQTSArMDEwMCwgVGhvbWFzIEdsZWl4bmVyIHdyb3RlOgo+PiBJ IGp1c3QgYmlzZWN0ZWQgYSBib290IGZhaWx1cmUgb24gbXkgQU1EIHRlc3QgZGVza3RvcCB0byB0 aGlzIHBhdGNoIGFzCj4+IGNvbW1pdCBmNDgyMzU5MDAxODIgKCJQQ0kvTVNJOiBTaW1wbGlmeSBw Y2lfaXJxX2dldF9hZmZpbml0eSgpIikgaW4KPj4gLW5leHQuIEl0IGxvb2tzIGxpa2UgdGhlcmUg aXMgYSBwcm9ibGVtIHdpdGggdGhlIE5WTWUgZHJpdmUgYWZ0ZXIgdGhpcwo+PiBjaGFuZ2UgYWNj b3JkaW5nIHRvIHRoZSBsb2dzLiBHaXZlbiB0aGF0IHRoZSBoYXJkIGRyaXZlIGlzIG5vdCBnZXR0 aW5nCj4+IG1vdW50ZWQgZm9yIGpvdXJuYWxkIHRvIHdyaXRlIGxvZ3MgdG8sIEkgYW0gbm90IHJl YWxseSBzdXJlIGhvdyB0byBnZXQKPj4gdGhlbSBmcm9tIHRoZSBtYWNoaW5lIHNvIEkgaGF2ZSBh dCBsZWFzdCB0YWtlbiBhIHBpY3R1cmUgb2Ygd2hhdCBJIHNlZQo+PiBvbiBteSBzY3JlZW47IG9w ZW4gdG8gaWRlYXMgb24gdGhhdCBmcm9udCEKPiAKPiBCYWguIEZpeCBiZWxvdy4KClRoYXQncyBh IGZpeCBmb3IgdGhlIGlzc3VlIEkgd2FzIHNlZWluZyBvbiBwc2VyaWVzIHdpdGggTlZNZS4KClRl c3RlZC1ieTogQ8OpZHJpYyBMZSBHb2F0ZXIgPGNsZ0BrYW9kLm9yZz4KClRoYW5rcywKCkMuCgoK PiBUaGFua3MsCj4gCj4gICAgICAgICAgdGdseAo+IC0tLQo+IGRpZmYgLS1naXQgYS9kcml2ZXJz L3BjaS9tc2kvbXNpLmMgYi9kcml2ZXJzL3BjaS9tc2kvbXNpLmMKPiBpbmRleCA3MTgwMjQxMGUy YWIuLjliNDkxMGJlZmVkYSAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL3BjaS9tc2kvbXNpLmMKPiAr KysgYi9kcml2ZXJzL3BjaS9tc2kvbXNpLmMKPiBAQCAtMTEwMCw3ICsxMTAwLDcgQEAgRVhQT1JU X1NZTUJPTChwY2lfaXJxX3ZlY3Rvcik7Cj4gICAgKi8KPiAgIGNvbnN0IHN0cnVjdCBjcHVtYXNr ICpwY2lfaXJxX2dldF9hZmZpbml0eShzdHJ1Y3QgcGNpX2RldiAqZGV2LCBpbnQgbnIpCj4gICB7 Cj4gLQlpbnQgaXJxID0gcGNpX2lycV92ZWN0b3IoZGV2LCBucik7Cj4gKwlpbnQgaWR4LCBpcnEg PSBwY2lfaXJxX3ZlY3RvcihkZXYsIG5yKTsKPiAgIAlzdHJ1Y3QgbXNpX2Rlc2MgKmRlc2M7Cj4g ICAKPiAgIAlpZiAoV0FSTl9PTl9PTkNFKGlycSA8PSAwKSkKPiBAQCAtMTExMyw3ICsxMTEzLDEw IEBAIGNvbnN0IHN0cnVjdCBjcHVtYXNrICpwY2lfaXJxX2dldF9hZmZpbml0eShzdHJ1Y3QgcGNp X2RldiAqZGV2LCBpbnQgbnIpCj4gICAKPiAgIAlpZiAoV0FSTl9PTl9PTkNFKCFkZXNjLT5hZmZp bml0eSkpCj4gICAJCXJldHVybiBOVUxMOwo+IC0JcmV0dXJuICZkZXNjLT5hZmZpbml0eVtucl0u bWFzazsKPiArCj4gKwkvKiBNU0kgaGFzIGEgbWFzayBhcnJheSBpbiB0aGUgZGVzY3JpcHRvci4g Ki8KPiArCWlkeCA9IGRldi0+bXNpX2VuYWJsZWQgPyBuciA6IDA7Cj4gKwlyZXR1cm4gJmRlc2Mt PmFmZmluaXR5W2lkeF0ubWFzazsKPiAgIH0KPiAgIEVYUE9SVF9TWU1CT0wocGNpX2lycV9nZXRf YWZmaW5pdHkpOwo+ICAgCj4gCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KbGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QKbGludXgtYXJtLWtlcm5l bEBsaXN0cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4v bGlzdGluZm8vbGludXgtYXJtLWtlcm5lbAo=