Commit 761ea388 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

genirq: Handle managed irqs gracefully in irq_startup() 



Affinity managed interrupts should keep their assigned affinity accross CPU
hotplug. To avoid magic hackery in device drivers, the core code shall
manage them transparently and set these interrupts into a managed shutdown
state when the last CPU of the assigned affinity mask goes offline. The
interrupt will be restarted when one of the CPUs in the assigned affinity
mask comes back online.

Add the necessary logic to irq_startup(). If an interrupt is requested and
started up, the code checks whether it is affinity managed and if so, it
checks whether a CPU in the interrupts affinity mask is online. If not, it
puts the interrupt into managed shutdown state. 

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Keith Busch <keith.busch@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Christoph Hellwig <hch@lst.de>
Link: http://lkml.kernel.org/r/20170619235447.189851170@linutronix.de
parent 4cde9c6b

include/linux/irq.h

+1 −1
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ static inline bool irqd_is_started(struct irq_data *d) 
	return __irqd_to_state(d) & IRQD_IRQ_STARTED;

}



static inline bool irqd_is_managed_shutdown(struct irq_data *d)

static inline bool irqd_is_managed_and_shutdown(struct irq_data *d)

{

	return __irqd_to_state(d) & IRQD_MANAGED_SHUTDOWN;

}

kernel/irq/chip.c

+61 −3
Original line number Diff line number Diff line
@@ -195,6 +195,52 @@ static void irq_state_set_started(struct irq_desc *desc) 
	irqd_set(&desc->irq_data, IRQD_IRQ_STARTED);

}



enum {

	IRQ_STARTUP_NORMAL,

	IRQ_STARTUP_MANAGED,

	IRQ_STARTUP_ABORT,

};



#ifdef CONFIG_SMP

static int

__irq_startup_managed(struct irq_desc *desc, struct cpumask *aff, bool force)

{

	struct irq_data *d = irq_desc_get_irq_data(desc);



	if (!irqd_affinity_is_managed(d))

		return IRQ_STARTUP_NORMAL;



	irqd_clr_managed_shutdown(d);



	if (cpumask_any_and(aff, cpu_online_mask) > nr_cpu_ids) {

		/*

		 * Catch code which fiddles with enable_irq() on a managed

		 * and potentially shutdown IRQ. Chained interrupt

		 * installment or irq auto probing should not happen on

		 * managed irqs either. Emit a warning, break the affinity

		 * and start it up as a normal interrupt.

		 */

		if (WARN_ON_ONCE(force))

			return IRQ_STARTUP_NORMAL;

		/*

		 * The interrupt was requested, but there is no online CPU

		 * in it's affinity mask. Put it into managed shutdown

		 * state and let the cpu hotplug mechanism start it up once

		 * a CPU in the mask becomes available.

		 */

		irqd_set_managed_shutdown(d);

		return IRQ_STARTUP_ABORT;

	}

	return IRQ_STARTUP_MANAGED;

}

#else

static int

__irq_startup_managed(struct irq_desc *desc, struct cpumask *aff, bool force)

{

	return IRQ_STARTUP_NORMAL;

}

#endif



static int __irq_startup(struct irq_desc *desc)

{

	struct irq_data *d = irq_desc_get_irq_data(desc);
@@ -214,15 +260,27 @@ static int __irq_startup(struct irq_desc *desc) 


int irq_startup(struct irq_desc *desc, bool resend, bool force)

{

	struct irq_data *d = irq_desc_get_irq_data(desc);

	struct cpumask *aff = irq_data_get_affinity_mask(d);

	int ret = 0;



	desc->depth = 0;



	if (irqd_is_started(&desc->irq_data)) {

	if (irqd_is_started(d)) {

		irq_enable(desc);

	} else {

		switch (__irq_startup_managed(desc, aff, force)) {

		case IRQ_STARTUP_NORMAL:

			ret = __irq_startup(desc);

			irq_setup_affinity(desc);

			break;

		case IRQ_STARTUP_MANAGED:

			ret = __irq_startup(desc);

			irq_set_affinity_locked(d, aff, false);

			break;

		case IRQ_STARTUP_ABORT:

			return 0;

		}

	}

	if (resend)

		check_irq_resend(desc);

CRA Git | Maintained and supported by SUSTech CRA and CCSE