From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jon Mason Subject: Re: [PATCH RFC 77/77] vxge: Update MSI/MSI-X interrupts enablement code Date: Wed, 2 Oct 2013 17:29:42 -0700 Message-ID: <20131003002941.GJ6768@jonmason-lab> References: <467ce10b1df795edf80ed222816ab739fee7b0ea.1380703263.git.agordeev@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <467ce10b1df795edf80ed222816ab739fee7b0ea.1380703263.git.agordeev@redhat.com> Sender: netdev-owner@vger.kernel.org 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 , 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@vge List-Id: linux-ide@vger.kernel.org On Wed, Oct 02, 2013 at 12:49:33PM +0200, Alexander Gordeev wrote: > As result of recent re-design of the MSI/MSI-X interrupts enabling > pattern this driver has to be updated to use the new technique to > obtain a optimal number of MSI/MSI-X interrupts required. > > Signed-off-by: Alexander Gordeev > --- > drivers/net/ethernet/neterion/vxge/vxge-main.c | 36 ++++++++++------------- > 1 files changed, 16 insertions(+), 20 deletions(-) > > diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c > index b81ff8b..b4d40dd 100644 > --- a/drivers/net/ethernet/neterion/vxge/vxge-main.c > +++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c > @@ -2297,7 +2297,21 @@ static int vxge_alloc_msix(struct vxgedev *vdev) > int msix_intr_vect = 0, temp; > vdev->intr_cnt = 0; > > -start: > + ret = pci_msix_table_size(vdev->pdev); > + if (ret < 0) > + goto alloc_entries_failed; > + > + if (ret < (vdev->no_of_vpath * 2 + 1)) { > + if ((max_config_vpath != VXGE_USE_DEFAULT) || (ret < 3)) { > + ret = -ENOSPC; > + goto alloc_entries_failed; > + } > + /* Try with less no of vector by reducing no of vpaths count */ > + temp = (ret - 1)/2; > + vxge_close_vpaths(vdev, temp); > + vdev->no_of_vpath = temp; > + } The original code was ugly (not my code, so I can say that). I'd like to see it a little stream lined. Something like: vdev->intr_cnt = pci_msix_table_size(vdev->pdev); if (vdev->intr_cnt % 2 == 0) vdev->intr_cnt--; if (vdev->intr_cnt < 3 || max_config_vpath != VXGE_USE_DEFAULT) goto alloc_entries_failed; if (vdev->intr_cnt != vdev->no_of_vpath * 2 + 1) { vxge_close_vpaths(vdev, vdev->intr_cnt / 2); vdev->no_of_vpath = vdev->intr_cnt / 2; } > + > /* Tx/Rx MSIX Vectors count */ > vdev->intr_cnt = vdev->no_of_vpath * 2; > > @@ -2347,25 +2361,7 @@ start: > vdev->vxge_entries[j].in_use = 0; > > ret = pci_enable_msix(vdev->pdev, vdev->entries, vdev->intr_cnt); > - if (ret > 0) { > - vxge_debug_init(VXGE_ERR, > - "%s: MSI-X enable failed for %d vectors, ret: %d", > - VXGE_DRIVER_NAME, vdev->intr_cnt, ret); > - if ((max_config_vpath != VXGE_USE_DEFAULT) || (ret < 3)) { > - ret = -ENOSPC; > - goto enable_msix_failed; > - } > - > - kfree(vdev->entries); > - kfree(vdev->vxge_entries); > - vdev->entries = NULL; > - vdev->vxge_entries = NULL; > - /* Try with less no of vector by reducing no of vpaths count */ > - temp = (ret - 1)/2; > - vxge_close_vpaths(vdev, temp); > - vdev->no_of_vpath = temp; > - goto start; > - } else if (ret < 0) > + if (ret) > goto enable_msix_failed; Nit, space here please. > return 0; > > -- > 1.7.7.6 > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753660Ab3JCA3v (ORCPT ); Wed, 2 Oct 2013 20:29:51 -0400 Received: from mga03.intel.com ([143.182.124.21]:54365 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753216Ab3JCA3s (ORCPT ); Wed, 2 Oct 2013 20:29:48 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.90,1022,1371106800"; d="scan'208";a="404515001" Date: Wed, 2 Oct 2013 17:29:42 -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 , 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 77/77] vxge: Update MSI/MSI-X interrupts enablement code Message-ID: <20131003002941.GJ6768@jonmason-lab> References: <467ce10b1df795edf80ed222816ab739fee7b0ea.1380703263.git.agordeev@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <467ce10b1df795edf80ed222816ab739fee7b0ea.1380703263.git.agordeev@redhat.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Oct 02, 2013 at 12:49:33PM +0200, Alexander Gordeev wrote: > As result of recent re-design of the MSI/MSI-X interrupts enabling > pattern this driver has to be updated to use the new technique to > obtain a optimal number of MSI/MSI-X interrupts required. > > Signed-off-by: Alexander Gordeev > --- > drivers/net/ethernet/neterion/vxge/vxge-main.c | 36 ++++++++++------------- > 1 files changed, 16 insertions(+), 20 deletions(-) > > diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c > index b81ff8b..b4d40dd 100644 > --- a/drivers/net/ethernet/neterion/vxge/vxge-main.c > +++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c > @@ -2297,7 +2297,21 @@ static int vxge_alloc_msix(struct vxgedev *vdev) > int msix_intr_vect = 0, temp; > vdev->intr_cnt = 0; > > -start: > + ret = pci_msix_table_size(vdev->pdev); > + if (ret < 0) > + goto alloc_entries_failed; > + > + if (ret < (vdev->no_of_vpath * 2 + 1)) { > + if ((max_config_vpath != VXGE_USE_DEFAULT) || (ret < 3)) { > + ret = -ENOSPC; > + goto alloc_entries_failed; > + } > + /* Try with less no of vector by reducing no of vpaths count */ > + temp = (ret - 1)/2; > + vxge_close_vpaths(vdev, temp); > + vdev->no_of_vpath = temp; > + } The original code was ugly (not my code, so I can say that). I'd like to see it a little stream lined. Something like: vdev->intr_cnt = pci_msix_table_size(vdev->pdev); if (vdev->intr_cnt % 2 == 0) vdev->intr_cnt--; if (vdev->intr_cnt < 3 || max_config_vpath != VXGE_USE_DEFAULT) goto alloc_entries_failed; if (vdev->intr_cnt != vdev->no_of_vpath * 2 + 1) { vxge_close_vpaths(vdev, vdev->intr_cnt / 2); vdev->no_of_vpath = vdev->intr_cnt / 2; } > + > /* Tx/Rx MSIX Vectors count */ > vdev->intr_cnt = vdev->no_of_vpath * 2; > > @@ -2347,25 +2361,7 @@ start: > vdev->vxge_entries[j].in_use = 0; > > ret = pci_enable_msix(vdev->pdev, vdev->entries, vdev->intr_cnt); > - if (ret > 0) { > - vxge_debug_init(VXGE_ERR, > - "%s: MSI-X enable failed for %d vectors, ret: %d", > - VXGE_DRIVER_NAME, vdev->intr_cnt, ret); > - if ((max_config_vpath != VXGE_USE_DEFAULT) || (ret < 3)) { > - ret = -ENOSPC; > - goto enable_msix_failed; > - } > - > - kfree(vdev->entries); > - kfree(vdev->vxge_entries); > - vdev->entries = NULL; > - vdev->vxge_entries = NULL; > - /* Try with less no of vector by reducing no of vpaths count */ > - temp = (ret - 1)/2; > - vxge_close_vpaths(vdev, temp); > - vdev->no_of_vpath = temp; > - goto start; > - } else if (ret < 0) > + if (ret) > goto enable_msix_failed; Nit, space here please. > return 0; > > -- > 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:29:42 -0700 Subject: [PATCH RFC 77/77] vxge: Update MSI/MSI-X interrupts enablement code In-Reply-To: <467ce10b1df795edf80ed222816ab739fee7b0ea.1380703263.git.agordeev@redhat.com> References: <467ce10b1df795edf80ed222816ab739fee7b0ea.1380703263.git.agordeev@redhat.com> Message-ID: <20131003002941.GJ6768@jonmason-lab> On Wed, Oct 02, 2013@12:49:33PM +0200, Alexander Gordeev wrote: > As result of recent re-design of the MSI/MSI-X interrupts enabling > pattern this driver has to be updated to use the new technique to > obtain a optimal number of MSI/MSI-X interrupts required. > > Signed-off-by: Alexander Gordeev > --- > drivers/net/ethernet/neterion/vxge/vxge-main.c | 36 ++++++++++------------- > 1 files changed, 16 insertions(+), 20 deletions(-) > > diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c > index b81ff8b..b4d40dd 100644 > --- a/drivers/net/ethernet/neterion/vxge/vxge-main.c > +++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c > @@ -2297,7 +2297,21 @@ static int vxge_alloc_msix(struct vxgedev *vdev) > int msix_intr_vect = 0, temp; > vdev->intr_cnt = 0; > > -start: > + ret = pci_msix_table_size(vdev->pdev); > + if (ret < 0) > + goto alloc_entries_failed; > + > + if (ret < (vdev->no_of_vpath * 2 + 1)) { > + if ((max_config_vpath != VXGE_USE_DEFAULT) || (ret < 3)) { > + ret = -ENOSPC; > + goto alloc_entries_failed; > + } > + /* Try with less no of vector by reducing no of vpaths count */ > + temp = (ret - 1)/2; > + vxge_close_vpaths(vdev, temp); > + vdev->no_of_vpath = temp; > + } The original code was ugly (not my code, so I can say that). I'd like to see it a little stream lined. Something like: vdev->intr_cnt = pci_msix_table_size(vdev->pdev); if (vdev->intr_cnt % 2 == 0) vdev->intr_cnt--; if (vdev->intr_cnt < 3 || max_config_vpath != VXGE_USE_DEFAULT) goto alloc_entries_failed; if (vdev->intr_cnt != vdev->no_of_vpath * 2 + 1) { vxge_close_vpaths(vdev, vdev->intr_cnt / 2); vdev->no_of_vpath = vdev->intr_cnt / 2; } > + > /* Tx/Rx MSIX Vectors count */ > vdev->intr_cnt = vdev->no_of_vpath * 2; > > @@ -2347,25 +2361,7 @@ start: > vdev->vxge_entries[j].in_use = 0; > > ret = pci_enable_msix(vdev->pdev, vdev->entries, vdev->intr_cnt); > - if (ret > 0) { > - vxge_debug_init(VXGE_ERR, > - "%s: MSI-X enable failed for %d vectors, ret: %d", > - VXGE_DRIVER_NAME, vdev->intr_cnt, ret); > - if ((max_config_vpath != VXGE_USE_DEFAULT) || (ret < 3)) { > - ret = -ENOSPC; > - goto enable_msix_failed; > - } > - > - kfree(vdev->entries); > - kfree(vdev->vxge_entries); > - vdev->entries = NULL; > - vdev->vxge_entries = NULL; > - /* Try with less no of vector by reducing no of vpaths count */ > - temp = (ret - 1)/2; > - vxge_close_vpaths(vdev, temp); > - vdev->no_of_vpath = temp; > - goto start; > - } else if (ret < 0) > + if (ret) > goto enable_msix_failed; Nit, space here please. > return 0; > > -- > 1.7.7.6 > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by ozlabs.org (Postfix) with ESMTP id DDB5C2C00BB for ; Thu, 3 Oct 2013 10:29:49 +1000 (EST) Date: Wed, 2 Oct 2013 17:29:42 -0700 From: Jon Mason To: Alexander Gordeev Subject: Re: [PATCH RFC 77/77] vxge: Update MSI/MSI-X interrupts enablement code Message-ID: <20131003002941.GJ6768@jonmason-lab> References: <467ce10b1df795edf80ed222816ab739fee7b0ea.1380703263.git.agordeev@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <467ce10b1df795edf80ed222816ab739fee7b0ea.1380703263.git.agordeev@redhat.com> Cc: linux-mips@linux-mips.org, "VMware, Inc." , linux-nvme@lists.infradead.org, linux-ide@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:49:33PM +0200, Alexander Gordeev wrote: > As result of recent re-design of the MSI/MSI-X interrupts enabling > pattern this driver has to be updated to use the new technique to > obtain a optimal number of MSI/MSI-X interrupts required. > > Signed-off-by: Alexander Gordeev > --- > drivers/net/ethernet/neterion/vxge/vxge-main.c | 36 ++++++++++------------- > 1 files changed, 16 insertions(+), 20 deletions(-) > > diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c > index b81ff8b..b4d40dd 100644 > --- a/drivers/net/ethernet/neterion/vxge/vxge-main.c > +++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c > @@ -2297,7 +2297,21 @@ static int vxge_alloc_msix(struct vxgedev *vdev) > int msix_intr_vect = 0, temp; > vdev->intr_cnt = 0; > > -start: > + ret = pci_msix_table_size(vdev->pdev); > + if (ret < 0) > + goto alloc_entries_failed; > + > + if (ret < (vdev->no_of_vpath * 2 + 1)) { > + if ((max_config_vpath != VXGE_USE_DEFAULT) || (ret < 3)) { > + ret = -ENOSPC; > + goto alloc_entries_failed; > + } > + /* Try with less no of vector by reducing no of vpaths count */ > + temp = (ret - 1)/2; > + vxge_close_vpaths(vdev, temp); > + vdev->no_of_vpath = temp; > + } The original code was ugly (not my code, so I can say that). I'd like to see it a little stream lined. Something like: vdev->intr_cnt = pci_msix_table_size(vdev->pdev); if (vdev->intr_cnt % 2 == 0) vdev->intr_cnt--; if (vdev->intr_cnt < 3 || max_config_vpath != VXGE_USE_DEFAULT) goto alloc_entries_failed; if (vdev->intr_cnt != vdev->no_of_vpath * 2 + 1) { vxge_close_vpaths(vdev, vdev->intr_cnt / 2); vdev->no_of_vpath = vdev->intr_cnt / 2; } > + > /* Tx/Rx MSIX Vectors count */ > vdev->intr_cnt = vdev->no_of_vpath * 2; > > @@ -2347,25 +2361,7 @@ start: > vdev->vxge_entries[j].in_use = 0; > > ret = pci_enable_msix(vdev->pdev, vdev->entries, vdev->intr_cnt); > - if (ret > 0) { > - vxge_debug_init(VXGE_ERR, > - "%s: MSI-X enable failed for %d vectors, ret: %d", > - VXGE_DRIVER_NAME, vdev->intr_cnt, ret); > - if ((max_config_vpath != VXGE_USE_DEFAULT) || (ret < 3)) { > - ret = -ENOSPC; > - goto enable_msix_failed; > - } > - > - kfree(vdev->entries); > - kfree(vdev->vxge_entries); > - vdev->entries = NULL; > - vdev->vxge_entries = NULL; > - /* Try with less no of vector by reducing no of vpaths count */ > - temp = (ret - 1)/2; > - vxge_close_vpaths(vdev, temp); > - vdev->no_of_vpath = temp; > - goto start; > - } else if (ret < 0) > + if (ret) > goto enable_msix_failed; Nit, space here please. > return 0; > > -- > 1.7.7.6 >