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

Fix locking on td_flags for TDF_DEADLKTREAT. If the comments in the code

Browse Source 
are true that curthread can change during this function, then this flag
needs to become a KSE flag, not a thread flag.
This commit is contained in:
John Baldwin 2001-09-13 22:33:37 +00:00
parent 1cb99346e1
commit bce9841972
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/kern/kern_lock.c
View File

@ -263,14 +263,10 @@ debuglockmgr(lkp, flags, interlkp, td, name, file, line)
*/
if (lkp->lk_lockholder != pid) {
lockflags = LK_HAVE_EXCL;
if (td) {
PROC_LOCK(td->td_proc);
if (!(td->td_flags & TDF_DEADLKTREAT)) {
lockflags |= LK_WANT_EXCL |
LK_WANT_UPGRADE;
}
PROC_UNLOCK(td->td_proc);
}
mtx_lock_spin(&sched_lock);
if (td != NULL && !(td->td_flags & TDF_DEADLKTREAT))
lockflags |= LK_WANT_EXCL | LK_WANT_UPGRADE;
mtx_unlock_spin(&sched_lock);
error = acquire(lkp, extflags, lockflags);
if (error)
break;

7
sys/kern/kern_subr.c
View File

@ -78,8 +78,10 @@ uiomove(cp, n, uio)
("uiomove proc"));
if (td) {
mtx_lock_spin(&sched_lock);
save = td->td_flags & TDF_DEADLKTREAT;
td->td_flags |= TDF_DEADLKTREAT;
mtx_unlock_spin(&sched_lock);
}
while (n > 0 && uio->uio_resid) {
@ -125,8 +127,11 @@ uiomove(cp, n, uio)
}
if (td != curthread) printf("uiomove: IT CHANGED!");
td = curthread; /* Might things have changed in copyin/copyout? */
if (td)
if (td) {
mtx_lock_spin(&sched_lock);
td->td_flags = (td->td_flags & ~TDF_DEADLKTREAT) | save;
mtx_unlock_spin(&sched_lock);
}
return (error);
}