In do_lock_pi(), do not override error from umtxq_sleep_pi() when
doing suspend check. This restores the pre-r251684 behaviour, to retry once after the signal is detected. PR: kern/192918 Submitted by: Elliott Rabe, Dell Inc., Eric van Gyzen <eric@vangyzen.net> Obtained from: Dell Inc. MFC after: 1 week
This commit is contained in:
parent
1f9c1db5f5
commit
fbb6eca60f
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=270345
@ -1700,10 +1700,12 @@ do_lock_pi(struct thread *td, struct umutex *m, uint32_t flags,
|
||||
* and we need to retry or we lost a race to the thread
|
||||
* unlocking the umtx.
|
||||
*/
|
||||
if (old == owner)
|
||||
if (old == owner) {
|
||||
error = umtxq_sleep_pi(uq, pi, owner & ~UMUTEX_CONTESTED,
|
||||
"umtxpi", timeout == NULL ? NULL : &timo);
|
||||
else {
|
||||
if (error != 0)
|
||||
continue;
|
||||
} else {
|
||||
umtxq_unbusy(&uq->uq_key);
|
||||
umtxq_unlock(&uq->uq_key);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user