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

Commit 06ee6d57 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

genirq: Add affinity hint to irq allocation 



Add an extra argument to the irq(domain) allocation functions, so we can hand
down affinity hints to the allocator. Thats necessary to implement proper
support for multiqueue devices.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Christoph Hellwig <hch@lst.de>
Cc: linux-block@vger.kernel.org
Cc: linux-pci@vger.kernel.org
Cc: linux-nvme@lists.infradead.org
Cc: axboe@fb.com
Cc: agordeev@redhat.com
Link: http://lkml.kernel.org/r/1467621574-8277-4-git-send-email-hch@lst.de


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 9c255583

arch/sparc/kernel/irq_64.c

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ unsigned int irq_alloc(unsigned int dev_handle, unsigned int dev_ino) 
{

	int irq;



	irq = __irq_alloc_descs(-1, 1, 1, numa_node_id(), NULL);

	irq = __irq_alloc_descs(-1, 1, 1, numa_node_id(), NULL, NULL);

	if (irq <= 0)

		goto out;

arch/x86/kernel/apic/io_apic.c

+3 −2
Original line number Diff line number Diff line
@@ -981,7 +981,7 @@ static int alloc_irq_from_domain(struct irq_domain *domain, int ioapic, u32 gsi, 


	return __irq_domain_alloc_irqs(domain, irq, 1,

				       ioapic_alloc_attr_node(info),

				       info, legacy);

				       info, legacy, NULL);

}



/*
@@ -1014,7 +1014,8 @@ static int alloc_isa_irq_from_domain(struct irq_domain *domain, 
					  info->ioapic_pin))

			return -ENOMEM;

	} else {

		irq = __irq_domain_alloc_irqs(domain, irq, 1, node, info, true);

		irq = __irq_domain_alloc_irqs(domain, irq, 1, node, info, true,

					      NULL);

		if (irq >= 0) {

			irq_data = irq_domain_get_irq_data(domain, irq);

			data = irq_data->chip_data;

include/linux/irq.h

+2 −2
Original line number Diff line number Diff line
@@ -708,11 +708,11 @@ static inline struct cpumask *irq_data_get_affinity_mask(struct irq_data *d) 
unsigned int arch_dynirq_lower_bound(unsigned int from);



int __irq_alloc_descs(int irq, unsigned int from, unsigned int cnt, int node,

		struct module *owner);

		      struct module *owner, const struct cpumask *affinity);



/* use macros to avoid needing export.h for THIS_MODULE */

#define irq_alloc_descs(irq, from, cnt, node)	\

	__irq_alloc_descs(irq, from, cnt, node, THIS_MODULE)

	__irq_alloc_descs(irq, from, cnt, node, THIS_MODULE, NULL)



#define irq_alloc_desc(node)			\

	irq_alloc_descs(-1, 0, 1, node)

include/linux/irqdomain.h

+6 −3
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ struct irq_domain; 
struct of_device_id;

struct irq_chip;

struct irq_data;

struct cpumask;



/* Number of irqs reserved for a legacy isa controller */

#define NUM_ISA_INTERRUPTS	16
@@ -217,7 +218,8 @@ extern struct irq_domain *irq_find_matching_fwspec(struct irq_fwspec *fwspec, 
						   enum irq_domain_bus_token bus_token);

extern void irq_set_default_host(struct irq_domain *host);

extern int irq_domain_alloc_descs(int virq, unsigned int nr_irqs,

				  irq_hw_number_t hwirq, int node);

				  irq_hw_number_t hwirq, int node,

				  const struct cpumask *affinity);



static inline struct fwnode_handle *of_node_to_fwnode(struct device_node *node)

{
@@ -389,7 +391,7 @@ static inline struct irq_domain *irq_domain_add_hierarchy(struct irq_domain *par 


extern int __irq_domain_alloc_irqs(struct irq_domain *domain, int irq_base,

				   unsigned int nr_irqs, int node, void *arg,

				   bool realloc);

				   bool realloc, const struct cpumask *affinity);

extern void irq_domain_free_irqs(unsigned int virq, unsigned int nr_irqs);

extern void irq_domain_activate_irq(struct irq_data *irq_data);

extern void irq_domain_deactivate_irq(struct irq_data *irq_data);
@@ -397,7 +399,8 @@ extern void irq_domain_deactivate_irq(struct irq_data *irq_data); 
static inline int irq_domain_alloc_irqs(struct irq_domain *domain,

			unsigned int nr_irqs, int node, void *arg)

{

	return __irq_domain_alloc_irqs(domain, -1, nr_irqs, node, arg, false);

	return __irq_domain_alloc_irqs(domain, -1, nr_irqs, node, arg, false,

				       NULL);

}



extern int irq_domain_alloc_irqs_recursive(struct irq_domain *domain,

kernel/irq/ipi.c

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ int irq_reserve_ipi(struct irq_domain *domain, 
		}

	}



	virq = irq_domain_alloc_descs(-1, nr_irqs, 0, NUMA_NO_NODE);

	virq = irq_domain_alloc_descs(-1, nr_irqs, 0, NUMA_NO_NODE, NULL);

	if (virq <= 0) {

		pr_warn("Can't reserve IPI, failed to alloc descs\n");

		return -ENOMEM;