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

Commit 85ac16d0 authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

x86/irq: change irq_desc_alloc() to take node instead of cpu 



This simplifies the node awareness of the code. All our allocators
only deal with a NUMA node ID locality not with CPU ids anyway - so
there's no need to maintain (and transform) a CPU id all across the
IRq layer.

v2: keep move_irq_desc related

[ Impact: cleanup, prepare IRQ code to be NUMA-aware ]

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
LKML-Reference: <49F65536.2020300@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 57b150cc

arch/x86/kernel/apic/io_apic.c

+26 −32
Original line number Diff line number Diff line
@@ -129,12 +129,9 @@ struct irq_pin_list { 
	struct irq_pin_list *next;

};



static struct irq_pin_list *get_one_free_irq_2_pin(int cpu)

static struct irq_pin_list *get_one_free_irq_2_pin(int node)

{

	struct irq_pin_list *pin;

	int node;



	node = cpu_to_node(cpu);



	pin = kzalloc_node(sizeof(*pin), GFP_ATOMIC, node);
@@ -209,12 +206,9 @@ static struct irq_cfg *irq_cfg(unsigned int irq) 
	return cfg;

}



static struct irq_cfg *get_one_free_irq_cfg(int cpu)

static struct irq_cfg *get_one_free_irq_cfg(int node)

{

	struct irq_cfg *cfg;

	int node;



	node = cpu_to_node(cpu);



	cfg = kzalloc_node(sizeof(*cfg), GFP_ATOMIC, node);

