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

witness/hwpmc: fix locking order for pmc locks

Browse Source
This commit is contained in:
Matt Macy 2018-05-28 23:14:38 +00:00
parent 39446ce5b3
commit 552b3e1798
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/kern/subr_witness.c
View File

@ -499,12 +499,12 @@ static struct witness_order_list_entry order_lists[] = {
{ "pipe mutex", &lock_class_mtx_sleep },
{ "sigio lock", &lock_class_mtx_sleep },
{ "process group", &lock_class_mtx_sleep },
{ "process lock", &lock_class_mtx_sleep },
{ "session", &lock_class_mtx_sleep },
{ "uidinfo hash", &lock_class_rw },
#ifdef HWPMC_HOOKS
{ "pmc-sleep", &lock_class_mtx_sleep },
#endif
{ "process lock", &lock_class_mtx_sleep },
{ "session", &lock_class_mtx_sleep },
{ "uidinfo hash", &lock_class_rw },
{ "time lock", &lock_class_mtx_sleep },
{ NULL, NULL },
/*
@ -671,9 +671,6 @@ static struct witness_order_list_entry order_lists[] = {
{ "uart_hwmtx", &lock_class_mtx_spin },
{ "fast_taskqueue", &lock_class_mtx_spin },
{ "intr table", &lock_class_mtx_spin },
#ifdef HWPMC_HOOKS
{ "pmc-per-proc", &lock_class_mtx_spin },
#endif
{ "process slock", &lock_class_mtx_spin },
{ "syscons video lock", &lock_class_mtx_spin },
{ "sleepq chain", &lock_class_mtx_spin },
@ -690,6 +687,12 @@ static struct witness_order_list_entry order_lists[] = {
#ifdef __powerpc__
{ "tlb0", &lock_class_mtx_spin },
#endif
{ NULL, NULL },
{ "sched lock", &lock_class_mtx_spin },
#ifdef HWPMC_HOOKS
{ "pmc-per-proc", &lock_class_mtx_spin },
#endif
{ NULL, NULL },
/*
* leaf locks
*/