From mboxrd@z Thu Jan 1 00:00:00 1970 Received: with ECARTIS (v1.0.0; list linux-mips); Mon, 07 Oct 2013 20:36:59 +0200 (CEST) Received: from mx1.redhat.com ([209.132.183.28]:61143 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP id S6868730Ab3JGSgzyrZgS (ORCPT ); Mon, 7 Oct 2013 20:36:55 +0200 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r97Iaddo024061 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 7 Oct 2013 14:36:40 -0400 Received: from dhcp-26-207.brq.redhat.com (vpn-57-75.rdu2.redhat.com [10.10.57.75]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r97IaU9U024649 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Mon, 7 Oct 2013 14:36:32 -0400 Date: Mon, 7 Oct 2013 20:38:45 +0200 From: Alexander Gordeev To: Jon Mason 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 54/77] ntb: Ensure number of MSIs on SNB is enough for the link interrupt Message-ID: <20131007183845.GA1834@dhcp-26-207.brq.redhat.com> References: <5d9c5b2d3bbc444ff32bddeece7a239d046bd79c.1380703263.git.agordeev@redhat.com> <20131003004805.GL6768@jonmason-lab> <20131005214303.GA21589@dhcp-26-207.brq.redhat.com> <20131007165056.GA24536@jonmason-lab> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20131007165056.GA24536@jonmason-lab> User-Agent: Mutt/1.5.21 (2010-09-15) X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 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: 38240 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: agordeev@redhat.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 Mon, Oct 07, 2013 at 09:50:57AM -0700, Jon Mason wrote: > On Sat, Oct 05, 2013 at 11:43:04PM +0200, Alexander Gordeev wrote: > > On Wed, Oct 02, 2013 at 05:48:05PM -0700, Jon Mason wrote: > > > On Wed, Oct 02, 2013 at 12:49:10PM +0200, Alexander Gordeev wrote: > > > > Signed-off-by: Alexander Gordeev > > > > --- > > > > drivers/ntb/ntb_hw.c | 2 +- > > > > 1 files changed, 1 insertions(+), 1 deletions(-) > > > > > > > > diff --git a/drivers/ntb/ntb_hw.c b/drivers/ntb/ntb_hw.c > > > > index de2062c..eccd5e5 100644 > > > > --- a/drivers/ntb/ntb_hw.c > > > > +++ b/drivers/ntb/ntb_hw.c > > > > @@ -1066,7 +1066,7 @@ static int ntb_setup_msix(struct ntb_device *ndev) > > > > /* On SNB, the link interrupt is always tied to 4th vector. If > > > > * we can't get all 4, then we can't use MSI-X. > > > > */ > > > > - if (ndev->hw_type != BWD_HW) { > > > > + if ((rc < SNB_MSIX_CNT) && (ndev->hw_type != BWD_HW)) { > > > > > > Nack, this check is unnecessary. > > > > If SNB can do more than SNB_MSIX_CNT MSI-Xs then this check is needed > > to enable less than maximum MSI-Xs in case the maximum was not allocated. > > Otherwise SNB will fallback to single MSI instead of multiple MSI-Xs. > > Per the comment in the code snippet above, "If we can't get all 4, > then we can't use MSI-X". There is already a check to see if more > than 4 were acquired. So it's not possible to hit this. Even if it > was, don't use SNB_MSIX_CNT here (limits.msix_cnt is the preferred > variable). Also, the "()" are unnecessary. The changelog is definitely bogus. I meant here an improvement to the existing scheme, not a conversion to the new one: msix_entries = msix_table_size(val); Getting i.e. 16 vectors here. if (msix_entries > ndev->limits.msix_cnt) { rc = -EINVAL; goto err; } Upper limit check i.e. succeeds. [...] rc = pci_enable_msix(pdev, ndev->msix_entries, msix_entries); pci_enable_msix() does not success and returns i.e. 8 here, should retry. if (rc < 0) goto err1; if (rc > 0) { /* On SNB, the link interrupt is always tied to 4th vector. If * we can't get all 4, then we can't use MSI-X. */ if (ndev->hw_type != BWD_HW) { On SNB bail out here, although could have continue with 8 vectors. Can only use SNB_MSIX_CNT here, since limits.msix_cnt is the upper limit. rc = -EIO; goto err1; } [...] } -- Regards, Alexander Gordeev agordeev@redhat.com