[PATCH][2.5] avoid scribbling in IDT with high interrupt count.

From: Zwane Mwaikambo (zwane@linuxpower.ca)
Date: Mon Apr 07 2003 - 01:03:39 EST


On systems with high interrupt counts we end up overshooting the
interrupt[] array and dumping garbage entry points into the idt. This
patch checks for out of bounds access during ioapic setup as well as
returning -ENOSPC when we run out of vectors to assign in
assign_irq_vector, thus allowing us to remove the panic and boot a 320
interrupt source system with 2.5.66. Patch appended

(Hardware courtesy of OSDL)
Tested and booted on failure case system;
32 processor NUMAQ 16 IOAPICs, 320 interrupt sources

and regression tested on
8 processor 1 IOAPIC, 63 interrupt sources

Total of 32 processors activated (31453.18 BogoMIPS).
ENABLING IO-APIC IRQs
 printing eip:
c010c954
*pde = 00000000
Oops: 0002
CPU: 0
EIP: 0060:[<c010c954>] Not tainted
EFLAGS: 00010202
EIP is at set_intr_gate+0x14/0x30
eax: 00606f20 ebx: 07070707 ecx: 07070707 edx: c0138e00
esi: c0136f20 edi: 0000000c ebp: 00000127 esp: c3c9ff40
ds: 007b es: 007b ss: 0068
Process swapper (pid: 1, threadinfo=c3c9e000 task=c3c9c040)
Stack: c037cd34 07070707 c0136f20 c3c9ff60 07070707 00000000 00000007 0000000c
       0001a107 0f000000 000072ed 00000286 c03ee396 00000246 00000000 00eff800
       00000010 00000000 c037d662 c02c6181 000072b4 00000296 c03ee3b9 00000246
Call Trace:
 [<c0136f20>] sys_setregid16+0x0/0x30
 [<c0122f28>] printk+0x1d8/0x230
 [<c01050ec>] init+0x6c/0x220
 [<c0105080>] init+0x0/0x220
 [<c0108bb5>] kernel_thread_helper+0x5/0x10

Code: 89 04 cd 00 10 35 c0 89 14 cd 04 10 35 c0 c3 8d b6 00 00 00
 <0>Kernel panic: Attempted to kill init!

Index: linux-2.5.66/arch/i386/kernel/io_apic.c
===================================================================
RCS file: /build/cvsroot/linux-2.5.66/arch/i386/kernel/io_apic.c,v
retrieving revision 1.1.1.1
diff -u -p -B -r1.1.1.1 io_apic.c
--- linux-2.5.66/arch/i386/kernel/io_apic.c 24 Mar 2003 23:40:27 -0000 1.1.1.1
+++ linux-2.5.66/arch/i386/kernel/io_apic.c 3 Apr 2003 08:25:48 -0000
@@ -1105,6 +1105,9 @@ static int __init assign_irq_vector(int
         if (IO_APIC_VECTOR(irq) > 0)
                 return IO_APIC_VECTOR(irq);
 next:
+ if (current_vector == -ENOSPC)
+ goto out;
+
         current_vector += 8;
         if (current_vector == SYSCALL_VECTOR)
                 goto next;
@@ -1114,10 +1117,14 @@ next:
                 current_vector = FIRST_DEVICE_VECTOR + offset;
         }
 
- if (current_vector == FIRST_SYSTEM_VECTOR)
- panic("ran out of interrupt sources!");
+ if (current_vector == FIRST_SYSTEM_VECTOR) {
+ printk(KERN_WARNING "ran out of interrupt vectors!\n");
+ current_vector = -ENOSPC;
+ goto out;
+ }
 
         IO_APIC_VECTOR(irq) = current_vector;
+out:
         return current_vector;
 }
 
@@ -1164,6 +1171,9 @@ void __init setup_IO_APIC_irqs(void)
                 }
 
                 irq = pin_2_irq(idx, apic, pin);
+ if (irq > NR_IRQS)
+ continue;
+
                 /*
                  * skip adding the timer int on secondary nodes, which causes
                  * a small but painful rift in the time-space continuum
@@ -1178,8 +1188,10 @@ void __init setup_IO_APIC_irqs(void)
 
                 if (IO_APIC_IRQ(irq)) {
                         vector = assign_irq_vector(irq);
- entry.vector = vector;
+ if (vector < 0)
+ continue;
 
+ entry.vector = vector;
                         if (IO_APIC_irq_trigger(irq))
                                 irq_desc[irq].handler = &ioapic_level_irq_type;
                         else
@@ -2274,6 +2286,10 @@ int io_apic_set_pci_routing (int ioapic,
 {
         struct IO_APIC_route_entry entry;
         unsigned long flags;
+ int vector;
+
+ if (irq > NR_IRQS)
+ return -ENOSPC;
 
         if (!IO_APIC_IRQ(irq)) {
                 printk(KERN_ERR "IOAPIC[%d]: Invalid reference to IRQ 0/n",
@@ -2298,8 +2314,11 @@ int io_apic_set_pci_routing (int ioapic,
 
         add_pin_to_irq(irq, ioapic, pin);
 
- entry.vector = assign_irq_vector(irq);
+ vector = assign_irq_vector(irq);
+ if (vector < 0)
+ return -ENOSPC;
 
+ entry.vector = vector;
         printk(KERN_DEBUG "IOAPIC[%d]: Set PCI routing entry (%d-%d -> 0x%x -> "
                 "IRQ %d)\n", ioapic,
                 mp_ioapics[ioapic].mpc_apicid, pin, entry.vector, irq);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Mon Apr 07 2003 - 22:00:30 EST