Commit 65dd1f7c authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

genirq/manage: Rework prepare_percpu_nmi() 



Use the new guards to get and lock the interrupt descriptor and tidy up the
code.

No functional change.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/all/20250429065422.494561120@linutronix.de
parent 8e3f672b

kernel/irq/manage.c

+8 −21
Original line number Diff line number Diff line
@@ -2606,32 +2606,19 @@ int request_percpu_nmi(unsigned int irq, irq_handler_t handler, 
 */

int prepare_percpu_nmi(unsigned int irq)

{

	unsigned long flags;

	struct irq_desc *desc;

	int ret = 0;

	int ret = -EINVAL;



	WARN_ON(preemptible());



	desc = irq_get_desc_lock(irq, &flags,

				 IRQ_GET_DESC_CHECK_PERCPU);

	if (!desc)

	scoped_irqdesc_get_and_lock(irq, IRQ_GET_DESC_CHECK_PERCPU) {

		if (WARN(!irq_is_nmi(scoped_irqdesc),

			 "prepare_percpu_nmi called for a non-NMI interrupt: irq %u\n", irq))

			return -EINVAL;



	if (WARN(!irq_is_nmi(desc),

		 KERN_ERR "prepare_percpu_nmi called for a non-NMI interrupt: irq %u\n",

		 irq)) {

		ret = -EINVAL;

		goto out;

	}



	ret = irq_nmi_setup(desc);

	if (ret) {

		ret = irq_nmi_setup(scoped_irqdesc);

		if (ret)

			pr_err("Failed to setup NMI delivery: irq %u\n", irq);

		goto out;

	}



out:

	irq_put_desc_unlock(desc, flags);

	return ret;

}