irqchip/genirq/msi: Use irq_domain_alloc_irqs()
Subsystems (8)
cover irqchip/genirq/msi: Use irq_domain_alloc_irqs()
When reworking the irqdomain locking I noticed that we had quite a few users of the __irq_domain_alloc_irqs() interface which was initially only intended for some legacy x86 use cases.
This first patch updates the irqchip driver so that the irq_domain_alloc_irqs() wrapper is instead used consistently.
The second patch adds a matching irq_domain_alloc_irqs_affinity() helper which can be used when an affinity hint needs to be provided and updates the sole user.
With this update to gpiolib:
https://lore.kernel.org/lkml/[email protected]
the only remaining users of the full interface (with preallocated descriptors) are the two original calls in x86/io_apic and the later added one for IPI.
Johan
Johan Hovold (2):
irqchip: Use irq_domain_alloc_irqs() genirq/irqdomain/msi: Add irq_domain_alloc_irqs_affinity() wrapper
drivers/irqchip/irq-apple-aic.c | 5 ++--- drivers/irqchip/irq-armada-370-xp.c | 4 ++-- drivers/irqchip/irq-bcm2836.c | 6 ++---- drivers/irqchip/irq-gic-v3.c | 5 ++--- drivers/irqchip/irq-gic-v4.c | 10 ++++------ drivers/irqchip/irq-gic.c | 5 ++--- include/linux/irqdomain.h | 15 +++++++++++++++ kernel/irq/msi.c | 6 +++--- 8 files changed, 32 insertions(+), 24 deletions(-)
Signature · 1 line
2.37.4
PATCH 1/2 irqchip: Use irq_domain_alloc_irqs()
Use the irq_domain_alloc_irqs() wrapper instead of the full __irq_domain_alloc_irqs() interface, which was only intended for some legacy (x86) use cases.
--- drivers/irqchip/irq-apple-aic.c | 5 ++--- drivers/irqchip/irq-armada-370-xp.c | 4 ++-- drivers/irqchip/irq-bcm2836.c | 6 ++---- drivers/irqchip/irq-gic-v3.c | 5 ++--- drivers/irqchip/irq-gic-v4.c | 10 ++++------ drivers/irqchip/irq-gic.c | 5 ++--- 6 files changed, 14 insertions(+), 21 deletions(-)
drivers/irqchip/irq-apple-aic.c +2 -3
@@ -924,9 +924,8 @@ static int __init aic_init_smp(struct aic_irq_chip *irqc, struct device_node *no ipi_domain->flags |=IRQ_DOMAIN_FLAG_IPI_SINGLE ;irq_domain_update_bus_token (ipi_domain,DOMAIN_BUS_IPI ); - base_ipi =__irq_domain_alloc_irqs (ipi_domain,-1 ,AIC_NR_SWIPI , -NUMA_NO_NODE ,NULL , false,NULL ); - + base_ipi =irq_domain_alloc_irqs (ipi_domain,AIC_NR_SWIPI ,NUMA_NO_NODE , +NULL );if (WARN_ON (!base_ipi)) {irq_domain_remove (ipi_domain);return -ENODEV ;
drivers/irqchip/irq-armada-370-xp.c +2 -2
@@ -454,8 +454,8 @@ static __init void armada_xp_ipi_init(struct device_node *node)return ;irq_domain_update_bus_token (ipi_domain,DOMAIN_BUS_IPI ); - base_ipi =__irq_domain_alloc_irqs (ipi_domain,-1 ,IPI_DOORBELL_END , -NUMA_NO_NODE ,NULL , false,NULL ); + base_ipi =irq_domain_alloc_irqs (ipi_domain,IPI_DOORBELL_END , +NUMA_NO_NODE ,NULL );if (WARN_ON (!base_ipi))return ;
drivers/irqchip/irq-bcm2836.c +2 -4
@@ -268,10 +268,8 @@ static void __init bcm2836_arm_irqchip_smp_init(void) ipi_domain->flags |=IRQ_DOMAIN_FLAG_IPI_SINGLE ;irq_domain_update_bus_token (ipi_domain,DOMAIN_BUS_IPI ); - base_ipi =__irq_domain_alloc_irqs (ipi_domain,-1 ,BITS_PER_MBOX , -NUMA_NO_NODE ,NULL , - false,NULL ); - + base_ipi =irq_domain_alloc_irqs (ipi_domain,BITS_PER_MBOX , +NUMA_NO_NODE ,NULL );if (WARN_ON (!base_ipi))return ;
drivers/irqchip/irq-gic-v3.c +2 -3
@@ -1310,9 +1310,8 @@ static void __init gic_smp_init(void) gic_starting_cpu, NULL);/* Register all 8 non-secure SGIs */ - base_sgi =__irq_domain_alloc_irqs (gic_data.domain,-1 ,8 , -NUMA_NO_NODE , &sgi_fwspec, - false,NULL ); + base_sgi =irq_domain_alloc_irqs (gic_data.domain,8 ,NUMA_NO_NODE , + &sgi_fwspec);if (WARN_ON (base_sgi <=0 ))return ;
drivers/irqchip/irq-gic-v4.c +4 -6
@@ -139,9 +139,8 @@ static int its_alloc_vcpu_sgis(struct its_vpe *vpe, int idx)if (!vpe->sgi_domain) goto err; - sgi_base =__irq_domain_alloc_irqs (vpe->sgi_domain,-1 ,16 , -NUMA_NO_NODE , vpe, - false,NULL ); + sgi_base =irq_domain_alloc_irqs (vpe->sgi_domain,16 ,NUMA_NO_NODE , + vpe);if (sgi_base <=0 ) goto err;
@@ -176,9 +175,8 @@ int its_alloc_vcpu_irqs(struct its_vm *vm) vm->vpes[i]->idai = true; } - vpe_base_irq =__irq_domain_alloc_irqs (vm->domain,-1 , vm->nr_vpes, -NUMA_NO_NODE , vm, - false,NULL ); + vpe_base_irq =irq_domain_alloc_irqs (vm->domain, vm->nr_vpes, +NUMA_NO_NODE , vm);if (vpe_base_irq <=0 ) goto err;
drivers/irqchip/irq-gic.c +2 -3
@@ -868,9 +868,8 @@ static __init void gic_smp_init(void)"irqchip/arm/gic:starting" , gic_starting_cpu, NULL); - base_sgi =__irq_domain_alloc_irqs (gic_data[0 ].domain,-1 ,8 , -NUMA_NO_NODE , &sgi_fwspec, - false,NULL ); + base_sgi =irq_domain_alloc_irqs (gic_data[0 ].domain,8 ,NUMA_NO_NODE , + &sgi_fwspec);if (WARN_ON (base_sgi <=0 ))return ;
Signature · 1 line
2.37.4
PATCH 2/2 genirq/irqdomain/msi: Add irq_domain_alloc_irqs_affinity() wrapper
In reply to Johan HovoldThe full __irq_domain_alloc_irqs() interface was initially only intended for some legacy (x86) use cases while most callers should use the irq_domain_alloc_irqs() wrapper.
Add a matching irq_domain_alloc_irqs_affinity() wrapper that can be used when an affinity hint needs to be provided and use it for MSI allocations.
--- include/linux/irqdomain.h | 15 +++++++++++++++ kernel/irq/msi.c | 6 +++--- 2 files changed, 18 insertions(+), 3 deletions(-)
include/linux/irqdomain.h +15 -0
@@ -507,6 +507,14 @@ static inline int irq_domain_alloc_irqs(struct irq_domain *domain, NULL); } +static inline int irq_domain_alloc_irqs_affinity (struct irq_domain *domain, +unsigned int nr_irqs,int node,void *arg, +const struct irq_affinity_desc *affinity) +{ +return __irq_domain_alloc_irqs (domain,-1 , nr_irqs, node, arg, false, + affinity); +} +extern int irq_domain_alloc_irqs_hierarchy (struct irq_domain *domain,unsigned int irq_base,unsigned int nr_irqs,void *arg);
@@ -585,6 +593,13 @@ static inline int irq_domain_alloc_irqs(struct irq_domain *domain,return -1 ; } +static inline int irq_domain_alloc_irqs_affinity (struct irq_domain *domain, +unsigned int nr_irqs,int node,void *arg, +const struct irq_affinity_desc *affinity) +{ +return -1 ; +} +static inline void irq_domain_free_irqs (unsigned int virq,unsigned int nr_irqs) { }
kernel/irq/msi.c +3 -3
@@ -1272,9 +1272,9 @@ static int __msi_domain_alloc_irqs(struct device *dev, struct irq_domain *domain ops->set_desc (&arg, desc); - virq =__irq_domain_alloc_irqs (domain,-1 , desc->nvec_used, -dev_to_node (dev), &arg, false, - desc->affinity); + virq =irq_domain_alloc_irqs_affinity (domain, desc->nvec_used, +dev_to_node (dev), &arg, + desc->affinity);if (virq <0 )return msi_handle_pci_fail (domain, desc, allocated);
Signature · 1 line
2.37.4
Re: [PATCH 2/2] genirq/irqdomain/msi: Add irq_domain_alloc_irqs_affinity() wrapper
Quoted 7 lines · Johan Hovold
The full
__irq_domain_alloc_irqs()interface was initially only intended for some legacy (x86) use cases while most callers should use theirq_domain_alloc_irqs()wrapper.Add a matching
irq_domain_alloc_irqs_affinity()wrapper that can be used when an affinity hint needs to be provided and use it for MSI allocations.
I definitely like the irqchip cleanup, but this one is core code and having the extra wrapper is not really buying us much.
Thanks,
tglx
[tip: irq/core] irqchip: Use irq_domain_alloc_irqs()
In reply to Johan HovoldThe following commit has been merged into the irq/core branch of tip:
The following commit has been merged into the irq/core branch of tip:
Commit-ID: 0e2213fe0ab4c04da0e2354e84ec3b90e59939a4 Gitweb: https://git.kernel.org/tip/0e2213fe0ab4c04da0e2354e84ec3b90e59939a4 Author: Johan Hovold <[email protected]> AuthorDate: Tue, 13 Dec 2022 15:08:43 +01:00 Committer: Thomas Gleixner <[email protected]> CommitterDate: Wed, 11 Jan 2023 19:51:39 +01:00
irqchip: Use irq_domain_alloc_irqs()
Use the irq_domain_alloc_irqs() wrapper instead of the full __irq_domain_alloc_irqs() interface, which was only intended for some legacy (x86) use cases.
--- drivers/irqchip/irq-apple-aic.c | 4 +--- drivers/irqchip/irq-armada-370-xp.c | 3 +-- drivers/irqchip/irq-bcm2836.c | 5 +---- drivers/irqchip/irq-gic-v3.c | 4 +--- drivers/irqchip/irq-gic-v4.c | 9 +++------ drivers/irqchip/irq-gic.c | 4 +--- 6 files changed, 8 insertions(+), 21 deletions(-)
drivers/irqchip/irq-apple-aic.c +1 -3
@@ -924,9 +924,7 @@ static int __init aic_init_smp(struct aic_irq_chip *irqc, struct device_node *no ipi_domain->flags |=IRQ_DOMAIN_FLAG_IPI_SINGLE ;irq_domain_update_bus_token (ipi_domain,DOMAIN_BUS_IPI ); - base_ipi =__irq_domain_alloc_irqs (ipi_domain,-1 ,AIC_NR_SWIPI , -NUMA_NO_NODE ,NULL , false,NULL ); - + base_ipi =irq_domain_alloc_irqs (ipi_domain,AIC_NR_SWIPI ,NUMA_NO_NODE ,NULL );if (WARN_ON (!base_ipi)) {irq_domain_remove (ipi_domain);return -ENODEV ;
drivers/irqchip/irq-armada-370-xp.c +1 -2
@@ -454,8 +454,7 @@ static __init void armada_xp_ipi_init(struct device_node *node)return ;irq_domain_update_bus_token (ipi_domain,DOMAIN_BUS_IPI ); - base_ipi =__irq_domain_alloc_irqs (ipi_domain,-1 ,IPI_DOORBELL_END , -NUMA_NO_NODE ,NULL , false,NULL ); + base_ipi =irq_domain_alloc_irqs (ipi_domain,IPI_DOORBELL_END ,NUMA_NO_NODE ,NULL );if (WARN_ON (!base_ipi))return ;
drivers/irqchip/irq-bcm2836.c +1 -4
@@ -268,10 +268,7 @@ static void __init bcm2836_arm_irqchip_smp_init(void) ipi_domain->flags |=IRQ_DOMAIN_FLAG_IPI_SINGLE ;irq_domain_update_bus_token (ipi_domain,DOMAIN_BUS_IPI ); - base_ipi =__irq_domain_alloc_irqs (ipi_domain,-1 ,BITS_PER_MBOX , -NUMA_NO_NODE ,NULL , - false,NULL ); - + base_ipi =irq_domain_alloc_irqs (ipi_domain,BITS_PER_MBOX ,NUMA_NO_NODE ,NULL );if (WARN_ON (!base_ipi))return ;
drivers/irqchip/irq-gic-v3.c +1 -3
@@ -1310,9 +1310,7 @@ static void __init gic_smp_init(void) gic_starting_cpu, NULL);/* Register all 8 non-secure SGIs */ - base_sgi =__irq_domain_alloc_irqs (gic_data.domain,-1 ,8 , -NUMA_NO_NODE , &sgi_fwspec, - false,NULL ); + base_sgi =irq_domain_alloc_irqs (gic_data.domain,8 ,NUMA_NO_NODE , &sgi_fwspec);if (WARN_ON (base_sgi <=0 ))return ;
drivers/irqchip/irq-gic-v4.c +3 -6
@@ -139,9 +139,7 @@ static int its_alloc_vcpu_sgis(struct its_vpe *vpe, int idx)if (!vpe->sgi_domain) goto err; - sgi_base =__irq_domain_alloc_irqs (vpe->sgi_domain,-1 ,16 , -NUMA_NO_NODE , vpe, - false,NULL ); + sgi_base =irq_domain_alloc_irqs (vpe->sgi_domain,16 ,NUMA_NO_NODE , vpe);if (sgi_base <=0 ) goto err;
@@ -176,9 +174,8 @@ int its_alloc_vcpu_irqs(struct its_vm *vm) vm->vpes[i]->idai = true; } - vpe_base_irq =__irq_domain_alloc_irqs (vm->domain,-1 , vm->nr_vpes, -NUMA_NO_NODE , vm, - false,NULL ); + vpe_base_irq =irq_domain_alloc_irqs (vm->domain, vm->nr_vpes, +NUMA_NO_NODE , vm);if (vpe_base_irq <=0 ) goto err;
drivers/irqchip/irq-gic.c +1 -3
@@ -868,9 +868,7 @@ static __init void gic_smp_init(void)"irqchip/arm/gic:starting" , gic_starting_cpu, NULL); - base_sgi =__irq_domain_alloc_irqs (gic_data[0 ].domain,-1 ,8 , -NUMA_NO_NODE , &sgi_fwspec, - false,NULL ); + base_sgi =irq_domain_alloc_irqs (gic_data[0 ].domain,8 ,NUMA_NO_NODE , &sgi_fwspec);if (WARN_ON (base_sgi <=0 ))return ;
Re: [PATCH 2/2] genirq/irqdomain/msi: Add irq_domain_alloc_irqs_affinity() wrapper
In reply to Thomas GleixnerQuoted 11 lines · Thomas Gleixner
Quoted 7 lines · Johan Hovold
The full
__irq_domain_alloc_irqs()interface was initially only intended for some legacy (x86) use cases while most callers should use theirq_domain_alloc_irqs()wrapper.Add a matching
irq_domain_alloc_irqs_affinity()wrapper that can be used when an affinity hint needs to be provided and use it for MSI allocations.I definitely like the irqchip cleanup, but this one is core code and having the extra wrapper is not really buying us much.
Fair enough. If you don't expect there to be any further users then perhaps it's not worth it even if it arguably makes the call site a bit more readable (e.g. by dropping the base and realloc arguments).
Johan
Re: [PATCH 2/2] genirq/irqdomain/msi: Add irq_domain_alloc_irqs_affinity() wrapper
Quoted 10 lines · Johan Hovold
Quoted 9 lines · Thomas Gleixner
Quoted 7 lines · Johan Hovold
The full
__irq_domain_alloc_irqs()interface was initially only intended for some legacy (x86) use cases while most callers should use theirq_domain_alloc_irqs()wrapper.Add a matching
irq_domain_alloc_irqs_affinity()wrapper that can be used when an affinity hint needs to be provided and use it for MSI allocations.
Quoted 6 lines
Quoted 2 lines
I definitely like the irqchip cleanup, but this one is core code and having the extra wrapper is not really buying us much.
Fair enough. If you don't expect there to be any further users then perhaps it's not worth it even if it arguably makes the call site a bit more readable (e.g. by dropping the base and realloc arguments).
And having this wrapper would also limit the use of the full (internal) helper to places that actually need the realloc parameter (e.g. making those stand out more).
Johan