system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-22 10:48:02 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

lockmgr: make lockmgr_disowned public and use it

Browse source 
Reviewed by:	mckusick, kib, markj
Sponsored by:	Dell EMC Isilon
Differential Revision:	https://reviews.freebsd.org/D45248
This commit is contained in:
Ryan Libby 2024-05-21 10:21:50 -07:00
parent 4ebf794a08
commit b92cd6b294
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sys/kern/kern_lock.c
View file

@ -138,9 +138,6 @@ LK_CAN_SHARE(uintptr_t x, int flags, bool fp)
#define LK_TRYWIT(x) \
(LK_TRYOP(x) ? LOP_TRYLOCK : 0)
#define lockmgr_disowned(lk) \
(((lk)->lk_lock & ~(LK_FLAGMASK & ~LK_SHARE)) == LK_KERNPROC)
#define lockmgr_xlocked_v(v) \
(((v) & ~(LK_FLAGMASK & ~LK_SHARE)) == (uintptr_t)curthread)
@ -243,7 +240,7 @@ static void
lockmgr_note_exclusive_release(struct lock *lk, const char *file, int line)
{
if (LK_HOLDER(lockmgr_read_value(lk)) != LK_KERNPROC) {
if (!lockmgr_disowned(lk)) {
WITNESS_UNLOCK(&lk->lock_object, LOP_EXCLUSIVE, file, line);
TD_LOCKS_DEC(curthread);
}
@ -1135,7 +1132,7 @@ lockmgr_xunlock_hard(struct lock *lk, uintptr_t x, u_int flags, struct lock_obje
* any waiter.
* Fix-up the tid var if the lock has been disowned.
*/
if (LK_HOLDER(x) == LK_KERNPROC)
if (lockmgr_disowned_v(x))
tid = LK_KERNPROC;
/*

4
sys/sys/lockmgr.h
View file

@ -130,6 +130,10 @@ _lockmgr_args_rw(struct lock *lk, u_int flags, struct rwlock *ilk,
LOCK_FILE, LOCK_LINE)
#define lockmgr_disown(lk) \
_lockmgr_disown((lk), LOCK_FILE, LOCK_LINE)
#define lockmgr_disowned_v(v) \
(LK_HOLDER((v)) == LK_KERNPROC)
#define lockmgr_disowned(lk) \
lockmgr_disowned_v(lockmgr_read_value((lk)))
#define lockmgr_recursed_v(v) \
(v & LK_WRITER_RECURSED)
#define lockmgr_recursed(lk) \