diff options
| author | Artur Grabowski <art@cvs.openbsd.org> | 2011-07-07 18:11:25 +0000 |
|---|---|---|
| committer | Artur Grabowski <art@cvs.openbsd.org> | 2011-07-07 18:11:25 +0000 |
| commit | f0dbc508cb2d1060a83c43da71f60ac4bab02188 (patch) | |
| tree | 260e73ca64d22b10f4541858e6ee7fea0b7c1bff /sys/kern/kern_xxx.c | |
| parent | 291e013ccd4b9989e6d79d1ae219784a4a37894e (diff) | |
There is a bunch of places in the kernel entry points where we don't
hold the kernel lock, but still need call one function that needs it.
Instead of grabbing the lock all over the place, move the locks into
the affected functions: trapsignal, scdebug*, ktrsyscall, ktrsysret,
systrace_redirect and ADDUPROF. In the cases we already hold the biglock
we'll just recurse.
kettenis@, beck@ ok
Diffstat (limited to 'sys/kern/kern_xxx.c')
| -rw-r--r-- | sys/kern/kern_xxx.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sys/kern/kern_xxx.c b/sys/kern/kern_xxx.c index 41166b3e20c..c694d2662da 100644 --- a/sys/kern/kern_xxx.c +++ b/sys/kern/kern_xxx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_xxx.c,v 1.19 2011/06/26 22:40:00 deraadt Exp $ */ +/* $OpenBSD: kern_xxx.c,v 1.20 2011/07/07 18:11:24 art Exp $ */ /* $NetBSD: kern_xxx.c,v 1.32 1996/04/22 01:38:41 christos Exp $ */ /* @@ -109,11 +109,12 @@ scdebug_call(struct proc *p, register_t code, register_t args[]) if (!(scdebug & SCDEBUG_CALLS)) return; + KERNEL_LOCK(); em = p->p_emul; sy = &em->e_sysent[code]; if (!(scdebug & SCDEBUG_ALL || code < 0 || code >= em->e_nsysent || sy->sy_call == sys_nosys)) - return; + goto out; printf("proc %d (%s): %s num ", p->p_pid, p->p_comm, em->e_name); if (code < 0 || code >= em->e_nsysent) @@ -130,6 +131,8 @@ scdebug_call(struct proc *p, register_t code, register_t args[]) } } printf("\n"); +out: + KERNEL_UNLOCK(); } void @@ -141,11 +144,12 @@ scdebug_ret(struct proc *p, register_t code, int error, register_t retval[]) if (!(scdebug & SCDEBUG_RETURNS)) return; + KERNEL_LOCK(); em = p->p_emul; sy = &em->e_sysent[code]; if (!(scdebug & SCDEBUG_ALL || code < 0 || code >= em->e_nsysent || sy->sy_call == sys_nosys)) - return; + goto out; printf("proc %d (%s): %s num ", p->p_pid, p->p_comm, em->e_name); if (code < 0 || code >= em->e_nsysent) @@ -154,5 +158,7 @@ scdebug_ret(struct proc *p, register_t code, int error, register_t retval[]) printf("%d ret: err = %d, rv = 0x%lx,0x%lx", code, error, (long)retval[0], (long)retval[1]); printf("\n"); +out: + KERNEL_UNLOCK(); } #endif /* SYSCALL_DEBUG */ |