d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Don't acquire/release Giant during an interrupt context for machine

Browse Source 
checks, clock interrupts, and device interrupts.
- Assert that Giant is not owned during the main loop of ithd_loop().
This commit is contained in:
John Baldwin 2000-11-15 21:56:50 +00:00
parent 22f1b34223
commit 651c378316
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/alpha/alpha/interrupt.c
View File

@ -99,7 +99,6 @@ interrupt(a0, a1, a2, framep)
struct proc *p = curproc; struct proc *p = curproc;
if (!p) p = &proc0; if (!p) p = &proc0;
if ((caddr_t) framep < (caddr_t) p->p_addr + 1024) { if ((caddr_t) framep < (caddr_t) p->p_addr + 1024) {
mtx_enter(&Giant, MTX_DEF);
panic("possible stack overflow\n"); panic("possible stack overflow\n");
} }
} }
@ -121,33 +120,25 @@ interrupt(a0, a1, a2, framep)
return; return;
} }
mtx_enter(&Giant, MTX_DEF);
alpha_clock_interrupt(framep); alpha_clock_interrupt(framep);
mtx_exit(&Giant, MTX_DEF);
break; break;
case ALPHA_INTR_ERROR: /* Machine Check or Correctable Error */ case ALPHA_INTR_ERROR: /* Machine Check or Correctable Error */
mtx_enter(&Giant, MTX_DEF);
a0 = alpha_pal_rdmces(); a0 = alpha_pal_rdmces();
if (platform.mcheck_handler) if (platform.mcheck_handler)
(*platform.mcheck_handler)(a0, framep, a1, a2); (*platform.mcheck_handler)(a0, framep, a1, a2);
else else
machine_check(a0, framep, a1, a2); machine_check(a0, framep, a1, a2);
mtx_exit(&Giant, MTX_DEF);
break; break;
case ALPHA_INTR_DEVICE: /* I/O device interrupt */ case ALPHA_INTR_DEVICE: /* I/O device interrupt */
mtx_enter(&Giant, MTX_DEF);
cnt.v_intr++; cnt.v_intr++;
if (platform.iointr) if (platform.iointr)
(*platform.iointr)(framep, a1); (*platform.iointr)(framep, a1);
mtx_exit(&Giant, MTX_DEF);
break; break;
case ALPHA_INTR_PERF: /* interprocessor interrupt */ case ALPHA_INTR_PERF: /* interprocessor interrupt */
mtx_enter(&Giant, MTX_DEF);
perf_irq(a1, framep); perf_irq(a1, framep);
mtx_exit(&Giant, MTX_DEF);
break; break;
case ALPHA_INTR_PASSIVE: case ALPHA_INTR_PASSIVE:
@ -157,7 +148,6 @@ interrupt(a0, a1, a2, framep)
break; break;
default: default:
mtx_enter(&Giant, MTX_DEF);
panic("unexpected interrupt: type 0x%lx vec 0x%lx a2 0x%lx\n", panic("unexpected interrupt: type 0x%lx vec 0x%lx a2 0x%lx\n",
a0, a1, a2); a0, a1, a2);
/* NOTREACHED */ /* NOTREACHED */
@ -638,6 +628,7 @@ ithd_loop(void *dummy)
* lock. This may take a while and it_need may get * lock. This may take a while and it_need may get
* set again, so we have to check it again. * set again, so we have to check it again.
*/ */
mtx_assert(&Giant, MA_NOTOWNED);
mtx_enter(&sched_lock, MTX_SPIN); mtx_enter(&sched_lock, MTX_SPIN);
if (!ithd->it_need) { if (!ithd->it_need) {
ithd->it_proc->p_stat = SWAIT; /* we're idle */ ithd->it_proc->p_stat = SWAIT; /* we're idle */