diff options
| author | Artur Grabowski <art@cvs.openbsd.org> | 2007-11-27 18:09:38 +0000 |
|---|---|---|
| committer | Artur Grabowski <art@cvs.openbsd.org> | 2007-11-27 18:09:38 +0000 |
| commit | aef757c32a259789f73be3546295d4aa6f7ff581 (patch) | |
| tree | c8f9ea572ad395638a44728a4e62cb1b84630e34 | |
| parent | e1149af48c1dfc44f4f956e52d22c235e7d6f86d (diff) | |
Implement the NOLOCK semantics. MPSAFE will have to wait a while until
we decide how to handle interrupts.
deraadt@ ok
| -rw-r--r-- | sys/arch/amd64/amd64/syscall.c | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/sys/arch/amd64/amd64/syscall.c b/sys/arch/amd64/amd64/syscall.c index e58cc9639d8..c0031aee6d6 100644 --- a/sys/arch/amd64/amd64/syscall.c +++ b/sys/arch/amd64/amd64/syscall.c @@ -1,4 +1,4 @@ -/* $OpenBSD: syscall.c,v 1.9 2007/01/15 23:19:05 jsg Exp $ */ +/* $OpenBSD: syscall.c,v 1.10 2007/11/27 18:09:37 art Exp $ */ /* $NetBSD: syscall.c,v 1.1 2003/04/26 18:39:32 fvdl Exp $ */ /*- @@ -74,6 +74,7 @@ syscall(struct trapframe frame) int nsys; size_t argsize, argoff; register_t code, args[9], rval[2], *argp; + int nolock; uvmexp.syscalls++; p = curproc; @@ -132,24 +133,39 @@ syscall(struct trapframe frame) } } - KERNEL_PROC_LOCK(p); + nolock = (callp->sy_flags & SY_NOLOCK); + + if (!nolock) + KERNEL_PROC_LOCK(p); #ifdef SYSCALL_DEBUG + KERNEL_PROC_LOCK(p); scdebug_call(p, code, argp); + KERNEL_PROC_UNLOCK(p); #endif #ifdef KTRACE - if (KTRPOINT(p, KTR_SYSCALL)) + if (KTRPOINT(p, KTR_SYSCALL)) { + if (nolock) + KERNEL_PROC_LOCK(p); ktrsyscall(p, code, callp->sy_argsize, argp); + if (nolock) + KERNEL_PROC_UNLOCK(p); + } #endif rval[0] = 0; rval[1] = frame.tf_rdx; #if NSYSTRACE > 0 - if (ISSET(p->p_flag, P_SYSTRACE)) + if (ISSET(p->p_flag, P_SYSTRACE)) { + if (nolock) + KERNEL_PROC_LOCK(p); error = systrace_redirect(code, p, argp, rval); - else + if (nolock) + KERNEL_PROC_UNLOCK(p); + } else #endif error = (*callp->sy_call)(p, argp, rval); - KERNEL_PROC_UNLOCK(p); + if (!nolock) + KERNEL_PROC_UNLOCK(p); switch (error) { case 0: frame.tf_rax = rval[0]; |