diff options
| author | jhb <jhb@FreeBSD.org> | 2000-11-16 02:16:44 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2000-11-16 02:16:44 +0000 |
| commit | c0bba69cbe7c4beee5213a4f1494387ee365db4c (patch) | |
| tree | bc01d9302c1c47d1c7ec3254c6bfc60515318af1 /sys/kern/kern_sig.c | |
| parent | 4b0f06d83c650d18d7bc905ae27eb7412fcfc038 (diff) | |
| download | FreeBSD-src-c0bba69cbe7c4beee5213a4f1494387ee365db4c.zip FreeBSD-src-c0bba69cbe7c4beee5213a4f1494387ee365db4c.tar.gz | |
Don't release and acquire Giant in mi_switch(). Instead, release and
acquire Giant as needed in functions that call mi_switch(). The releases
need to be done outside of the sched_lock to avoid potential deadlocks
from trying to acquire Giant while interrupts are disabled.
Submitted by: witness
Diffstat (limited to 'sys/kern/kern_sig.c')
| -rw-r--r-- | sys/kern/kern_sig.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index af7a32f..dcc0ed3 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -1283,7 +1283,11 @@ issignal(p) psignal(p->p_pptr, SIGCHLD); do { stop(p); + DROP_GIANT_NOSWITCH(); + mtx_enter(&sched_lock, MTX_SPIN); mi_switch(); + mtx_exit(&sched_lock, MTX_SPIN); + PICKUP_GIANT(); } while (!trace_req(p) && p->p_flag & P_TRACED); @@ -1352,7 +1356,11 @@ issignal(p) stop(p); if ((p->p_pptr->p_procsig->ps_flag & PS_NOCLDSTOP) == 0) psignal(p->p_pptr, SIGCHLD); + DROP_GIANT_NOSWITCH(); + mtx_enter(&sched_lock, MTX_SPIN); mi_switch(); + mtx_exit(&sched_lock, MTX_SPIN); + PICKUP_GIANT(); break; } else if (prop & SA_IGNORE) { /* |
