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

Commit a5e74b84 authored by Suresh Siddha's avatar Suresh Siddha Committed by Ingo Molnar
Browse files

x86: Force irq complete move during cpu offline 



When a cpu goes offline, fixup_irqs() try to move irq's
currently destined to the offline cpu to a new cpu. But this
attempt will fail if the irq is recently moved to this cpu and
the irq still hasn't arrived at this cpu (for non intr-remapping
platforms this is when we free the vector allocation at the
previous destination) that is about to go offline.

This will endup with the interrupt subsystem still pointing the
irq to the offline cpu, causing that irq to not work any more.

Fix this by forcing the irq to complete its move (its been a
long time we moved the irq to this cpu which we are offlining
now) and then move this irq to a new cpu before this cpu goes
offline.

Signed-off-by: default avatarSuresh Siddha <suresh.b.siddha@intel.com>
Acked-by: default avatarGary Hade <garyhade@us.ibm.com>
Cc: Eric W. Biederman <ebiederm@xmission.com>
LKML-Reference: <20091026230001.848830905@sbs-t61.sc.intel.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 23359a88

arch/x86/include/asm/irq.h

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ static inline int irq_canonicalize(int irq) 
#ifdef CONFIG_HOTPLUG_CPU

#include <linux/cpumask.h>

extern void fixup_irqs(void);

extern void irq_force_complete_move(int);

#endif



extern void (*generic_interrupt_extension)(void);

arch/x86/kernel/apic/io_apic.c

+15 −3
Original line number Diff line number Diff line
@@ -2450,21 +2450,33 @@ asmlinkage void smp_irq_move_cleanup_interrupt(void) 
	irq_exit();

}



static void irq_complete_move(struct irq_desc **descp)

static void __irq_complete_move(struct irq_desc **descp, unsigned vector)

{

	struct irq_desc *desc = *descp;

	struct irq_cfg *cfg = desc->chip_data;

	unsigned vector, me;

	unsigned me;



	if (likely(!cfg->move_in_progress))

		return;



	vector = ~get_irq_regs()->orig_ax;

	me = smp_processor_id();



	if (vector == cfg->vector && cpumask_test_cpu(me, cfg->domain))

		send_cleanup_vector(cfg);

}



static void irq_complete_move(struct irq_desc **descp)

{

	__irq_complete_move(descp, ~get_irq_regs()->orig_ax);

}



void irq_force_complete_move(int irq)

{

	struct irq_desc *desc = irq_to_desc(irq);

	struct irq_cfg *cfg = desc->chip_data;



	__irq_complete_move(&desc, cfg->vector);

}

#else

static inline void irq_complete_move(struct irq_desc **descp) {}

#endif

arch/x86/kernel/irq.c

+7 −0
Original line number Diff line number Diff line
@@ -305,6 +305,13 @@ void fixup_irqs(void) 
			continue;

		}



		/*

		 * Complete the irq move. This cpu is going down and for

		 * non intr-remapping case, we can't wait till this interrupt

		 * arrives at this cpu before completing the irq move.

		 */

		irq_force_complete_move(irq);



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

			break_affinity = 1;

			affinity = cpu_all_mask;