From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from g9t1613g.houston.hp.com ([15.240.0.71]:47259 "EHLO g9t1613g.houston.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754721AbaFBOxM (ORCPT ); Mon, 2 Jun 2014 10:53:12 -0400 Date: Mon, 2 Jun 2014 09:52:06 -0500 From: scameron@beardog.cce.hp.com To: Christoph Hellwig Cc: james.bottomley@parallels.com, webb.scales@hp.com, martin.petersen@oracle.com, linux-scsi@vger.kernel.org, justin.lindley@hp.com, stephenmcameron@gmail.com, joseph.t.handzik@hp.com, thenzl@redhat.com, michael.miller@canonical.com, scott.teel@hp.com, hch@lst.de, dan.carpenter@oracle.com, linux-pci@vger.kernel.org, scameron@beardog.cce.hp.com Subject: Re: [PATCH 2 08/24] hpsa: choose number of reply queues more intelligently. Message-ID: <20140602145206.GH6970@beardog.cce.hp.com> References: <20140529154739.8180.50710.stgit@beardog.cce.hp.com> <20140529155302.8180.17597.stgit@beardog.cce.hp.com> <20140602092751.GA30545@infradead.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <20140602092751.GA30545@infradead.org> Sender: linux-pci-owner@vger.kernel.org List-ID: On Mon, Jun 02, 2014 at 02:27:51AM -0700, Christoph Hellwig wrote: > On Thu, May 29, 2014 at 10:53:02AM -0500, Stephen M. Cameron wrote: > > From: Stephen M. Cameron > > > > No sense having 8 or 16 reply queues if you only have 4 cpus, > > and likewise no sense limiting to 8 reply queues if you have > > many more cpus. > > I've applied this as it looks good as-is, but shouldn't we also > cap the number of MSI-X vectors in common code so that we avoid > adding this as boilerplate code to lots of drivers? Maybe so. Thinking about CPU hotplug, is num_online_cpus() the right cap? Maybe num_possible_cpus() is better in case additional cpus coming online are anticipated? -- steve > > > > > Signed-off-by: Stephen M. Cameron > > Reviewed-by: Mike Miller > > Reviewed-by: Scott Teel > > --- > > drivers/scsi/hpsa.c | 2 ++ > > drivers/scsi/hpsa_cmd.h | 2 +- > > 2 files changed, 3 insertions(+), 1 deletions(-) > > > > diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c > > index b1ecfd8..b903e86 100644 > > --- a/drivers/scsi/hpsa.c > > +++ b/drivers/scsi/hpsa.c > > @@ -6157,6 +6157,8 @@ static void hpsa_interrupt_mode(struct ctlr_info *h) > > if (pci_find_capability(h->pdev, PCI_CAP_ID_MSIX)) { > > dev_info(&h->pdev->dev, "MSIX\n"); > > h->msix_vector = MAX_REPLY_QUEUES; > > + if (h->msix_vector > num_online_cpus()) > > + h->msix_vector = num_online_cpus(); > > err = pci_enable_msix(h->pdev, hpsa_msix_entries, > > h->msix_vector); > > if (err > 0) { > > diff --git a/drivers/scsi/hpsa_cmd.h b/drivers/scsi/hpsa_cmd.h > > index db89245..104b67b 100644 > > --- a/drivers/scsi/hpsa_cmd.h > > +++ b/drivers/scsi/hpsa_cmd.h > > @@ -615,7 +615,7 @@ struct TransTable_struct { > > u32 RepQCount; > > u32 RepQCtrAddrLow32; > > u32 RepQCtrAddrHigh32; > > -#define MAX_REPLY_QUEUES 8 > > +#define MAX_REPLY_QUEUES 64 > > struct vals32 RepQAddr[MAX_REPLY_QUEUES]; > > }; > > > > > > -- > > To unsubscribe from this list: send the line "unsubscribe linux-scsi" in > > the body of a message to majordomo@vger.kernel.org > > More majordomo info at http://vger.kernel.org/majordomo-info.html > ---end quoted text---