History

genirq: Expose nr_irqs in core code

... to avoid function calls in the core code to retrieve the maximum number of interrupts. Rename it to 'total_nr_irqs' as 'nr_irqs' is too generic and fix up the 'nr_irqs' reference in the related GDB script as well.

Thomas Gleixner committed 6 months ago

Commit b99dc721 parent cca5e6f4 files · +18 −17Browse files

Unified · Split

4 files
  1. kernel/irq/internals.h +1 −0
  2. kernel/irq/irqdesc.c +14 −14
  3. kernel/irq/proc.c +2 −2
  4. scripts/gdb/linux/interrupts.py +1 −1
kernel/irq/internals.h+1−0
@@ -21,6 +21,7 @@ · 20 unmodified lines
2121
2222 extern bool noirqdebug;
2323 extern int irq_poll_cpu;
24+extern unsigned int total_nr_irqs;
2425
2526 extern struct irqaction chained_action;
2627
kernel/irq/irqdesc.c+14−14
@@ -140,14 +140,14 @@ static void desc_set_defaults(unsigned int irq, struct irq_desc *desc, int node, · 139 unmodified lines
140140 desc_smp_init(desc, node, affinity);
141141 }
142142
143−static unsigned int nr_irqs = NR_IRQS;
143+unsigned int total_nr_irqs __read_mostly = NR_IRQS;
144144
145145 /**
146146 * irq_get_nr_irqs() - Number of interrupts supported by the system.
147147 */
148148 unsigned int irq_get_nr_irqs(void)
149149 {
150− return nr_irqs;
150+ return total_nr_irqs;
151151 }
152152 EXPORT_SYMBOL_GPL(irq_get_nr_irqs);
153153
@@ -159,7 +159,7 @@ EXPORT_SYMBOL_GPL(irq_get_nr_irqs); · 5 unmodified lines
159159 */
160160 unsigned int irq_set_nr_irqs(unsigned int nr)
161161 {
162− nr_irqs = nr;
162+ total_nr_irqs = nr;
163163
164164 return nr;
165165 }
@@ -187,9 +187,9 @@ static unsigned int irq_find_at_or_after(unsigned int offset) · 21 unmodified lines
187187 struct irq_desc *desc;
188188
189189 guard(rcu)();
190− desc = mt_find(&sparse_irqs, &index, nr_irqs);
190+ desc = mt_find(&sparse_irqs, &index, total_nr_irqs);
191191
192− return desc ? irq_desc_get_irq(desc) : nr_irqs;
192+ return desc ? irq_desc_get_irq(desc) : total_nr_irqs;
193193 }
194194
195195 static void irq_insert_desc(unsigned int irq, struct irq_desc *desc)
@@ -543,7 +543,7 @@ static bool irq_expand_nr_irqs(unsigned int nr) · 347 unmodified lines
543543 {
544544 if (nr > MAX_SPARSE_IRQS)
545545 return false;
546− nr_irqs = nr;
546+ total_nr_irqs = nr;
547547 return true;
548548 }
549549
@@ -557,16 +557,16 @@ int __init early_irq_init(void) · 7 unmodified lines
557557 /* Let arch update nr_irqs and return the nr of preallocated irqs */
558558 initcnt = arch_probe_nr_irqs();
559559 printk(KERN_INFO "NR_IRQS: %d, nr_irqs: %d, preallocated irqs: %d\n",
560− NR_IRQS, nr_irqs, initcnt);
560+ NR_IRQS, total_nr_irqs, initcnt);
561561
562− if (WARN_ON(nr_irqs > MAX_SPARSE_IRQS))
563− nr_irqs = MAX_SPARSE_IRQS;
562+ if (WARN_ON(total_nr_irqs > MAX_SPARSE_IRQS))
563+ total_nr_irqs = MAX_SPARSE_IRQS;
564564
565565 if (WARN_ON(initcnt > MAX_SPARSE_IRQS))
566566 initcnt = MAX_SPARSE_IRQS;
567567
568− if (initcnt > nr_irqs)
569− nr_irqs = initcnt;
568+ if (initcnt > total_nr_irqs)
569+ total_nr_irqs = initcnt;
570570
571571 for (i = 0; i < initcnt; i++) {
572572 desc = alloc_desc(i, node, 0, NULL, NULL);
@@ -862,7 +862,7 @@ void irq_free_descs(unsigned int from, unsigned int cnt) · 289 unmodified lines
862862 {
863863 int i;
864864
865− if (from >= nr_irqs || (from + cnt) > nr_irqs)
865+ if (from >= total_nr_irqs || (from + cnt) > total_nr_irqs)
866866 return;
867867
868868 guard(mutex)(&sparse_irq_lock);
@@ -911,7 +911,7 @@ int __ref __irq_alloc_descs(int irq, unsigned int from, unsigned int cnt, int no · 42 unmodified lines
911911 if (irq >=0 && start != irq)
912912 return -EEXIST;
913913
914− if (start + cnt > nr_irqs) {
914+ if (start + cnt > total_nr_irqs) {
915915 if (!irq_expand_nr_irqs(start + cnt))
916916 return -ENOMEM;
917917 }
@@ -923,7 +923,7 @@ EXPORT_SYMBOL_GPL(__irq_alloc_descs); · 5 unmodified lines
923923 * irq_get_next_irq - get next allocated irq number
924924 * @offset: where to start the search
925925 *
926− * Returns next irq number after offset or nr_irqs if none is found.
926+ * Returns next irq number after offset or total_nr_irqs if none is found.
927927 */
928928 unsigned int irq_get_next_irq(unsigned int offset)
929929 {
kernel/irq/proc.c+2−2
@@ -448,7 +448,7 @@ int __weak arch_show_interrupts(struct seq_file *p, int prec) · 447 unmodified lines
448448 }
449449
450450 #ifndef ACTUAL_NR_IRQS
451−# define ACTUAL_NR_IRQS irq_get_nr_irqs()
451+# define ACTUAL_NR_IRQS total_nr_irqs
452452 #endif
453453
454454 /* Same as seq_put_decimal_ull_width(p, " ", cnt, 10) */
@@ -490,7 +490,7 @@ void irq_proc_emit_counts(struct seq_file *p, unsigned int __percpu *cnts) · 35 unmodified lines
490490
491491 int show_interrupts(struct seq_file *p, void *v)
492492 {
493− const unsigned int nr_irqs = irq_get_nr_irqs();
493+ const unsigned int nr_irqs = total_nr_irqs;
494494 static int prec;
495495
496496 int i = *(loff_t *) v, j;
scripts/gdb/linux/interrupts.py+1−1
@@ -174,7 +174,7 @@ class LxInterruptList(gdb.Command): · 173 unmodified lines
174174 super(LxInterruptList, self).__init__("lx-interruptlist", gdb.COMMAND_DATA)
175175
176176 def invoke(self, arg, from_tty):
177− nr_irqs = gdb.parse_and_eval("nr_irqs")
177+ nr_irqs = gdb.parse_and_eval("total_nr_irqs")
178178 prec = 3
179179 j = 1000
180180 while prec < 10 and j <= nr_irqs:

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t