mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-03 01:59:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

genirq: Switch to irq_get_nr_irqs()

Browse source 
Use the irq_get_nr_irqs() function instead of the global variable
'nr_irqs'. Cache the result of this function in a local variable in
order not to rely on CSE (common subexpression elimination). Prepare
for changing 'nr_irqs' from an exported global variable into a variable
with file scope.

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20241015190953.1266194-22-bvanassche@acm.org
This commit is contained in:
Bart Van Assche 2024-10-15 12:09:52 -07:00 committed by Thomas Gleixner
parent f4dd946c77
commit 1ad2048bf7
3 changed files with 22 additions and 16 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

33
include/linux/irqnr.h
View file

@ -11,26 +11,31 @@ unsigned int irq_set_nr_irqs(unsigned int nr);
extern struct irq_desc *irq_to_desc(unsigned int irq); extern struct irq_desc *irq_to_desc(unsigned int irq);
unsigned int irq_get_next_irq(unsigned int offset); unsigned int irq_get_next_irq(unsigned int offset);
# define for_each_irq_desc(irq, desc) \ #define for_each_irq_desc(irq, desc) \
for (irq = 0, desc = irq_to_desc(irq); irq < nr_irqs; \ for (unsigned int __nr_irqs__ = irq_get_nr_irqs(); __nr_irqs__; \
irq++, desc = irq_to_desc(irq)) \ __nr_irqs__ = 0) \
if (!desc) \ for (irq = 0, desc = irq_to_desc(irq); irq < __nr_irqs__; \
; \ irq++, desc = irq_to_desc(irq)) \
else if (!desc) \
; \
else
# define for_each_irq_desc_reverse(irq, desc) \ # define for_each_irq_desc_reverse(irq, desc) \
for (irq = nr_irqs - 1, desc = irq_to_desc(irq); irq >= 0; \ for (irq = irq_get_nr_irqs() - 1, desc = irq_to_desc(irq); \
irq--, desc = irq_to_desc(irq)) \ irq >= 0; irq--, desc = irq_to_desc(irq)) \
if (!desc) \ if (!desc) \
; \ ; \
else else
# define for_each_active_irq(irq) \ #define for_each_active_irq(irq) \
for (irq = irq_get_next_irq(0); irq < nr_irqs; \ for (unsigned int __nr_irqs__ = irq_get_nr_irqs(); __nr_irqs__; \
irq = irq_get_next_irq(irq + 1)) __nr_irqs__ = 0) \
for (irq = irq_get_next_irq(0); irq < __nr_irqs__; \
irq = irq_get_next_irq(irq + 1))
#define for_each_irq_nr(irq) \ #define for_each_irq_nr(irq) \
for (irq = 0; irq < nr_irqs; irq++) for (unsigned int __nr_irqs__ = irq_get_nr_irqs(); __nr_irqs__; \
__nr_irqs__ = 0) \
for (irq = 0; irq < __nr_irqs__; irq++)
#endif #endif

2
kernel/irq/irqdomain.c
View file

@ -1225,7 +1225,7 @@ int irq_domain_alloc_descs(int virq, unsigned int cnt, irq_hw_number_t hwirq,
virq = __irq_alloc_descs(virq, virq, cnt, node, THIS_MODULE, virq = __irq_alloc_descs(virq, virq, cnt, node, THIS_MODULE,
affinity); affinity);
} else { } else {
hint = hwirq % nr_irqs; hint = hwirq % irq_get_nr_irqs();
if (hint == 0) if (hint == 0)
hint++; hint++;
virq = __irq_alloc_descs(-1, hint, cnt, node, THIS_MODULE, virq = __irq_alloc_descs(-1, hint, cnt, node, THIS_MODULE,

3
kernel/irq/proc.c
View file

@ -457,11 +457,12 @@ int __weak arch_show_interrupts(struct seq_file *p, int prec)
} }
#ifndef ACTUAL_NR_IRQS #ifndef ACTUAL_NR_IRQS
# define ACTUAL_NR_IRQS nr_irqs # define ACTUAL_NR_IRQS irq_get_nr_irqs()
#endif #endif
int show_interrupts(struct seq_file *p, void *v) int show_interrupts(struct seq_file *p, void *v)
{ {
const unsigned int nr_irqs = irq_get_nr_irqs();
static int prec; static int prec;
int i = *(loff_t *) v, j; int i = *(loff_t *) v, j;