mirror of https://github.com/torvalds/linux.git
genirq: Update request_percpu_nmi() to take an affinity
Continue spreading the notion of affinity to the per CPU interrupt request code by updating the call sites that use request_percpu_nmi() (all two of them) to take an affinity pointer. This pointer is firmly NULL for now. Signed-off-by: Marc Zyngier <maz@kernel.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Tested-by: Will Deacon <will@kernel.org> Link: https://patch.msgid.link/20251020122944.3074811-16-maz@kernel.org
This commit is contained in:
parent
258e7d28a3
commit
b9c6aa9efc
|
|
@ -1094,7 +1094,7 @@ static void ipi_setup_sgi(int ipi)
|
|||
irq = ipi_irq_base + ipi;
|
||||
|
||||
if (ipi_should_be_nmi(ipi)) {
|
||||
err = request_percpu_nmi(irq, ipi_handler, "IPI", &irq_stat);
|
||||
err = request_percpu_nmi(irq, ipi_handler, "IPI", NULL, &irq_stat);
|
||||
WARN(err, "Could not request IRQ %d as NMI, err=%d\n", irq, err);
|
||||
} else {
|
||||
err = request_percpu_irq(irq, ipi_handler, "IPI", &irq_stat);
|
||||
|
|
|
|||
|
|
@ -659,7 +659,7 @@ int armpmu_request_irq(int irq, int cpu)
|
|||
irq_ops = &pmunmi_ops;
|
||||
}
|
||||
} else if (armpmu_count_irq_users(irq) == 0) {
|
||||
err = request_percpu_nmi(irq, handler, "arm-pmu", &cpu_armpmu);
|
||||
err = request_percpu_nmi(irq, handler, "arm-pmu", NULL, &cpu_armpmu);
|
||||
|
||||
/* If cannot get an NMI, get a normal interrupt */
|
||||
if (err) {
|
||||
|
|
|
|||
|
|
@ -197,8 +197,8 @@ request_percpu_irq(unsigned int irq, irq_handler_t handler,
|
|||
}
|
||||
|
||||
extern int __must_check
|
||||
request_percpu_nmi(unsigned int irq, irq_handler_t handler,
|
||||
const char *devname, void __percpu *dev);
|
||||
request_percpu_nmi(unsigned int irq, irq_handler_t handler, const char *name,
|
||||
const struct cpumask *affinity, void __percpu *dev_id);
|
||||
|
||||
extern const void *free_irq(unsigned int, void *);
|
||||
extern void free_percpu_irq(unsigned int, void __percpu *);
|
||||
|
|
|
|||
|
|
@ -2527,6 +2527,7 @@ EXPORT_SYMBOL_GPL(__request_percpu_irq);
|
|||
* @irq: Interrupt line to allocate
|
||||
* @handler: Function to be called when the IRQ occurs.
|
||||
* @name: An ascii name for the claiming device
|
||||
* @affinity: A cpumask describing the target CPUs for this interrupt
|
||||
* @dev_id: A percpu cookie passed back to the handler function
|
||||
*
|
||||
* This call allocates interrupt resources for a per CPU NMI. Per CPU NMIs
|
||||
|
|
@ -2543,8 +2544,8 @@ EXPORT_SYMBOL_GPL(__request_percpu_irq);
|
|||
* If the interrupt line cannot be used to deliver NMIs, function
|
||||
* will fail returning a negative value.
|
||||
*/
|
||||
int request_percpu_nmi(unsigned int irq, irq_handler_t handler,
|
||||
const char *name, void __percpu *dev_id)
|
||||
int request_percpu_nmi(unsigned int irq, irq_handler_t handler, const char *name,
|
||||
const struct cpumask *affinity, void __percpu *dev_id)
|
||||
{
|
||||
struct irqaction *action;
|
||||
struct irq_desc *desc;
|
||||
|
|
@ -2561,12 +2562,13 @@ int request_percpu_nmi(unsigned int irq, irq_handler_t handler,
|
|||
!irq_supports_nmi(desc))
|
||||
return -EINVAL;
|
||||
|
||||
/* The line cannot already be NMI */
|
||||
if (irq_is_nmi(desc))
|
||||
/* The line cannot be NMI already if the new request covers all CPUs */
|
||||
if (irq_is_nmi(desc) &&
|
||||
(!affinity || cpumask_equal(affinity, cpu_possible_mask)))
|
||||
return -EINVAL;
|
||||
|
||||
action = create_percpu_irqaction(handler, IRQF_NO_THREAD | IRQF_NOBALANCING,
|
||||
name, NULL, dev_id);
|
||||
name, affinity, dev_id);
|
||||
if (!action)
|
||||
return -ENOMEM;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue