Commit d388e5fd authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Ingo Molnar
Browse files

x86: Restore proper vector locking during cpu hotplug 



Having cpu_online_map change during assign_irq_vector can result
in some really nasty and weird things happening.  The one that
bit me last time was accessing non existent per cpu memory for non
existent cpus.

This locking was removed in a sloppy x86_64 and x86_32 merge patch.

Guys can we please try and avoid subtly breaking x86 when we are
merging files together?

Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 31343d8a

arch/x86/kernel/io_apic_32.c

+1 −5
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ atomic_t irq_mis_count; 
static struct { int pin, apic; } ioapic_i8259 = { -1, -1 };



static DEFINE_SPINLOCK(ioapic_lock);

static DEFINE_SPINLOCK(vector_lock);

DEFINE_SPINLOCK(vector_lock);



int timer_through_8259 __initdata;
@@ -1209,10 +1209,6 @@ static int assign_irq_vector(int irq) 
	return vector;

}



void setup_vector_irq(int cpu)

{

}



static struct irq_chip ioapic_chip;



#define IOAPIC_AUTO	-1

arch/x86/kernel/io_apic_64.c

+15 −10
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ int timer_through_8259 __initdata; 
static struct { int pin, apic; } ioapic_i8259 = { -1, -1 };



static DEFINE_SPINLOCK(ioapic_lock);

DEFINE_SPINLOCK(vector_lock);

static DEFINE_SPINLOCK(vector_lock);



/*

 * # of IRQ routing registers
@@ -697,6 +697,19 @@ static int pin_2_irq(int idx, int apic, int pin) 
	return irq;

}



void lock_vector_lock(void)

{

	/* Used to the online set of cpus does not change

	 * during assign_irq_vector.

	 */

	spin_lock(&vector_lock);

}



void unlock_vector_lock(void)

{

	spin_unlock(&vector_lock);

}



static int __assign_irq_vector(int irq, cpumask_t mask)

{

	/*
@@ -802,7 +815,7 @@ static void __clear_irq_vector(int irq) 
	cpus_clear(cfg->domain);

}



static void __setup_vector_irq(int cpu)

void __setup_vector_irq(int cpu)

{

	/* Initialize vector_irq on a new cpu */

	/* This function must be called with vector_lock held */
@@ -825,14 +838,6 @@ static void __setup_vector_irq(int cpu) 
	}

}



void setup_vector_irq(int cpu)

{

	spin_lock(&vector_lock);

	__setup_vector_irq(smp_processor_id());

	spin_unlock(&vector_lock);

}





static struct irq_chip ioapic_chip;



static void ioapic_register_intr(int irq, unsigned long trigger)

arch/x86/kernel/smpboot.c

+9 −3
Original line number Diff line number Diff line
@@ -326,12 +326,16 @@ static void __cpuinit start_secondary(void *unused) 
	 * for which cpus receive the IPI. Holding this

	 * lock helps us to not include this cpu in a currently in progress

	 * smp_call_function().

	 *

	 * We need to hold vector_lock so there the set of online cpus

	 * does not change while we are assigning vectors to cpus.  Holding

	 * this lock ensures we don't half assign or remove an irq from a cpu.

	 */

	ipi_call_lock_irq();

#ifdef CONFIG_X86_IO_APIC

	setup_vector_irq(smp_processor_id());

#endif

	lock_vector_lock();

	__setup_vector_irq(smp_processor_id());

	cpu_set(smp_processor_id(), cpu_online_map);

	unlock_vector_lock();

	ipi_call_unlock_irq();

	per_cpu(cpu_state, smp_processor_id()) = CPU_ONLINE;
@@ -1336,7 +1340,9 @@ int __cpu_disable(void) 
	remove_siblinginfo(cpu);



	/* It's now safe to remove this processor from the online map */

	lock_vector_lock();

	remove_cpu_from_maps(cpu);

	unlock_vector_lock();

	fixup_irqs(cpu_online_map);

	return 0;

}

include/asm-x86/hw_irq.h

+10 −2
Original line number Diff line number Diff line
@@ -98,9 +98,17 @@ extern void (*const interrupt[NR_IRQS])(void); 
#else

typedef int vector_irq_t[NR_VECTORS];

DECLARE_PER_CPU(vector_irq_t, vector_irq);

extern spinlock_t vector_lock;

#endif

extern void setup_vector_irq(int cpu);



#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_X86_64)

extern void lock_vector_lock(void);

extern void unlock_vector_lock(void);

extern void __setup_vector_irq(int cpu);

#else

static inline void lock_vector_lock(void) {}

static inline void unlock_vector_lock(void) {}

static inline void __setup_vector_irq(int cpu) {}

#endif



#endif /* !ASSEMBLY_ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE