From: Huacai Chen <chenhc@lemote.com>
To: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org, Fuxin Zhang <zhangfx@lemote.com>,
Zhangjin Wu <wuzhangjin@gmail.com>,
Huacai Chen <chenhc@lemote.com>,
stable@vger.kernel.org, Christoph Hellwig <hch@lst.de>,
Michael Hernandez <michael.hernandez@cavium.com>
Subject: [PATCH] genirq/affinity: Assign default affinity to pre/post vectors
Date: Mon, 31 Dec 2018 11:03:24 +0800 [thread overview]
Message-ID: <1546225404-6775-1-git-send-email-chenhc@lemote.com> (raw)
Generally, irq_create_affinity_masks() assign default affinity to pre/
post vectors correctly. However, it ignore the case that there are only
pre/post vectors (when nvecs == affd->pre_vectors + affd->post_vectors)
and return NULL. This case usually happens when nvecs = 1 (e.g. in nvme
driver when MSI-X is unavailable and fallback to MSI) and will trigger
the warning in pci_irq_get_affinity(). This patch fix the corner case.
Fixes: 6f9a22bc5775d231ab8f ("PCI/MSI: Ignore affinity if pre/post vector count is more than min_vecs")
Cc: stable@vger.kernel.org
Cc: Christoph Hellwig <hch@lst.de>
Cc: Michael Hernandez <michael.hernandez@cavium.com>
Signed-off-by: Huacai Chen <chenhc@lemote.com>
---
kernel/irq/affinity.c | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/kernel/irq/affinity.c b/kernel/irq/affinity.c
index 45b68b4..9b766eb 100644
--- a/kernel/irq/affinity.c
+++ b/kernel/irq/affinity.c
@@ -240,13 +240,6 @@ irq_create_affinity_masks(int nvecs, const struct irq_affinity *affd)
struct irq_affinity_desc *masks = NULL;
int i, nr_sets;
- /*
- * If there aren't any vectors left after applying the pre/post
- * vectors don't bother with assigning affinity.
- */
- if (nvecs == affd->pre_vectors + affd->post_vectors)
- return NULL;
-
node_to_cpumask = alloc_node_to_cpumask();
if (!node_to_cpumask)
return NULL;
@@ -255,6 +248,17 @@ irq_create_affinity_masks(int nvecs, const struct irq_affinity *affd)
if (!masks)
goto outnodemsk;
+ /*
+ * If there aren't any vectors left after applying the pre/post
+ * vectors then just assign the default affinity to all vectors.
+ */
+ if (nvecs == affd->pre_vectors + affd->post_vectors) {
+ /* Fill all vectors that don't need affinity */
+ for (curvec = 0; curvec < nvecs; curvec++)
+ cpumask_copy(&masks[curvec].mask, irq_default_affinity);
+ goto outnodemsk;
+ }
+
/* Fill out vectors at the beginning that don't need affinity */
for (curvec = 0; curvec < affd->pre_vectors; curvec++)
cpumask_copy(&masks[curvec].mask, irq_default_affinity);
--
2.7.0
next reply other threads:[~2018-12-31 3:02 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-31 3:03 Huacai Chen [this message]
2019-01-15 19:10 ` [PATCH] genirq/affinity: Assign default affinity to pre/post vectors Thomas Gleixner
2019-01-16 3:00 ` 陈华才
2019-01-16 9:26 ` Thomas Gleixner
2019-01-17 1:14 ` 陈华才
2019-01-18 1:52 ` Huacai Chen
2019-01-22 21:04 ` Thomas Gleixner
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=1546225404-6775-1-git-send-email-chenhc@lemote.com \
--to=chenhc@lemote.com \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=michael.hernandez@cavium.com \
--cc=stable@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=wuzhangjin@gmail.com \
--cc=zhangfx@lemote.com \
/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).