upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Place interrupt handling in a critical section and remove double

Browse source 
counting in incrementing the interrupt nesting level. This fixes a number
of bugs in which the interrupt thread could be preempted by an IPI,
indefinitely delaying acknowledgement of the interrupt to the PIC, causing
interrupt starvation and hangs.

Reported by:	linimon
Reviewed by:	marcel, jhb
MFC after:	1 week
This commit is contained in:
Nathan Whitehorn 2010-03-09 02:00:53 +00:00
parent c7ea0aa648
commit ec3c90f3c8
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sys/powerpc/aim/interrupt.c
View file

@ -80,15 +80,17 @@ powerpc_interrupt(struct trapframe *framep)
switch (framep->exc) {
case EXC_EXI:
atomic_add_int(&td->td_intr_nesting_level, 1);
critical_enter();
PIC_DISPATCH(pic, framep);
atomic_subtract_int(&td->td_intr_nesting_level, 1);
critical_exit();
break;
case EXC_DECR:
critical_enter();
atomic_add_int(&td->td_intr_nesting_level, 1);
decr_intr(framep);
atomic_subtract_int(&td->td_intr_nesting_level, 1);
critical_exit();
break;
default:

8
sys/powerpc/booke/interrupt.c
View file

@ -118,9 +118,11 @@ powerpc_decr_interrupt(struct trapframe *framep)
struct thread *td;
td = PCPU_GET(curthread);
critical_enter();
atomic_add_int(&td->td_intr_nesting_level, 1);
decr_intr(framep);
atomic_subtract_int(&td->td_intr_nesting_level, 1);
critical_exit();
}
/*
@ -129,10 +131,8 @@ powerpc_decr_interrupt(struct trapframe *framep)
void
powerpc_extr_interrupt(struct trapframe *framep)
{
struct thread *td;
td = PCPU_GET(curthread);
atomic_add_int(&td->td_intr_nesting_level, 1);
critical_enter();
PIC_DISPATCH(pic, framep);
atomic_subtract_int(&td->td_intr_nesting_level, 1);
critical_exit();
}