	if (cfg) {
@@ -235,13 +229,13 @@ static struct irq_cfg *get_one_free_irq_cfg(int cpu) 
	return cfg;

}



int arch_init_chip_data(struct irq_desc *desc, int cpu)

int arch_init_chip_data(struct irq_desc *desc, int node)

{

	struct irq_cfg *cfg;



	cfg = desc->chip_data;

	if (!cfg) {

		desc->chip_data = get_one_free_irq_cfg(cpu);

		desc->chip_data = get_one_free_irq_cfg(node);

		if (!desc->chip_data) {

			printk(KERN_ERR "can not alloc irq_cfg\n");

			BUG_ON(1);
@@ -253,7 +247,7 @@ int arch_init_chip_data(struct irq_desc *desc, int cpu) 


/* for move_irq_desc */

static void

init_copy_irq_2_pin(struct irq_cfg *old_cfg, struct irq_cfg *cfg, int cpu)

init_copy_irq_2_pin(struct irq_cfg *old_cfg, struct irq_cfg *cfg, int node)

{

	struct irq_pin_list *old_entry, *head, *tail, *entry;
@@ -262,7 +256,7 @@ init_copy_irq_2_pin(struct irq_cfg *old_cfg, struct irq_cfg *cfg, int cpu) 
	if (!old_entry)

		return;



	entry = get_one_free_irq_2_pin(cpu);

	entry = get_one_free_irq_2_pin(node);

	if (!entry)

		return;
@@ -272,7 +266,7 @@ init_copy_irq_2_pin(struct irq_cfg *old_cfg, struct irq_cfg *cfg, int cpu) 
	tail		= entry;

	old_entry	= old_entry->next;

	while (old_entry) {

		entry = get_one_free_irq_2_pin(cpu);

		entry = get_one_free_irq_2_pin(node);

		if (!entry) {

			entry = head;

			while (entry) {
@@ -312,12 +306,12 @@ static void free_irq_2_pin(struct irq_cfg *old_cfg, struct irq_cfg *cfg) 
}



void arch_init_copy_chip_data(struct irq_desc *old_desc,

				 struct irq_desc *desc, int cpu)

				 struct irq_desc *desc, int node)

{

	struct irq_cfg *cfg;

	struct irq_cfg *old_cfg;



	cfg = get_one_free_irq_cfg(cpu);

	cfg = get_one_free_irq_cfg(node);



	if (!cfg)

		return;
@@ -328,7 +322,7 @@ void arch_init_copy_chip_data(struct irq_desc *old_desc, 


	memcpy(cfg, old_cfg, sizeof(struct irq_cfg));



	init_copy_irq_2_pin(old_cfg, cfg, cpu);

	init_copy_irq_2_pin(old_cfg, cfg, node);

}



static void free_irq_cfg(struct irq_cfg *old_cfg)
@@ -615,13 +609,13 @@ set_ioapic_affinity_irq(unsigned int irq, const struct cpumask *mask) 
 * shared ISA-space IRQs, so we have to support them. We are super

 * fast in the common case, and fast for shared ISA-space IRQs.

 */

static void add_pin_to_irq_cpu(struct irq_cfg *cfg, int cpu, int apic, int pin)

static void add_pin_to_irq_node(struct irq_cfg *cfg, int node, int apic, int pin)

{

	struct irq_pin_list *entry;



	entry = cfg->irq_2_pin;

	if (!entry) {

		entry = get_one_free_irq_2_pin(cpu);

		entry = get_one_free_irq_2_pin(node);

		if (!entry) {

			printk(KERN_ERR "can not alloc irq_2_pin to add %d - %d\n",

					apic, pin);
@@ -641,7 +635,7 @@ static void add_pin_to_irq_cpu(struct irq_cfg *cfg, int cpu, int apic, int pin) 
		entry = entry->next;

	}



	entry->next = get_one_free_irq_2_pin(cpu);

	entry->next = get_one_free_irq_2_pin(node);

	entry = entry->next;

	entry->apic = apic;

	entry->pin = pin;
@@ -650,7 +644,7 @@ static void add_pin_to_irq_cpu(struct irq_cfg *cfg, int cpu, int apic, int pin) 
/*

 * Reroute an IRQ to a different pin.

 */

static void __init replace_pin_at_irq_cpu(struct irq_cfg *cfg, int cpu,

static void __init replace_pin_at_irq_node(struct irq_cfg *cfg, int node,

				      int oldapic, int oldpin,

				      int newapic, int newpin)

{
@@ -670,7 +664,7 @@ static void __init replace_pin_at_irq_cpu(struct irq_cfg *cfg, int cpu, 


	/* why? call replace before add? */

	if (!replaced)

		add_pin_to_irq_cpu(cfg, cpu, newapic, newpin);

		add_pin_to_irq_node(cfg, node, newapic, newpin);

}



static inline void io_apic_modify_irq(struct irq_cfg *cfg,
@@ -1612,7 +1606,7 @@ static void __init setup_IO_APIC_irqs(void) 
	int notcon = 0;

	struct irq_desc *desc;

	struct irq_cfg *cfg;

	int cpu = boot_cpu_id;

	int node = cpu_to_node(boot_cpu_id);



	apic_printk(APIC_VERBOSE, KERN_DEBUG "init IO_APIC IRQs\n");
@@ -1647,13 +1641,13 @@ static void __init setup_IO_APIC_irqs(void) 
					apic->multi_timer_check(apic_id, irq))

				continue;



			desc = irq_to_desc_alloc_cpu(irq, cpu);

			desc = irq_to_desc_alloc_node(irq, node);

			if (!desc) {

				printk(KERN_INFO "can not get irq_desc for %d\n", irq);

				continue;

			}

			cfg = desc->chip_data;

			add_pin_to_irq_cpu(cfg, cpu, apic_id, pin);

			add_pin_to_irq_node(cfg, node, apic_id, pin);



			setup_IO_APIC_irq(apic_id, pin, irq, desc,

					irq_trigger(idx), irq_polarity(idx));
@@ -2863,7 +2857,7 @@ static inline void __init check_timer(void) 
{

	struct irq_desc *desc = irq_to_desc(0);

	struct irq_cfg *cfg = desc->chip_data;

	int cpu = boot_cpu_id;

	int node = cpu_to_node(boot_cpu_id);

	int apic1, pin1, apic2, pin2;

	unsigned long flags;

	int no_pin1 = 0;
@@ -2929,7 +2923,7 @@ static inline void __init check_timer(void) 
		 * Ok, does IRQ0 through the IOAPIC work?

		 */

		if (no_pin1) {

			add_pin_to_irq_cpu(cfg, cpu, apic1, pin1);

			add_pin_to_irq_node(cfg, node, apic1, pin1);

			setup_timer_IRQ0_pin(apic1, pin1, cfg->vector);

		} else {

			/* for edge trigger, setup_IO_APIC_irq already
@@ -2966,7 +2960,7 @@ static inline void __init check_timer(void) 
		/*

		 * legacy devices should be connected to IO APIC #0

		 */

		replace_pin_at_irq_cpu(cfg, cpu, apic1, pin1, apic2, pin2);

		replace_pin_at_irq_node(cfg, node, apic1, pin1, apic2, pin2);

		setup_timer_IRQ0_pin(apic2, pin2, cfg->vector);

		enable_8259A_irq(0);

		if (timer_irq_works()) {
@@ -3185,7 +3179,7 @@ unsigned int create_irq_nr(unsigned int irq_want) 
	unsigned int new;

	unsigned long flags;

	struct irq_cfg *cfg_new = NULL;

	int cpu = boot_cpu_id;

	int node = cpu_to_node(boot_cpu_id);

	struct irq_desc *desc_new = NULL;



	irq = 0;
@@ -3194,7 +3188,7 @@ unsigned int create_irq_nr(unsigned int irq_want) 


	spin_lock_irqsave(&vector_lock, flags);

	for (new = irq_want; new < nr_irqs; new++) {

		desc_new = irq_to_desc_alloc_cpu(new, cpu);

		desc_new = irq_to_desc_alloc_node(new, node);

		if (!desc_new) {

			printk(KERN_INFO "can not get irq_desc for %d\n", new);

			continue;
@@ -3968,7 +3962,7 @@ int io_apic_set_pci_routing (int ioapic, int pin, int irq, int triggering, int p 
{

	struct irq_desc *desc;

	struct irq_cfg *cfg;

	int cpu = boot_cpu_id;

	int node = cpu_to_node(boot_cpu_id);



	if (!IO_APIC_IRQ(irq)) {

		apic_printk(APIC_QUIET,KERN_ERR "IOAPIC[%d]: Invalid reference to IRQ 0\n",
@@ -3976,7 +3970,7 @@ int io_apic_set_pci_routing (int ioapic, int pin, int irq, int triggering, int p 
		return -EINVAL;

	}



	desc = irq_to_desc_alloc_cpu(irq, cpu);

	desc = irq_to_desc_alloc_node(irq, node);

	if (!desc) {

		printk(KERN_INFO "can not get irq_desc %d\n", irq);

		return 0;
@@ -3987,7 +3981,7 @@ int io_apic_set_pci_routing (int ioapic, int pin, int irq, int triggering, int p 
	 */

	if (irq >= NR_IRQS_LEGACY) {

		cfg = desc->chip_data;

		add_pin_to_irq_cpu(cfg, cpu, ioapic, pin);

		add_pin_to_irq_node(cfg, node, ioapic, pin);

	}



	setup_IO_APIC_irq(ioapic, pin, irq, desc, triggering, polarity);

arch/x86/lguest/boot.c

+1 −1
Original line number Diff line number Diff line
@@ -636,7 +636,7 @@ static void __init lguest_init_IRQ(void) 


void lguest_setup_irq(unsigned int irq)

{

	irq_to_desc_alloc_cpu(irq, 0);

	irq_to_desc_alloc_node(irq, 0);

	set_irq_chip_and_handler_name(irq, &lguest_irq_controller,

				      handle_level_irq, "level");

}

drivers/pci/intr_remapping.c

+6 −9
Original line number Diff line number Diff line
@@ -23,15 +23,12 @@ struct irq_2_iommu { 
};



#ifdef CONFIG_GENERIC_HARDIRQS

static struct irq_2_iommu *get_one_free_irq_2_iommu(int cpu)

static struct irq_2_iommu *get_one_free_irq_2_iommu(int node)

{

	struct irq_2_iommu *iommu;

	int node;



	node = cpu_to_node(cpu);



	iommu = kzalloc_node(sizeof(*iommu), GFP_ATOMIC, node);

	printk(KERN_DEBUG "alloc irq_2_iommu on cpu %d node %d\n", cpu, node);

	printk(KERN_DEBUG "alloc irq_2_iommu on node %d\n", node);



	return iommu;

}
@@ -48,7 +45,7 @@ static struct irq_2_iommu *irq_2_iommu(unsigned int irq) 
	return desc->irq_2_iommu;

}



static struct irq_2_iommu *irq_2_iommu_alloc_cpu(unsigned int irq, int cpu)

static struct irq_2_iommu *irq_2_iommu_alloc_node(unsigned int irq, int node)

{

	struct irq_desc *desc;

	struct irq_2_iommu *irq_iommu;
@@ -56,7 +53,7 @@ static struct irq_2_iommu *irq_2_iommu_alloc_cpu(unsigned int irq, int cpu) 
	/*

	 * alloc irq desc if not allocated already.

	 */

	desc = irq_to_desc_alloc_cpu(irq, cpu);

	desc = irq_to_desc_alloc_node(irq, node);

	if (!desc) {

		printk(KERN_INFO "can not get irq_desc for %d\n", irq);

		return NULL;
@@ -65,14 +62,14 @@ static struct irq_2_iommu *irq_2_iommu_alloc_cpu(unsigned int irq, int cpu) 
	irq_iommu = desc->irq_2_iommu;



	if (!irq_iommu)

		desc->irq_2_iommu = get_one_free_irq_2_iommu(cpu);

		desc->irq_2_iommu = get_one_free_irq_2_iommu(node);



	return desc->irq_2_iommu;

}



static struct irq_2_iommu *irq_2_iommu_alloc(unsigned int irq)

{

	return irq_2_iommu_alloc_cpu(irq, boot_cpu_id);

	return irq_2_iommu_alloc_node(irq, cpu_to_node(boot_cpu_id));

}



#else /* !CONFIG_SPARSE_IRQ */

drivers/xen/events.c

+1 −1
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ static int find_unbound_irq(void) 
	if (irq == nr_irqs)

		panic("No available IRQ to bind to: increase nr_irqs!\n");



	desc = irq_to_desc_alloc_cpu(irq, 0);

	desc = irq_to_desc_alloc_node(irq, 0);

	if (WARN_ON(desc == NULL))

		return -1;

include/linux/interrupt.h

+1 −1
Original line number Diff line number Diff line
@@ -566,6 +566,6 @@ struct irq_desc; 
extern int early_irq_init(void);

extern int arch_probe_nr_irqs(void);

extern int arch_early_irq_init(void);

extern int arch_init_chip_data(struct irq_desc *desc, int cpu);

extern int arch_init_chip_data(struct irq_desc *desc, int node);



#endif