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

lockprof: move panic check after inspecting the state

Browse Source
This commit is contained in:
Mateusz Guzik 2021-05-23 16:04:31 +00:00
parent 6a467cc5e1
commit e2ab16b1a6
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/kern/subr_lock.c
View File

@ -612,9 +612,6 @@ lock_profile_obtain_lock_success(struct lock_object *lo, bool spin,
lo->lo_name, spin, is_spin);
#endif
if (SCHEDULER_STOPPED())
return;
/* don't reset the timer when/if recursing */
if (!lock_prof_enable || (lo->lo_flags & LO_NOPROFILE))
return;
@ -622,6 +619,10 @@ lock_profile_obtain_lock_success(struct lock_object *lo, bool spin,
return;
if (spin && lock_prof_skipspin == 1)
return;
if (SCHEDULER_STOPPED())
return;
critical_enter();
/* Recheck enabled now that we're in a critical section. */
if (lock_prof_enable == 0)
@ -687,13 +688,13 @@ lock_profile_release_lock(struct lock_object *lo, bool spin)
lo->lo_name, spin, is_spin);
#endif
if (SCHEDULER_STOPPED())
return;
if (lo->lo_flags & LO_NOPROFILE)
return;
head = &curthread->td_lprof[spin];
if (LIST_FIRST(head) == NULL)
return;
if (SCHEDULER_STOPPED())
return;
critical_enter();
/* Recheck enabled now that we're in a critical section. */
if (lock_prof_enable == 0 && lock_prof_resetting == 1)