From: Ming Lei <ming.lei@redhat.com>
To: Christoph Hellwig <hch@lst.de>,
Bjorn Helgaas <helgaas@kernel.org>,
Thomas Gleixner <tglx@linutronix.de>
Cc: Jens Axboe <axboe@kernel.dk>,
linux-block@vger.kernel.org, Sagi Grimberg <sagi@grimberg.me>,
linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org,
linux-pci@vger.kernel.org, Ming Lei <ming.lei@redhat.com>
Subject: [PATCH 2/5] genirq/affinity: allow driver to setup managed IRQ's affinity
Date: Fri, 25 Jan 2019 17:53:44 +0800 [thread overview]
Message-ID: <20190125095347.17950-3-ming.lei@redhat.com> (raw)
In-Reply-To: <20190125095347.17950-1-ming.lei@redhat.com>
This patch introduces callback of .setup_affinity into 'struct
irq_affinity', so that:
1) allow drivers to customize the affinity for managed IRQ, for
example, now NVMe has special requirement for read queues & poll
queues
2) 6da4b3ab9a6e9 ("genirq/affinity: Add support for allocating interrupt sets")
makes pci_alloc_irq_vectors_affinity() a bit difficult to use for
allocating interrupt sets: 'max_vecs' is required to same with 'min_vecs'.
With this patch, driver can implement their own .setup_affinity to
customize the affinity, then the above thing can be solved easily.
Signed-off-by: Ming Lei <ming.lei@redhat.com>
---
include/linux/interrupt.h | 26 +++++++++++++++++---------
kernel/irq/affinity.c | 6 ++++++
2 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index c672f34235e7..f6cea778cf50 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -242,30 +242,38 @@ struct irq_affinity_notify {
};
/**
+ * struct irq_affinity_desc - Interrupt affinity descriptor
+ * @mask: cpumask to hold the affinity assignment
+ */
+struct irq_affinity_desc {
+ struct cpumask mask;
+ unsigned int is_managed : 1;
+};
+
+/**
* struct irq_affinity - Description for automatic irq affinity assignements
* @pre_vectors: Don't apply affinity to @pre_vectors at beginning of
* the MSI(-X) vector space
* @post_vectors: Don't apply affinity to @post_vectors at end of
* the MSI(-X) vector space
+ * @setup_affinity: Use driver's method to setup irq vectors affinity,
+ * and driver has to handle pre_vectors & post_vectors
+ * correctly, set 'is_managed' flag correct too
+ * @priv: Private data of @setup_affinity
* @nr_sets: Length of passed in *sets array
* @sets: Number of affinitized sets
*/
struct irq_affinity {
int pre_vectors;
int post_vectors;
+ int (*setup_affinity)(const struct irq_affinity *,
+ struct irq_affinity_desc *,
+ unsigned int);
+ void *priv;
int nr_sets;
int *sets;
};
-/**
- * struct irq_affinity_desc - Interrupt affinity descriptor
- * @mask: cpumask to hold the affinity assignment
- */
-struct irq_affinity_desc {
- struct cpumask mask;
- unsigned int is_managed : 1;
-};
-
#if defined(CONFIG_SMP)
extern cpumask_var_t irq_default_affinity;
diff --git a/kernel/irq/affinity.c b/kernel/irq/affinity.c
index 118b66d64a53..7b77cbdf739c 100644
--- a/kernel/irq/affinity.c
+++ b/kernel/irq/affinity.c
@@ -257,6 +257,12 @@ irq_create_affinity_masks(int nvecs, const struct irq_affinity *affd)
if (!masks)
return NULL;
+ if (affd->setup_affinity) {
+ if (affd->setup_affinity(affd, masks, nvecs))
+ return NULL;
+ return masks;
+ }
+
/* 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.9.5
next prev parent reply other threads:[~2019-01-25 9:54 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-25 9:53 [PATCH 0/5] genirq/affinity: introduce .setup_affinity to support allocating interrupt sets Ming Lei
2019-01-25 9:53 ` [PATCH 1/5] genirq/affinity: move allocation of 'node_to_cpumask' to irq_build_affinity_masks Ming Lei
2019-02-07 22:02 ` Bjorn Helgaas
2019-02-10 19:01 ` [tip:irq/core] genirq/affinity: Move allocation of 'node_to_cpumask' to irq_build_affinity_masks() tip-bot for Ming Lei
2019-01-25 9:53 ` Ming Lei [this message]
2019-02-07 22:21 ` [PATCH 2/5] genirq/affinity: allow driver to setup managed IRQ's affinity Bjorn Helgaas
2019-02-10 9:22 ` Ming Lei
2019-02-10 16:30 ` Thomas Gleixner
2019-02-11 3:54 ` Ming Lei
2019-02-11 14:39 ` Bjorn Helgaas
2019-02-11 22:38 ` Thomas Gleixner
2019-02-12 11:17 ` Ming Lei
2019-01-25 9:53 ` [PATCH 3/5] genirq/affinity: introduce irq_build_affinity() Ming Lei
2019-01-25 9:53 ` [PATCH 4/5] nvme-pci: simplify nvme_setup_irqs() via .setup_affinity callback Ming Lei
2019-02-10 16:39 ` Thomas Gleixner
2019-02-11 3:58 ` Ming Lei
2019-02-10 18:49 ` Thomas Gleixner
2019-02-11 4:09 ` Ming Lei
2019-01-25 9:53 ` [PATCH 5/5] genirq/affinity: remove support for allocating interrupt sets Ming Lei
2019-02-07 22:22 ` Bjorn Helgaas
2019-01-25 9:56 ` [PATCH 0/5] genirq/affinity: introduce .setup_affinity to support " Ming Lei
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=20190125095347.17950-3-ming.lei@redhat.com \
--to=ming.lei@redhat.com \
--cc=axboe@kernel.dk \
--cc=hch@lst.de \
--cc=helgaas@kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-pci@vger.kernel.org \
--cc=sagi@grimberg.me \
--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).