diff options
| author | Konstantin Belousov <kib@FreeBSD.org> | 2014-08-22 18:42:14 +0000 |
|---|---|---|
| committer | Konstantin Belousov <kib@FreeBSD.org> | 2014-08-22 18:42:14 +0000 |
| commit | fbb6eca60f43d1391d61e09076b6de4a05c868a0 (patch) | |
| tree | ea1110d982e80c304828de4def2528daebe536ab /sys/kern/kern_umtx.c | |
| parent | 1f9c1db5f5511c882c16f48581473b28928fa309 (diff) | |
| download | src-fbb6eca60f43d1391d61e09076b6de4a05c868a0.tar.gz src-fbb6eca60f43d1391d61e09076b6de4a05c868a0.zip | |
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
Notes
Notes:
svn path=/head/; revision=270345
Diffstat (limited to 'sys/kern/kern_umtx.c')
| -rw-r--r-- | sys/kern/kern_umtx.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/kern/kern_umtx.c b/sys/kern/kern_umtx.c index 67720f811ace..7cfef389024f 100644 --- a/sys/kern/kern_umtx.c +++ b/sys/kern/kern_umtx.c @@ -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); } |