From: Himanshu Madhani <himanshu.madhani@cavium.com>
To: <bhelgaas@google.com>, <linux-pci@vger.kernel.org>, <hch@lst.de>
Cc: <himanshu.madhani@cavium.com>
Subject: [PATCH] PCI/MSI: Only disable affinity settings if pre and post vector count is equal to max_vecs and not min_vecs
Date: Wed, 1 Mar 2017 15:31:58 -0800 [thread overview]
Message-ID: <20170301233158.1035-1-himanshu.madhani@cavium.com> (raw)
From: Michael Hernandez <michael.hernandez@cavium.com>
min_vecs is the minimum amount of vectors needed to operate in MSI-X mode
which may just include the vectors that don't need affinity.
Disabling affinity settings causes the qla2xxx driver scsi_add_host
to fail when blk_mq is enabled as the blk_mq_pci_map_queues expects
affinity masks on each vector.
v2 --> v3
o fixed code as per review comments.
v1 --> v2
o Moved the check from pci_alloc_irq_vectors_affinity() to
__pci_enable_{msi|msix}_range()
Fixes: dfef358 ("PCI/MSI: Don't apply affinity if there aren't enough vectors left")
Signed-off-by: Michael Hernandez <michael.hernandez@cavium.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: stable@vger.kernel.org
---
drivers/pci/msi.c | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 7f73bac..46c0cdd 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -1091,6 +1091,15 @@ static int __pci_enable_msi_range(struct pci_dev *dev, int minvec, int maxvec,
for (;;) {
if (affd) {
+ /*
+ * If there aren't any vectors left after applying the
+ * pre/post vectors don't bother with assigning
+ * affinity.
+ */
+ if (affd->pre_vectors + affd->post_vectors == nvec)
+ affd = NULL;
+ }
+ if (affd) {
nvec = irq_calc_affinity_vectors(nvec, affd);
if (nvec < minvec)
return -ENOSPC;
@@ -1138,6 +1147,15 @@ static int __pci_enable_msix_range(struct pci_dev *dev,
for (;;) {
if (affd) {
+ /*
+ * If there aren't any vectors left after applying the
+ * pre/post vectors don't bother with assigning
+ * affinity.
+ */
+ if (affd->pre_vectors + affd->post_vectors == nvec)
+ affd = NULL;
+ }
+ if (affd) {
nvec = irq_calc_affinity_vectors(nvec, affd);
if (nvec < minvec)
return -ENOSPC;
@@ -1209,13 +1227,6 @@ int pci_alloc_irq_vectors_affinity(struct pci_dev *dev, unsigned int min_vecs,
if (affd->pre_vectors + affd->post_vectors > min_vecs)
return -EINVAL;
-
- /*
- * If there aren't any vectors left after applying the pre/post
- * vectors don't bother with assigning affinity.
- */
- if (affd->pre_vectors + affd->post_vectors == min_vecs)
- affd = NULL;
} else {
if (WARN_ON(affd))
affd = NULL;
--
1.7.1
next reply other threads:[~2017-03-01 23:33 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-01 23:31 Himanshu Madhani [this message]
2017-03-01 23:49 ` [PATCH] PCI/MSI: Only disable affinity settings if pre and post vector count is equal to max_vecs and not min_vecs Christoph Hellwig
2017-03-07 19:00 ` Madhani, Himanshu
2017-03-07 21:08 ` Bjorn Helgaas
2017-03-23 17:29 ` Bjorn Helgaas
2017-03-30 23:21 ` Bjorn Helgaas
2017-03-30 23:25 ` Himanshu Madhani
2017-03-31 0:09 ` Bjorn Helgaas
-- strict thread matches above, loose matches on Subject: below --
2017-04-18 1:19 Himanshu Madhani
2017-05-17 22:28 ` Bjorn Helgaas
2017-05-18 16:02 ` Himanshu Madhani
2017-04-17 21:26 Himanshu Madhani
2017-04-18 0:01 ` kbuild test robot
2017-02-23 21:01 Himanshu Madhani
2017-02-28 22:05 ` Madhani, Himanshu
2017-03-01 15:20 ` Christoph Hellwig
2017-03-01 23:27 ` Madhani, Himanshu
2017-02-23 6:12 Himanshu Madhani
2017-02-23 10:30 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170301233158.1035-1-himanshu.madhani@cavium.com \
--to=himanshu.madhani@cavium.com \
--cc=bhelgaas@google.com \
--cc=hch@lst.de \
--cc=linux-pci@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).