d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lockmgr: fix lock profiling of face adaptive spinning

Browse Source
This commit is contained in:
Mateusz Guzik 2021-09-11 18:23:51 +00:00
parent a2cb65b8fe
commit f902e4bb04
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/kern/kern_lock.c
View File

@ -631,6 +631,9 @@ lockmgr_slock_hard(struct lock *lk, u_int flags, struct lock_object *ilk,
if (lockmgr_slock_try(lk, &x, flags, false))
break;
lock_profile_obtain_lock_failed(&lk->lock_object, false,
&contested, &waittime);
if ((flags & (LK_ADAPTIVE | LK_INTERLOCK)) == LK_ADAPTIVE) {
if (lockmgr_slock_adaptive(&lda, lk, &x, flags))
continue;
@ -639,8 +642,6 @@ lockmgr_slock_hard(struct lock *lk, u_int flags, struct lock_object *ilk,
#ifdef HWPMC_HOOKS
PMC_SOFT_CALL( , , lock, failed);
#endif
lock_profile_obtain_lock_failed(&lk->lock_object, false,
&contested, &waittime);
/*
* If the lock is expected to not sleep just give up
@ -845,6 +846,10 @@ lockmgr_xlock_hard(struct lock *lk, u_int flags, struct lock_object *ilk,
break;
continue;
}
lock_profile_obtain_lock_failed(&lk->lock_object, false,
&contested, &waittime);
if ((flags & (LK_ADAPTIVE | LK_INTERLOCK)) == LK_ADAPTIVE) {
if (lockmgr_xlock_adaptive(&lda, lk, &x))
continue;
@ -852,8 +857,6 @@ lockmgr_xlock_hard(struct lock *lk, u_int flags, struct lock_object *ilk,
#ifdef HWPMC_HOOKS
PMC_SOFT_CALL( , , lock, failed);
#endif
lock_profile_obtain_lock_failed(&lk->lock_object, false,
&contested, &waittime);
/*
* If the lock is expected to not sleep just give up