Re: [PATCH 00/25] dyn_array and nr_irqs support v3

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Yinghai Lu
Date: Sunday, August 3, 2008 - 1:25 am

On Sat, Aug 2, 2008 at 11:39 PM, Eric W. Biederman
<ebiederm@xmission.com> wrote:

how about

diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
index f4c8a03..aa6888c 100644
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -47,19 +47,73 @@ handle_bad_irq(unsigned int irq, struct irq_desc *desc)
  *
  * Controller mappings for all interrupt sources:
  */
-struct irq_desc irq_desc[NR_IRQS] __cacheline_aligned_in_smp = {
-       [0 ... NR_IRQS-1] = {
-               .status = IRQ_DISABLED,
-               .chip = &no_irq_chip,
-               .handle_irq = handle_bad_irq,
-               .depth = 1,
-               .lock = __SPIN_LOCK_UNLOCKED(irq_desc->lock),
+static irq_desc **irq_desc_ptr;
+DEFINE_DYN_ARRAY(irq_desc_ptr, sizeof(struct irq_desc *), nr_irqs,
PAGE_SIZE, NULL);
+
+#define NR_IRQ_DESC    4096
+
+static struct irq_desc irq_desc__init = {
+       .irq = -1;
+       .status = IRQ_DISABLED,
+       .chip = &no_irq_chip,
+       .handle_irq = handle_bad_irq,
+       .depth = 1,
+       .lock = __SPIN_LOCK_UNLOCKED(irq_desc->lock),
 #ifdef CONFIG_SMP
-               .affinity = CPU_MASK_ALL
+       .affinity = CPU_MASK_ALL
 #endif
-       }
 };

+static int nr_irq_desc = NR_IRQ_DESC;
+
+static int __init parse_nr_irq_desc(char *arg)
+{
+        if (arg)
+                nr_irq_desc = simple_strtoul(arg, NULL, 0);
+        return 0;
+}
+
+early_param("nr_irq_desc", parse_nr_irq_desc);
+
+static void __init init_work(void *data)
+{
+       struct dyn_array *da = data;
+       int i;
+       struct  irq_desc *desc;
+
+       desc = *da->name;
+
+       for (i = 0; i < *da->nr; i++)
+               memcpy(&desc[i], &irq_desc_init, sizeof(struct irq_desc));
+}
+
+static struct irq_desc *irq_desc;
+DEFINE_DYN_ARRAY(irq_desc, sizeof(struct irq_desc), nr_irq_desc,
PAGE_SIZE, init_work);
+
+struct irq_desc *get_irq_desc(int irq)
+{
+       struct irq_desc *desc;
+       int i;
+
+       desc = irq_desc_ptr[irq];
+
+       if (desc)
+               return desc;
+
+       for (i = 0; i < nr_irq_desc; i++) {
+               if (irq_desc[i]->irq != -1)
+                       continue;
+
+               desc = &irq_desc[i];
+               desc->irq = irq;
+               irq_desc_ptr[irq] = desc;
+
+               return desc;
+       }
+
+       panic("please boot with nr_irq_desc=%d\n", nr_irq_desc * 2);
+}
+
 /*
  * What should we do if we get a hw irq event on an illegal vector?
  * Each architecture has to answer this themself.


and later use get_irq_desc(i) instead irq_desc + i;

YH
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 00/25] dyn_array and nr_irqs support v3, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 02/25] x86: remove irq_vectors_limits, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 03/25] add dyn_array support, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 04/25] add per_cpu_dyn_array support, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 05/25] x86: alloc dyn_array all alltogether, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 06/25] x86: enable dyn_array support, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 07/25] introduce nr_irqs, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 08/25] x86: using nr_irqs, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 09/25] drivers/char to use nr_irqs, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 10/25] drivers/net to use nr_irqs, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 11/25] drivers intr remapping to use nr_irqs, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 12/25] drivers/pcmcia to use nr_irqs, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 13/25] drivers/rtc to use nr_irqs, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 14/25] drivers/scsi to use nr_irqs, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 15/25] drivers/serial to use nr_irqs, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 16/25] drivers proc to use nr_irqs, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 17/25] drivers xen events to use nr_irqs, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 18/25] make irq_timer_state to use dyn_array, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 19/25] make irq2_iommu to use dyn_array, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 20/25] make irq_desc to use dyn_array, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 23/25] x86: use dyn_array in io_apic_xx.c, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 24/25] x86: get mp_irqs from madt, Yinghai Lu, (Sat Aug 2, 7:59 pm)
[PATCH 25/25] x86: remove nr_irq_vectors, Yinghai Lu, (Sat Aug 2, 7:59 pm)
Re: [PATCH 03/25] add dyn_array support, Johannes Weiner, (Sat Aug 2, 9:03 pm)
Re: [PATCH 05/25] x86: alloc dyn_array all alltogether, Johannes Weiner, (Sat Aug 2, 9:16 pm)
Re: [PATCH 03/25] add dyn_array support, Yinghai Lu, (Sat Aug 2, 9:21 pm)
Re: [PATCH 03/25] add dyn_array support, Johannes Weiner, (Sat Aug 2, 9:55 pm)
Re: [PATCH 03/25] add dyn_array support, Yinghai Lu, (Sat Aug 2, 10:04 pm)
Re: [PATCH 03/25] add dyn_array support, Johannes Weiner, (Sat Aug 2, 10:31 pm)
Re: [PATCH 03/25] add dyn_array support, Yinghai Lu, (Sat Aug 2, 10:39 pm)
Re: [PATCH 03/25] add dyn_array support, Yinghai Lu, (Sat Aug 2, 10:40 pm)
Re: [PATCH 03/25] add dyn_array support, Johannes Weiner, (Sat Aug 2, 10:47 pm)
Re: [PATCH 03/25] add dyn_array support, Yinghai Lu, (Sat Aug 2, 10:48 pm)
Re: [PATCH 00/25] dyn_array and nr_irqs support v3, Eric W. Biederman, (Sat Aug 2, 10:51 pm)
Re: [PATCH 00/25] dyn_array and nr_irqs support v3, Yinghai Lu, (Sat Aug 2, 11:04 pm)
Re: [PATCH 00/25] dyn_array and nr_irqs support v3, Eric W. Biederman, (Sat Aug 2, 11:39 pm)
Re: [PATCH 00/25] dyn_array and nr_irqs support v3, Yinghai Lu, (Sun Aug 3, 1:25 am)
Re: [PATCH 00/25] dyn_array and nr_irqs support v3, Eric W. Biederman, (Sun Aug 3, 2:15 am)
Re: [PATCH 15/25] drivers/serial to use nr_irqs, Alan Cox, (Sun Aug 3, 6:02 am)
Re: [PATCH 15/25] drivers/serial to use nr_irqs, Yinghai Lu, (Sun Aug 3, 10:43 am)
Re: [PATCH 00/25] dyn_array and nr_irqs support v3, Yinghai Lu, (Sun Aug 3, 10:54 am)
Re: [PATCH 00/25] dyn_array and nr_irqs support v3, Yinghai Lu, (Sun Aug 3, 12:20 pm)
Re: [PATCH 21/25] serial: change remove NR_IRQS in 8250.c v2, Eric W. Biederman, (Sun Aug 3, 12:57 pm)
Re: [PATCH 00/25] dyn_array and nr_irqs support v3, Yinghai Lu, (Sun Aug 3, 6:59 pm)
Re: [PATCH 00/25] dyn_array and nr_irqs support v3, Mike Travis, (Mon Aug 4, 7:31 am)
Re: [PATCH 21/25] serial: change remove NR_IRQS in 8250.c v2, Eric W. Biederman, (Mon Aug 4, 11:51 am)
Re: [PATCH 00/25] dyn_array and nr_irqs support v3, H. Peter Anvin, (Tue Aug 5, 4:01 pm)
Re: [PATCH 00/25] dyn_array and nr_irqs support v3, Yinghai Lu, (Tue Aug 5, 4:15 pm)
Re: [PATCH 00/25] dyn_array and nr_irqs support v3, H. Peter Anvin, (Tue Aug 5, 4:26 pm)
Re: [PATCH 00/25] dyn_array and nr_irqs support v3, Yinghai Lu, (Tue Aug 5, 4:53 pm)
[PATCH] serial: Remove NR_IRQS usage, Alan Cox, (Wed Aug 6, 6:09 am)
Re: [PATCH] serial: Remove NR_IRQS usage, Eric W. Biederman, (Wed Aug 6, 9:10 am)