From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jon Mason Subject: Re: [PATCH RFC 01/77] PCI/MSI: Fix return value when populate_msi_sysfs() failed Date: Wed, 2 Oct 2013 17:39:05 -0700 Message-ID: <20131003003905.GK6768@jonmason-lab> References: <3ff5236944aae69f2cd934b5b6da7c1c269df7c1.1380703262.git.agordeev@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <3ff5236944aae69f2cd934b5b6da7c1c269df7c1.1380703262.git.agordeev-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> Sender: linux-rdma-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Alexander Gordeev Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Bjorn Helgaas , Ralf Baechle , Michael Ellerman , Benjamin Herrenschmidt , Martin Schwidefsky , Ingo Molnar , Tejun Heo , Dan Williams , Andy King , Matt Porter , stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-pci-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-mips-6z/3iImG2C8G8FEW9MqTrA@public.gmane.org, linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org, linux390-tA70FqPdS9bQT0dZR+AlfA@public.gmane.org, linux-s390-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, x86-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, linux-ide-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, iss_storagedev-VXdhtT5mjnY@public.gmane.org, linux-nvme-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, e1000-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org, linux-driver-h88ZbnxC6KDQT0dZR+AlfA@public.gmane.org, Solarflare linux maintainers , "VMware, Inc." List-Id: linux-ide@vger.kernel.org On Wed, Oct 02, 2013 at 12:48:17PM +0200, Alexander Gordeev wrote: > Signed-off-by: Alexander Gordeev Since you are changing the behavior of the msix_capability_init function on populate_msi_sysfs error, a comment describing why in this commit would be nice. > --- > drivers/pci/msi.c | 11 +++++------ > 1 files changed, 5 insertions(+), 6 deletions(-) > > diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c > index d5f90d6..b43f391 100644 > --- a/drivers/pci/msi.c > +++ b/drivers/pci/msi.c > @@ -719,7 +719,7 @@ static int msix_capability_init(struct pci_dev *dev, > > ret = arch_setup_msi_irqs(dev, nvec, PCI_CAP_ID_MSIX); > if (ret) > - goto error; > + goto out_avail; > > /* > * Some devices require MSI-X to be enabled before we can touch the > @@ -732,10 +732,8 @@ static int msix_capability_init(struct pci_dev *dev, > msix_program_entries(dev, entries); > > ret = populate_msi_sysfs(dev); > - if (ret) { > - ret = 0; > - goto error; > - } > + if (ret) > + goto out_free; > > /* Set MSI-X enabled bits and unmask the function */ > pci_intx_for_msi(dev, 0); > @@ -746,7 +744,7 @@ static int msix_capability_init(struct pci_dev *dev, > > return 0; > > -error: > +out_avail: > if (ret < 0) { > /* > * If we had some success, report the number of irqs > @@ -763,6 +761,7 @@ error: > ret = avail; > } > > +out_free: > free_msi_irqs(dev); > > return ret; > -- > 1.7.7.6 > -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html From mboxrd@z Thu Jan 1 00:00:00 1970 Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 03 Oct 2013 02:39:22 +0200 (CEST) Received: from mga09.intel.com ([134.134.136.24]:61639 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP id S6868565Ab3JCAjSp0Yol (ORCPT ); Thu, 3 Oct 2013 02:39:18 +0200 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 02 Oct 2013 17:35:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.90,1022,1371106800"; d="scan'208";a="387026724" Received: from jonmason-lab.ch.intel.com (HELO jonmason-lab) ([143.182.51.14]) by orsmga001.jf.intel.com with ESMTP; 02 Oct 2013 17:39:05 -0700 Date: Wed, 2 Oct 2013 17:39:05 -0700 From: Jon Mason To: Alexander Gordeev Cc: linux-kernel@vger.kernel.org, Bjorn Helgaas , Ralf Baechle , Michael Ellerman , Benjamin Herrenschmidt , Martin Schwidefsky , Ingo Molnar , Tejun Heo , Dan Williams , Andy King , Matt Porter , stable@vger.kernel.org, linux-pci@vger.kernel.org, linux-mips@linux-mips.org, linuxppc-dev@lists.ozlabs.org, linux390@de.ibm.com, linux-s390@vger.kernel.org, x86@kernel.org, linux-ide@vger.kernel.org, iss_storagedev@hp.com, linux-nvme@lists.infradead.org, linux-rdma@vger.kernel.org, netdev@vger.kernel.org, e1000-devel@lists.sourceforge.net, linux-driver@qlogic.com, Solarflare linux maintainers , "VMware, Inc." , linux-scsi@vger.kernel.org Subject: Re: [PATCH RFC 01/77] PCI/MSI: Fix return value when populate_msi_sysfs() failed Message-ID: <20131003003905.GK6768@jonmason-lab> References: <3ff5236944aae69f2cd934b5b6da7c1c269df7c1.1380703262.git.agordeev@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <3ff5236944aae69f2cd934b5b6da7c1c269df7c1.1380703262.git.agordeev@redhat.com> User-Agent: Mutt/1.5.21 (2010-09-15) Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 38173 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: jon.mason@intel.com Precedence: bulk List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: linux-mips X-List-ID: linux-mips List-subscribe: List-owner: List-post: List-archive: X-list: linux-mips On Wed, Oct 02, 2013 at 12:48:17PM +0200, Alexander Gordeev wrote: > Signed-off-by: Alexander Gordeev Since you are changing the behavior of the msix_capability_init function on populate_msi_sysfs error, a comment describing why in this commit would be nice. > --- > drivers/pci/msi.c | 11 +++++------ > 1 files changed, 5 insertions(+), 6 deletions(-) > > diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c > index d5f90d6..b43f391 100644 > --- a/drivers/pci/msi.c > +++ b/drivers/pci/msi.c > @@ -719,7 +719,7 @@ static int msix_capability_init(struct pci_dev *dev, > > ret = arch_setup_msi_irqs(dev, nvec, PCI_CAP_ID_MSIX); > if (ret) > - goto error; > + goto out_avail; > > /* > * Some devices require MSI-X to be enabled before we can touch the > @@ -732,10 +732,8 @@ static int msix_capability_init(struct pci_dev *dev, > msix_program_entries(dev, entries); > > ret = populate_msi_sysfs(dev); > - if (ret) { > - ret = 0; > - goto error; > - } > + if (ret) > + goto out_free; > > /* Set MSI-X enabled bits and unmask the function */ > pci_intx_for_msi(dev, 0); > @@ -746,7 +744,7 @@ static int msix_capability_init(struct pci_dev *dev, > > return 0; > > -error: > +out_avail: > if (ret < 0) { > /* > * If we had some success, report the number of irqs > @@ -763,6 +761,7 @@ error: > ret = avail; > } > > +out_free: > free_msi_irqs(dev); > > return ret; > -- > 1.7.7.6 > From mboxrd@z Thu Jan 1 00:00:00 1970 From: jon.mason@intel.com (Jon Mason) Date: Wed, 2 Oct 2013 17:39:05 -0700 Subject: [PATCH RFC 01/77] PCI/MSI: Fix return value when populate_msi_sysfs() failed In-Reply-To: <3ff5236944aae69f2cd934b5b6da7c1c269df7c1.1380703262.git.agordeev@redhat.com> References: <3ff5236944aae69f2cd934b5b6da7c1c269df7c1.1380703262.git.agordeev@redhat.com> Message-ID: <20131003003905.GK6768@jonmason-lab> On Wed, Oct 02, 2013@12:48:17PM +0200, Alexander Gordeev wrote: > Signed-off-by: Alexander Gordeev Since you are changing the behavior of the msix_capability_init function on populate_msi_sysfs error, a comment describing why in this commit would be nice. > --- > drivers/pci/msi.c | 11 +++++------ > 1 files changed, 5 insertions(+), 6 deletions(-) > > diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c > index d5f90d6..b43f391 100644 > --- a/drivers/pci/msi.c > +++ b/drivers/pci/msi.c > @@ -719,7 +719,7 @@ static int msix_capability_init(struct pci_dev *dev, > > ret = arch_setup_msi_irqs(dev, nvec, PCI_CAP_ID_MSIX); > if (ret) > - goto error; > + goto out_avail; > > /* > * Some devices require MSI-X to be enabled before we can touch the > @@ -732,10 +732,8 @@ static int msix_capability_init(struct pci_dev *dev, > msix_program_entries(dev, entries); > > ret = populate_msi_sysfs(dev); > - if (ret) { > - ret = 0; > - goto error; > - } > + if (ret) > + goto out_free; > > /* Set MSI-X enabled bits and unmask the function */ > pci_intx_for_msi(dev, 0); > @@ -746,7 +744,7 @@ static int msix_capability_init(struct pci_dev *dev, > > return 0; > > -error: > +out_avail: > if (ret < 0) { > /* > * If we had some success, report the number of irqs > @@ -763,6 +761,7 @@ error: > ret = avail; > } > > +out_free: > free_msi_irqs(dev); > > return ret; > -- > 1.7.7.6 > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by ozlabs.org (Postfix) with ESMTP id 3D22C2C00AC for ; Thu, 3 Oct 2013 10:39:09 +1000 (EST) Date: Wed, 2 Oct 2013 17:39:05 -0700 From: Jon Mason To: Alexander Gordeev Subject: Re: [PATCH RFC 01/77] PCI/MSI: Fix return value when populate_msi_sysfs() failed Message-ID: <20131003003905.GK6768@jonmason-lab> References: <3ff5236944aae69f2cd934b5b6da7c1c269df7c1.1380703262.git.agordeev@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <3ff5236944aae69f2cd934b5b6da7c1c269df7c1.1380703262.git.agordeev@redhat.com> Cc: linux-mips@linux-mips.org, "VMware, Inc." , linux-nvme@lists.infradead.org, linux-ide@vger.kernel.org, stable@vger.kernel.org, linux-s390@vger.kernel.org, Andy King , linux-scsi@vger.kernel.org, linux-rdma@vger.kernel.org, x86@kernel.org, Ingo Molnar , linux-pci@vger.kernel.org, iss_storagedev@hp.com, linux-driver@qlogic.com, Tejun Heo , Bjorn Helgaas , Dan Williams , Solarflare linux maintainers , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Ralf Baechle , e1000-devel@lists.sourceforge.net, Martin Schwidefsky , linux390@de.ibm.com, linuxppc-dev@lists.ozlabs.org List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Wed, Oct 02, 2013 at 12:48:17PM +0200, Alexander Gordeev wrote: > Signed-off-by: Alexander Gordeev Since you are changing the behavior of the msix_capability_init function on populate_msi_sysfs error, a comment describing why in this commit would be nice. > --- > drivers/pci/msi.c | 11 +++++------ > 1 files changed, 5 insertions(+), 6 deletions(-) > > diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c > index d5f90d6..b43f391 100644 > --- a/drivers/pci/msi.c > +++ b/drivers/pci/msi.c > @@ -719,7 +719,7 @@ static int msix_capability_init(struct pci_dev *dev, > > ret = arch_setup_msi_irqs(dev, nvec, PCI_CAP_ID_MSIX); > if (ret) > - goto error; > + goto out_avail; > > /* > * Some devices require MSI-X to be enabled before we can touch the > @@ -732,10 +732,8 @@ static int msix_capability_init(struct pci_dev *dev, > msix_program_entries(dev, entries); > > ret = populate_msi_sysfs(dev); > - if (ret) { > - ret = 0; > - goto error; > - } > + if (ret) > + goto out_free; > > /* Set MSI-X enabled bits and unmask the function */ > pci_intx_for_msi(dev, 0); > @@ -746,7 +744,7 @@ static int msix_capability_init(struct pci_dev *dev, > > return 0; > > -error: > +out_avail: > if (ret < 0) { > /* > * If we had some success, report the number of irqs > @@ -763,6 +761,7 @@ error: > ret = avail; > } > > +out_free: > free_msi_irqs(dev); > > return ret; > -- > 1.7.7.6 > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jon Mason Subject: Re: [PATCH RFC 01/77] PCI/MSI: Fix return value when populate_msi_sysfs() failed Date: Wed, 2 Oct 2013 17:39:05 -0700 Message-ID: <20131003003905.GK6768@jonmason-lab> References: <3ff5236944aae69f2cd934b5b6da7c1c269df7c1.1380703262.git.agordeev@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Bjorn Helgaas , Ralf Baechle , Michael Ellerman , Benjamin Herrenschmidt , Martin Schwidefsky , Ingo Molnar , Tejun Heo , Dan Williams , Andy King , Matt Porter , stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-pci-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-mips-6z/3iImG2C8G8FEW9MqTrA@public.gmane.org, linuxppc-dev-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org, linux390-tA70FqPdS9bQT0dZR+AlfA@public.gmane.org, linux-s390-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, x86-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, linux-ide-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, iss_storagedev-VXdhtT5mjnY@public.gmane.org, linux-nvme-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, e1000-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org, linux-driver-h88ZbnxC6KDQT0dZR+AlfA@public.gmane.org, Solarflare linux maintainers , "VMware, Inc." Return-path: Content-Disposition: inline In-Reply-To: <3ff5236944aae69f2cd934b5b6da7c1c269df7c1.1380703262.git.agordeev-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> Sender: linux-rdma-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: netdev.vger.kernel.org On Wed, Oct 02, 2013 at 12:48:17PM +0200, Alexander Gordeev wrote: > Signed-off-by: Alexander Gordeev Since you are changing the behavior of the msix_capability_init function on populate_msi_sysfs error, a comment describing why in this commit would be nice. > --- > drivers/pci/msi.c | 11 +++++------ > 1 files changed, 5 insertions(+), 6 deletions(-) > > diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c > index d5f90d6..b43f391 100644 > --- a/drivers/pci/msi.c > +++ b/drivers/pci/msi.c > @@ -719,7 +719,7 @@ static int msix_capability_init(struct pci_dev *dev, > > ret = arch_setup_msi_irqs(dev, nvec, PCI_CAP_ID_MSIX); > if (ret) > - goto error; > + goto out_avail; > > /* > * Some devices require MSI-X to be enabled before we can touch the > @@ -732,10 +732,8 @@ static int msix_capability_init(struct pci_dev *dev, > msix_program_entries(dev, entries); > > ret = populate_msi_sysfs(dev); > - if (ret) { > - ret = 0; > - goto error; > - } > + if (ret) > + goto out_free; > > /* Set MSI-X enabled bits and unmask the function */ > pci_intx_for_msi(dev, 0); > @@ -746,7 +744,7 @@ static int msix_capability_init(struct pci_dev *dev, > > return 0; > > -error: > +out_avail: > if (ret < 0) { > /* > * If we had some success, report the number of irqs > @@ -763,6 +761,7 @@ error: > ret = avail; > } > > +out_free: > free_msi_irqs(dev); > > return ret; > -- > 1.7.7.6 > -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html