From: Aaron Tomlin <atomlin@atomlin•com>
To: axboe@kernel•dk, kbusch@kernel•org, hch@lst•de, sagi@grimberg•me,
mst@redhat•com
Cc: atomlin@atomlin•com, aacraid@microsemi•com,
James.Bottomley@HansenPartnership•com,
martin.petersen@oracle•com, liyihang9@h-partners•com,
kashyap.desai@broadcom•com, sumit.saxena@broadcom•com,
shivasharan.srikanteshwara@broadcom•com,
chandrakanth.patil@broadcom•com, sathya.prakash@broadcom•com,
sreekanth.reddy@broadcom•com,
suganath-prabu.subramani@broadcom•com, ranjan.kumar@broadcom•com,
jinpu.wang@cloud•ionos.com, tglx@kernel•org, mingo@redhat•com,
peterz@infradead•org, juri.lelli@redhat•com,
vincent.guittot@linaro•org, akpm@linux-foundation•org,
maz@kernel•org, ruanjinjie@huawei•com, bigeasy@linutronix•de,
yphbchou0911@gmail•com, wagi@kernel•org, frederic@kernel•org,
longman@redhat•com, chenridong@huawei•com, hare@suse•de,
kch@nvidia•com, ming.lei@redhat•com, tom.leiming@gmail•com,
steve@abita•co, sean@ashe•io, chjohnst@gmail•com, neelx@suse•com,
mproche@gmail•com, nick.lange@gmail•com,
marco.crivellari@suse•com, linux-block@vger•kernel.org,
linux-kernel@vger•kernel.org, virtualization@lists•linux.dev,
linux-nvme@lists•infradead.org, linux-scsi@vger•kernel.org,
megaraidlinux.pdl@broadcom•com, mpi3mr-linuxdrv.pdl@broadcom•com,
MPT-FusionLinux.pdl@broadcom•com
Subject: [PATCH v12 04/13] genirq/affinity: Add cpumask to struct irq_affinity
Date: Wed, 22 Apr 2026 14:52:06 -0400 [thread overview]
Message-ID: <20260422185215.100929-5-atomlin@atomlin.com> (raw)
In-Reply-To: <20260422185215.100929-1-atomlin@atomlin.com>
From: Daniel Wagner <wagi@kernel•org>
Pass a cpumask to irq_create_affinity_masks as an additional constraint
to consider when creating the affinity masks. This allows the caller to
exclude specific CPUs, e.g., isolated CPUs (see the 'isolcpus' kernel
command-line parameter).
Signed-off-by: Daniel Wagner <wagi@kernel•org>
Reviewed-by: Hannes Reinecke <hare@suse•de>
Signed-off-by: Aaron Tomlin <atomlin@atomlin•com>
---
include/linux/interrupt.h | 16 ++++++++++------
kernel/irq/affinity.c | 12 ++++++++++--
2 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 6cd26ffb0505..afd5a2c75b43 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -287,18 +287,22 @@ struct irq_affinity_notify {
* @nr_sets: The number of interrupt sets for which affinity
* spreading is required
* @set_size: Array holding the size of each interrupt set
+ * @mask: cpumask that constrains which CPUs to consider when
+ * calculating the number and size of the interrupt sets
* @calc_sets: Callback for calculating the number and size
* of interrupt sets
* @priv: Private data for usage by @calc_sets, usually a
* pointer to driver/device specific data.
*/
struct irq_affinity {
- unsigned int pre_vectors;
- unsigned int post_vectors;
- unsigned int nr_sets;
- unsigned int set_size[IRQ_AFFINITY_MAX_SETS];
- void (*calc_sets)(struct irq_affinity *, unsigned int nvecs);
- void *priv;
+ unsigned int pre_vectors;
+ unsigned int post_vectors;
+ unsigned int nr_sets;
+ unsigned int set_size[IRQ_AFFINITY_MAX_SETS];
+ const struct cpumask *mask;
+ void (*calc_sets)(struct irq_affinity *,
+ unsigned int nvecs);
+ void *priv;
};
/**
diff --git a/kernel/irq/affinity.c b/kernel/irq/affinity.c
index 78f2418a8925..e0cf70a99339 100644
--- a/kernel/irq/affinity.c
+++ b/kernel/irq/affinity.c
@@ -70,7 +70,13 @@ irq_create_affinity_masks(unsigned int nvecs, struct irq_affinity *affd)
*/
for (i = 0, usedvecs = 0; i < affd->nr_sets; i++) {
unsigned int nr_masks, this_vecs = affd->set_size[i];
- struct cpumask *result = group_cpus_evenly(this_vecs, &nr_masks);
+ struct cpumask *result;
+
+ if (affd->mask)
+ result = group_mask_cpus_evenly(this_vecs, affd->mask,
+ &nr_masks);
+ else
+ result = group_cpus_evenly(this_vecs, &nr_masks);
if (!result) {
kfree(masks);
@@ -115,7 +121,9 @@ unsigned int irq_calc_affinity_vectors(unsigned int minvec, unsigned int maxvec,
if (resv > minvec)
return 0;
- if (affd->calc_sets)
+ if (affd->mask)
+ set_vecs = cpumask_weight(affd->mask);
+ else if (affd->calc_sets)
set_vecs = maxvec - resv;
else
set_vecs = cpumask_weight(cpu_possible_mask);
--
2.51.0
next prev parent reply other threads:[~2026-04-22 18:52 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-22 18:52 [PATCH v12 00/13] blk: honor isolcpus configuration Aaron Tomlin
2026-04-22 18:52 ` [PATCH v12 01/13] scsi: aacraid: use block layer helpers to calculate num of queues Aaron Tomlin
2026-05-05 18:42 ` Aaron Tomlin
2026-04-22 18:52 ` [PATCH v12 02/13] lib/group_cpus: remove dead !SMP code Aaron Tomlin
2026-04-27 15:21 ` Sebastian Andrzej Siewior
2026-04-29 23:32 ` Aaron Tomlin
2026-04-22 18:52 ` [PATCH v12 03/13] lib/group_cpus: Add group_mask_cpus_evenly() Aaron Tomlin
2026-04-22 18:52 ` Aaron Tomlin [this message]
2026-05-05 20:40 ` [PATCH v12 04/13] genirq/affinity: Add cpumask to struct irq_affinity Aaron Tomlin
2026-04-22 18:52 ` [PATCH v12 05/13] blk-mq: add blk_mq_{online|possible}_queue_affinity Aaron Tomlin
2026-04-27 15:34 ` Sebastian Andrzej Siewior
2026-04-28 12:53 ` Daniel Wagner
2026-04-29 7:15 ` Hannes Reinecke
2026-05-05 20:55 ` Aaron Tomlin
2026-04-22 18:52 ` [PATCH v12 06/13] nvme-pci: use block layer helpers to constrain queue affinity Aaron Tomlin
2026-05-05 19:47 ` Aaron Tomlin
2026-04-22 18:52 ` [PATCH v12 07/13] scsi: Use " Aaron Tomlin
2026-04-22 18:52 ` [PATCH v12 08/13] virtio: blk/scsi: use " Aaron Tomlin
2026-04-22 18:52 ` [PATCH v12 09/13] isolation: Introduce io_queue isolcpus type Aaron Tomlin
2026-04-22 18:52 ` [PATCH v12 10/13] blk-mq: use hk cpus only when isolcpus=io_queue is enabled Aaron Tomlin
2026-05-02 21:25 ` Aaron Tomlin
2026-04-22 18:52 ` [PATCH v12 11/13] blk-mq: prevent offlining hk CPUs with associated online isolated CPUs Aaron Tomlin
2026-04-22 18:52 ` [PATCH v12 12/13] genirq/affinity: Restrict managed IRQ affinity to housekeeping CPUs Aaron Tomlin
2026-04-22 18:52 ` [PATCH v12 13/13] docs: add io_queue flag to isolcpus Aaron Tomlin
2026-04-27 10:55 ` [PATCH v12 00/13] blk: honor isolcpus configuration Florian Bezdeka
2026-04-28 13:08 ` Daniel Wagner
2026-04-29 21:01 ` Florian Bezdeka
2026-04-30 12:09 ` Daniel Wagner
2026-04-30 15:45 ` Jan Kiszka
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=20260422185215.100929-5-atomlin@atomlin.com \
--to=atomlin@atomlin$(echo .)com \
--cc=James.Bottomley@HansenPartnership$(echo .)com \
--cc=MPT-FusionLinux.pdl@broadcom$(echo .)com \
--cc=aacraid@microsemi$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=axboe@kernel$(echo .)dk \
--cc=bigeasy@linutronix$(echo .)de \
--cc=chandrakanth.patil@broadcom$(echo .)com \
--cc=chenridong@huawei$(echo .)com \
--cc=chjohnst@gmail$(echo .)com \
--cc=frederic@kernel$(echo .)org \
--cc=hare@suse$(echo .)de \
--cc=hch@lst$(echo .)de \
--cc=jinpu.wang@cloud$(echo .)ionos.com \
--cc=juri.lelli@redhat$(echo .)com \
--cc=kashyap.desai@broadcom$(echo .)com \
--cc=kbusch@kernel$(echo .)org \
--cc=kch@nvidia$(echo .)com \
--cc=linux-block@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-nvme@lists$(echo .)infradead.org \
--cc=linux-scsi@vger$(echo .)kernel.org \
--cc=liyihang9@h-partners$(echo .)com \
--cc=longman@redhat$(echo .)com \
--cc=marco.crivellari@suse$(echo .)com \
--cc=martin.petersen@oracle$(echo .)com \
--cc=maz@kernel$(echo .)org \
--cc=megaraidlinux.pdl@broadcom$(echo .)com \
--cc=ming.lei@redhat$(echo .)com \
--cc=mingo@redhat$(echo .)com \
--cc=mpi3mr-linuxdrv.pdl@broadcom$(echo .)com \
--cc=mproche@gmail$(echo .)com \
--cc=mst@redhat$(echo .)com \
--cc=neelx@suse$(echo .)com \
--cc=nick.lange@gmail$(echo .)com \
--cc=peterz@infradead$(echo .)org \
--cc=ranjan.kumar@broadcom$(echo .)com \
--cc=ruanjinjie@huawei$(echo .)com \
--cc=sagi@grimberg$(echo .)me \
--cc=sathya.prakash@broadcom$(echo .)com \
--cc=sean@ashe$(echo .)io \
--cc=shivasharan.srikanteshwara@broadcom$(echo .)com \
--cc=sreekanth.reddy@broadcom$(echo .)com \
--cc=steve@abita$(echo .)co \
--cc=suganath-prabu.subramani@broadcom$(echo .)com \
--cc=sumit.saxena@broadcom$(echo .)com \
--cc=tglx@kernel$(echo .)org \
--cc=tom.leiming@gmail$(echo .)com \
--cc=vincent.guittot@linaro$(echo .)org \
--cc=virtualization@lists$(echo .)linux.dev \
--cc=wagi@kernel$(echo .)org \
--cc=yphbchou0911@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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