From: Ming Lei <ming.lei@redhat.com>
To: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org, Ming Lei <ming.lei@redhat.com>,
Bjorn Helgaas <helgaas@kernel.org>,
linux-pci@vger.kernel.org, Christoph Hellwig <hch@lst.de>
Subject: [PATCH V2] genirq/affinity: add helper of irq_affinity_calc_sets
Date: Tue, 20 Jul 2021 12:42:09 +0800 [thread overview]
Message-ID: <20210720044209.851141-1-ming.lei@redhat.com> (raw)
When driver requests to allocate irq affinity managed vectors,
pci_alloc_irq_vectors_affinity() may fallback to single vector
allocation. In this situation, we don't need to call
irq_create_affinity_masks for calling into ->calc_sets() for
avoiding potential memory leak, so add the helper for this purpose.
Fixes: c66d4bd110a1 ("genirq/affinity: Add new callback for (re)calculating interrupt sets")
Reported-by: Bjorn Helgaas <helgaas@kernel.org>
Cc: linux-pci@vger.kernel.org
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Ming Lei <ming.lei@redhat.com>
---
V2:
- move WARN_ON_ONCE() into irq_affinity_calc_sets
- don't install default calc_sets() callback as suggested by
Christoph
drivers/pci/msi.c | 3 ++-
include/linux/interrupt.h | 7 +++++++
kernel/irq/affinity.c | 28 +++++++++++++++++-----------
3 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 9232255c8515..4e6fbdf0741c 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -1224,7 +1224,8 @@ int pci_alloc_irq_vectors_affinity(struct pci_dev *dev, unsigned int min_vecs,
* for the single interrupt case.
*/
if (affd)
- irq_create_affinity_masks(1, affd);
+ irq_affinity_calc_sets(1, affd);
+
pci_intx(dev, 1);
return 1;
}
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 2ed65b01c961..c7ff84d60465 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -340,6 +340,7 @@ irq_create_affinity_masks(unsigned int nvec, struct irq_affinity *affd);
unsigned int irq_calc_affinity_vectors(unsigned int minvec, unsigned int maxvec,
const struct irq_affinity *affd);
+int irq_affinity_calc_sets(unsigned int affvecs, struct irq_affinity *affd);
#else /* CONFIG_SMP */
@@ -391,6 +392,12 @@ irq_calc_affinity_vectors(unsigned int minvec, unsigned int maxvec,
return maxvec;
}
+static inline int irq_affinity_calc_sets(unsigned int affvecs,
+ struct irq_affinity *affd)
+{
+ return 0;
+}
+
#endif /* CONFIG_SMP */
/*
diff --git a/kernel/irq/affinity.c b/kernel/irq/affinity.c
index 4d89ad4fae3b..addd04d68d42 100644
--- a/kernel/irq/affinity.c
+++ b/kernel/irq/affinity.c
@@ -405,6 +405,22 @@ static void default_calc_sets(struct irq_affinity *affd, unsigned int affvecs)
affd->set_size[0] = affvecs;
}
+int irq_affinity_calc_sets(unsigned int affvecs, struct irq_affinity *affd)
+{
+ /*
+ * Simple invocations do not provide a calc_sets() callback. Call
+ * the generic one.
+ */
+ if (!affd->calc_sets)
+ default_calc_sets(affd, affvecs);
+ else
+ affd->calc_sets(affd, affvecs);
+
+ if (WARN_ON_ONCE(affd->nr_sets > IRQ_AFFINITY_MAX_SETS))
+ return -ERANGE;
+ return 0;
+}
+
/**
* irq_create_affinity_masks - Create affinity masks for multiqueue spreading
* @nvecs: The total number of vectors
@@ -429,17 +445,7 @@ irq_create_affinity_masks(unsigned int nvecs, struct irq_affinity *affd)
else
affvecs = 0;
- /*
- * Simple invocations do not provide a calc_sets() callback. Install
- * the generic one.
- */
- if (!affd->calc_sets)
- affd->calc_sets = default_calc_sets;
-
- /* Recalculate the sets */
- affd->calc_sets(affd, affvecs);
-
- if (WARN_ON_ONCE(affd->nr_sets > IRQ_AFFINITY_MAX_SETS))
+ if (irq_affinity_calc_sets(affvecs, affd))
return NULL;
/* Nothing to assign? */
--
2.31.1
next reply other threads:[~2021-07-20 4:47 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-20 4:42 Ming Lei [this message]
2021-07-20 7:50 ` [PATCH V2] genirq/affinity: add helper of irq_affinity_calc_sets Christoph Hellwig
2021-07-21 0:02 ` Bjorn Helgaas
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=20210720044209.851141-1-ming.lei@redhat.com \
--to=ming.lei@redhat.com \
--cc=hch@lst.de \
--cc=helgaas@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=tglx@linutronix.de \
/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).