From: Thomas Gleixner <tglx@linutronix.de> To: LKML <linux-kernel@vger.kernel.org> Cc: Ming Lei <ming.lei@redhat.com>, Christoph Hellwig <hch@lst.de>, Bjorn Helgaas <helgaas@kernel.org>, Jens Axboe <axboe@kernel.dk>, linux-block@vger.kernel.org, Sagi Grimberg <sagi@grimberg.me>, linux-nvme@lists.infradead.org, linux-pci@vger.kernel.org, Keith Busch <keith.busch@intel.com>, Marc Zyngier <marc.zyngier@arm.com>, Sumit Saxena <sumit.saxena@broadcom.com>, Kashyap Desai <kashyap.desai@broadcom.com>, Shivasharan Srikanteshwara <shivasharan.srikanteshwara@broadcom.com> Subject: [patch v6 7/7] genirq/affinity: Add support for non-managed affinity sets Date: Sat, 16 Feb 2019 18:13:13 +0100 [thread overview] Message-ID: <20190216172228.869750763@linutronix.de> (raw) In-Reply-To: 20190216171306.403545970@linutronix.de Some drivers need an extra set of interrupts which should not be marked managed, but should get initial interrupt spreading. Add a bitmap to struct irq_affinity which allows the driver to mark a particular set of interrupts as non managed. Check the bitmap during spreading and use the result to mark the interrupts in the sets accordingly. The unmanaged interrupts get initial spreading, but user space can change their affinity later on. For the managed sets, i.e. the corresponding bit in the mask is not set, there is no change in behaviour. Usage example: struct irq_affinity affd = { .pre_vectors = 2, .unmanaged_sets = 0x02, .calc_sets = drv_calc_sets, }; .... For both interrupt sets the interrupts are properly spread out, but the second set is not marked managed. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- include/linux/interrupt.h | 2 ++ kernel/irq/affinity.c | 16 +++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) Index: b/include/linux/interrupt.h =================================================================== --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h @@ -251,6 +251,7 @@ struct irq_affinity_notify { * the MSI(-X) vector space * @nr_sets: The number of interrupt sets for which affinity * spreading is required + * @unmanaged_sets: Bitmap to mark entries in the @set_size array unmanaged * @set_size: Array holding the size of each interrupt set * @calc_sets: Callback for calculating the number and size * of interrupt sets @@ -261,6 +262,7 @@ struct irq_affinity { unsigned int pre_vectors; unsigned int post_vectors; unsigned int nr_sets; + unsigned int unmanaged_sets; unsigned int set_size[IRQ_AFFINITY_MAX_SETS]; void (*calc_sets)(struct irq_affinity *, unsigned int nvecs); void *priv; Index: b/kernel/irq/affinity.c =================================================================== --- a/kernel/irq/affinity.c +++ b/kernel/irq/affinity.c @@ -249,6 +249,8 @@ irq_create_affinity_masks(unsigned int n unsigned int affvecs, curvec, usedvecs, i; struct irq_affinity_desc *masks = NULL; + BUILD_BUG_ON(IRQ_AFFINITY_MAX_SETS > sizeof(affd->unmanaged_sets) * 8); + /* * Determine the number of vectors which need interrupt affinities * assigned. If the pre/post request exhausts the available vectors @@ -292,7 +294,8 @@ irq_create_affinity_masks(unsigned int n * have multiple sets, build each sets affinity mask separately. */ for (i = 0, usedvecs = 0; i < affd->nr_sets; i++) { - unsigned int this_vecs = affd->set_size[i]; + bool managed = affd->unmanaged_sets & (1U << i) ? true : false; + unsigned int idx, this_vecs = affd->set_size[i]; int ret; ret = irq_build_affinity_masks(affd, curvec, this_vecs, @@ -301,8 +304,15 @@ irq_create_affinity_masks(unsigned int n kfree(masks); return NULL; } + + idx = curvec; curvec += this_vecs; usedvecs += this_vecs; + if (managed) { + /* Mark the managed interrupts */ + for (; idx < curvec; idx++) + masks[idx].is_managed = 1; + } } /* Fill out vectors at the end that don't need affinity */ @@ -313,10 +323,6 @@ irq_create_affinity_masks(unsigned int n for (; curvec < nvecs; curvec++) cpumask_copy(&masks[curvec].mask, irq_default_affinity); - /* Mark the managed interrupts */ - for (i = affd->pre_vectors; i < nvecs - affd->post_vectors; i++) - masks[i].is_managed = 1; - return masks; }
WARNING: multiple messages have this Message-ID (diff)
From: tglx@linutronix.de (Thomas Gleixner) Subject: [patch v6 7/7] genirq/affinity: Add support for non-managed affinity sets Date: Sat, 16 Feb 2019 18:13:13 +0100 [thread overview] Message-ID: <20190216172228.869750763@linutronix.de> (raw) In-Reply-To: 20190216171306.403545970@linutronix.de Some drivers need an extra set of interrupts which should not be marked managed, but should get initial interrupt spreading. Add a bitmap to struct irq_affinity which allows the driver to mark a particular set of interrupts as non managed. Check the bitmap during spreading and use the result to mark the interrupts in the sets accordingly. The unmanaged interrupts get initial spreading, but user space can change their affinity later on. For the managed sets, i.e. the corresponding bit in the mask is not set, there is no change in behaviour. Usage example: struct irq_affinity affd = { .pre_vectors = 2, .unmanaged_sets = 0x02, .calc_sets = drv_calc_sets, }; .... For both interrupt sets the interrupts are properly spread out, but the second set is not marked managed. Signed-off-by: Thomas Gleixner <tglx at linutronix.de> --- include/linux/interrupt.h | 2 ++ kernel/irq/affinity.c | 16 +++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) Index: b/include/linux/interrupt.h =================================================================== --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h @@ -251,6 +251,7 @@ struct irq_affinity_notify { * the MSI(-X) vector space * @nr_sets: The number of interrupt sets for which affinity * spreading is required + * @unmanaged_sets: Bitmap to mark entries in the @set_size array unmanaged * @set_size: Array holding the size of each interrupt set * @calc_sets: Callback for calculating the number and size * of interrupt sets @@ -261,6 +262,7 @@ struct irq_affinity { unsigned int pre_vectors; unsigned int post_vectors; unsigned int nr_sets; + unsigned int unmanaged_sets; unsigned int set_size[IRQ_AFFINITY_MAX_SETS]; void (*calc_sets)(struct irq_affinity *, unsigned int nvecs); void *priv; Index: b/kernel/irq/affinity.c =================================================================== --- a/kernel/irq/affinity.c +++ b/kernel/irq/affinity.c @@ -249,6 +249,8 @@ irq_create_affinity_masks(unsigned int n unsigned int affvecs, curvec, usedvecs, i; struct irq_affinity_desc *masks = NULL; + BUILD_BUG_ON(IRQ_AFFINITY_MAX_SETS > sizeof(affd->unmanaged_sets) * 8); + /* * Determine the number of vectors which need interrupt affinities * assigned. If the pre/post request exhausts the available vectors @@ -292,7 +294,8 @@ irq_create_affinity_masks(unsigned int n * have multiple sets, build each sets affinity mask separately. */ for (i = 0, usedvecs = 0; i < affd->nr_sets; i++) { - unsigned int this_vecs = affd->set_size[i]; + bool managed = affd->unmanaged_sets & (1U << i) ? true : false; + unsigned int idx, this_vecs = affd->set_size[i]; int ret; ret = irq_build_affinity_masks(affd, curvec, this_vecs, @@ -301,8 +304,15 @@ irq_create_affinity_masks(unsigned int n kfree(masks); return NULL; } + + idx = curvec; curvec += this_vecs; usedvecs += this_vecs; + if (managed) { + /* Mark the managed interrupts */ + for (; idx < curvec; idx++) + masks[idx].is_managed = 1; + } } /* Fill out vectors at the end that don't need affinity */ @@ -313,10 +323,6 @@ irq_create_affinity_masks(unsigned int n for (; curvec < nvecs; curvec++) cpumask_copy(&masks[curvec].mask, irq_default_affinity); - /* Mark the managed interrupts */ - for (i = affd->pre_vectors; i < nvecs - affd->post_vectors; i++) - masks[i].is_managed = 1; - return masks; }
next prev parent reply other threads:[~2019-02-16 17:26 UTC|newest] Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-02-16 17:13 [patch v6 0/7] genirq/affinity: Overhaul the multiple interrupt sets support Thomas Gleixner 2019-02-16 17:13 ` Thomas Gleixner 2019-02-16 17:13 ` [patch v6 1/7] genirq/affinity: Code consolidation Thomas Gleixner 2019-02-16 17:13 ` Thomas Gleixner 2019-02-17 13:36 ` Ming Lei 2019-02-17 13:36 ` Ming Lei 2019-02-18 10:25 ` [tip:irq/core] " tip-bot for Thomas Gleixner 2019-02-16 17:13 ` [patch v6 2/7] genirq/affinity: Store interrupt sets size in struct irq_affinity Thomas Gleixner 2019-02-16 17:13 ` Thomas Gleixner 2019-02-18 10:26 ` [tip:irq/core] " tip-bot for Ming Lei 2019-02-16 17:13 ` [patch v6 3/7] genirq/affinity: Add new callback for (re)calculating interrupt sets Thomas Gleixner 2019-02-16 17:13 ` Thomas Gleixner 2019-02-18 10:27 ` [tip:irq/core] " tip-bot for Ming Lei 2021-06-15 19:57 ` [patch v6 3/7] " Bjorn Helgaas 2021-06-15 19:57 ` Bjorn Helgaas 2021-06-15 20:04 ` Christoph Hellwig 2021-06-15 20:04 ` Christoph Hellwig 2021-06-16 0:40 ` Ming Lei 2021-06-16 0:40 ` Ming Lei 2021-06-18 19:32 ` Thomas Gleixner 2021-06-18 19:32 ` Thomas Gleixner 2021-06-18 19:19 ` Thomas Gleixner 2021-06-18 19:19 ` Thomas Gleixner 2019-02-16 17:13 ` [patch v6 4/7] nvme-pci: Simplify interrupt allocation Thomas Gleixner 2019-02-16 17:13 ` Thomas Gleixner 2019-02-18 10:27 ` [tip:irq/core] " tip-bot for Ming Lei 2019-02-16 17:13 ` [patch v6 5/7] genirq/affinity: Remove the leftovers of the original set support Thomas Gleixner 2019-02-16 17:13 ` Thomas Gleixner 2019-02-17 13:39 ` Ming Lei 2019-02-17 13:39 ` Ming Lei 2019-02-18 10:28 ` [tip:irq/core] " tip-bot for Thomas Gleixner 2019-02-16 17:13 ` [patch v6 6/7] PCI/MSI: Remove obsolete sanity checks for multiple interrupt sets Thomas Gleixner 2019-02-16 17:13 ` Thomas Gleixner 2019-02-17 13:39 ` Ming Lei 2019-02-17 13:39 ` Ming Lei 2019-02-18 10:29 ` [tip:irq/core] " tip-bot for Thomas Gleixner 2019-02-16 17:13 ` Thomas Gleixner [this message] 2019-02-16 17:13 ` [patch v6 7/7] genirq/affinity: Add support for non-managed affinity sets Thomas Gleixner 2019-02-17 13:45 ` Ming Lei 2019-02-17 13:45 ` Ming Lei 2019-02-17 19:17 ` Thomas Gleixner 2019-02-17 19:17 ` Thomas Gleixner 2019-02-18 2:49 ` Ming Lei 2019-02-18 2:49 ` Ming Lei 2019-02-18 7:25 ` Thomas Gleixner 2019-02-18 7:25 ` Thomas Gleixner 2019-02-18 8:43 ` [patch v6 0/7] genirq/affinity: Overhaul the multiple interrupt sets support Marc Zyngier 2019-02-18 8:43 ` Marc Zyngier
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=20190216172228.869750763@linutronix.de \ --to=tglx@linutronix.de \ --cc=axboe@kernel.dk \ --cc=hch@lst.de \ --cc=helgaas@kernel.org \ --cc=kashyap.desai@broadcom.com \ --cc=keith.busch@intel.com \ --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=marc.zyngier@arm.com \ --cc=ming.lei@redhat.com \ --cc=sagi@grimberg.me \ --cc=shivasharan.srikanteshwara@broadcom.com \ --cc=sumit.saxena@broadcom.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.