diff options
| author |   visa <visa@openbsd.org> | 2017-04-20 13:20:17 +0000 |
|---|---|---|
| committer | visa <visa@openbsd.org> | 2017-04-20 13:20:17 +0000 |
| commit | 25753472864103d052de1cff23b9cb1e66ef307c (patch) | |
| tree | 24ae6e5fe9d48d26c53c30363b5620a6e0ce54ec /sys/kern/kern_lock.c | |
| parent | Add a port of witness(4) lock validation tool from FreeBSD. (diff) | |
| download | wireguard-openbsd-25753472864103d052de1cff23b9cb1e66ef307c.tar.xz wireguard-openbsd-25753472864103d052de1cff23b9cb1e66ef307c.zip | |
Hook up mplock to witness(4) on amd64 and i386.
Diffstat (limited to 'sys/kern/kern_lock.c')
| -rw-r--r-- | sys/kern/kern_lock.c | 30 |
1 files changed, 28 insertions, 2 deletions
diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c index 7edc1b6511c..a5af0a5b830 100644 --- a/sys/kern/kern_lock.c +++ b/sys/kern/kern_lock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_lock.c,v 1.47 2016/06/19 11:54:33 natano Exp $ */ +/* $OpenBSD: kern_lock.c,v 1.48 2017/04/20 13:20:17 visa Exp $ */ /* * Copyright (c) 1995 @@ -37,8 +37,11 @@ #include <sys/param.h> #include <sys/lock.h> +#include <sys/mplock.h> #include <sys/systm.h> #include <sys/sched.h> +#include <sys/witness.h> +#include <sys/_lock.h> #ifdef MP_LOCKDEBUG /* CPU-dependent timing, this needs to be settable from ddb. */ @@ -65,10 +68,14 @@ _kernel_lock_init(void) */ void -_kernel_lock(void) +_kernel_lock(const char *file, int line) { SCHED_ASSERT_UNLOCKED(); +#ifdef WITNESS + ___mp_lock(&kernel_lock, file, line); +#else __mp_lock(&kernel_lock); +#endif } void @@ -82,4 +89,23 @@ _kernel_lock_held(void) { return (__mp_lock_held(&kernel_lock)); } + +#ifdef WITNESS +void +_mp_lock_init(struct __mp_lock *mpl, struct lock_type *type) +{ + mpl->mpl_lock_obj.lo_name = type->lt_name; + mpl->mpl_lock_obj.lo_type = type; + if (mpl == &kernel_lock) + mpl->mpl_lock_obj.lo_flags = LO_WITNESS | LO_INITIALIZED | + LO_SLEEPABLE | (LO_CLASS_KERNEL_LOCK << LO_CLASSSHIFT); + else if (mpl == &sched_lock) + mpl->mpl_lock_obj.lo_flags = LO_WITNESS | LO_INITIALIZED | + LO_RECURSABLE | (LO_CLASS_SCHED_LOCK << LO_CLASSSHIFT); + WITNESS_INIT(&mpl->mpl_lock_obj, type); + + ___mp_lock_init(mpl); +} +#endif /* WITNESS */ + #endif /* MULTIPROCESSOR */ |