Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad7a929f authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86/irq: Use irq_migrate_all_off_this_cpu() 



The generic migration code supports all the required features
already. Remove the x86 specific implementation and use the generic one.

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/20170619235445.851311033@linutronix.de
parent 654abd0a

arch/x86/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -87,6 +87,7 @@ config X86 
	select GENERIC_EARLY_IOREMAP

	select GENERIC_EARLY_IOREMAP

	select GENERIC_FIND_FIRST_BIT

	select GENERIC_FIND_FIRST_BIT

	select GENERIC_IOMAP

	select GENERIC_IOMAP

	select GENERIC_IRQ_MIGRATION		if SMP

	select GENERIC_IRQ_PROBE

	select GENERIC_IRQ_PROBE

	select GENERIC_IRQ_SHOW

	select GENERIC_IRQ_SHOW

	select GENERIC_PENDING_IRQ		if SMP

	select GENERIC_PENDING_IRQ		if SMP

arch/x86/kernel/irq.c

+2 −87
Original line number Original line Diff line number Diff line
@@ -432,95 +432,12 @@ int check_irq_vectors_for_cpu_disable(void) 
/* A cpu has been removed from cpu_online_mask.  Reset irq affinities. */

/* A cpu has been removed from cpu_online_mask.  Reset irq affinities. */

void fixup_irqs(void)

void fixup_irqs(void)

{

{

	unsigned int irq, vector;

	unsigned int irr, vector;

	struct irq_desc *desc;

	struct irq_desc *desc;

	struct irq_data *data;

	struct irq_data *data;

	struct irq_chip *chip;

	struct irq_chip *chip;

	int ret;





	for_each_irq_desc(irq, desc) {

	irq_migrate_all_off_this_cpu();

		const struct cpumask *affinity;

		bool break_affinity = false;



		if (!desc)

			continue;



		/* interrupt's are disabled at this point */

		raw_spin_lock(&desc->lock);



		data = irq_desc_get_irq_data(desc);

		chip = irq_data_get_irq_chip(data);

		/*

		 * The interrupt descriptor might have been cleaned up

		 * already, but it is not yet removed from the radix

		 * tree. If the chip does not have an affinity setter,

		 * nothing to do here.

		 */

		if (!chip && !chip->irq_set_affinity) {

			raw_spin_unlock(&desc->lock);

			continue;

		}



		affinity = irq_data_get_affinity_mask(data);



		if (!irq_has_action(irq) || irqd_is_per_cpu(data) ||

		    cpumask_subset(affinity, cpu_online_mask)) {

			irq_fixup_move_pending(desc, false);

			raw_spin_unlock(&desc->lock);

			continue;

		}



		/*

		 * Complete an eventually pending irq move cleanup. If this

		 * interrupt was moved in hard irq context, then the

		 * vectors need to be cleaned up. It can't wait until this

		 * interrupt actually happens and this CPU was involved.

		 */

		irq_force_complete_move(desc);



		/*

		 * If there is a setaffinity pending, then try to reuse the

		 * pending mask, so the last change of the affinity does

		 * not get lost. If there is no move pending or the pending

		 * mask does not contain any online CPU, use the current

		 * affinity mask.

		 */

		if (irq_fixup_move_pending(desc, true))

			affinity = desc->pending_mask;



		/*

		 * If the mask does not contain an offline CPU, break

		 * affinity and use cpu_online_mask as fall back.

		 */

		if (cpumask_any_and(affinity, cpu_online_mask) >= nr_cpu_ids) {

			broke_affinity = true;

			affinity = cpu_online_mask;

		}



		if (!irqd_can_move_in_process_context(data) && chip->irq_mask)

			chip->irq_mask(data);



		ret = chip->irq_set_affinity(data, affinity, true);

		if (ret) {

			pr_crit("IRQ %u: Force affinity failed (%d)\n",

				d->irq, ret);

			broke_affinity = false;

		}



		/*

		 * We unmask if the irq was not marked masked by the

		 * core code. That respects the lazy irq disable

		 * behaviour.

		 */

		if (!irqd_can_move_in_process_context(data) &&

		    !irqd_irq_masked(data) && chip->irq_unmask)

			chip->irq_unmask(data);



		raw_spin_unlock(&desc->lock);



		if (broke_affinity)

			pr_notice("Broke affinity for irq %i\n", irq);

	}





	/*

	/*

	 * We can remove mdelay() and then send spuriuous interrupts to

	 * We can remove mdelay() and then send spuriuous interrupts to
@@ -539,8 +456,6 @@ void fixup_irqs(void) 
	 * nothing else will touch it.

	 * nothing else will touch it.

	 */

	 */

	for (vector = FIRST_EXTERNAL_VECTOR; vector < NR_VECTORS; vector++) {

	for (vector = FIRST_EXTERNAL_VECTOR; vector < NR_VECTORS; vector++) {

		unsigned int irr;



		if (IS_ERR_OR_NULL(__this_cpu_read(vector_irq[vector])))

		if (IS_ERR_OR_NULL(__this_cpu_read(vector_irq[vector])))

			continue;

			continue;