Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F177798004
D58447.1795312361.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Flag For Later
Award Token
Authored By
Unknown
Size
1 KB
Referenced Files
None
Subscribers
None
D58447.1795312361.diff
View Options
diff --git a/sys/kern/kern_umtx.c b/sys/kern/kern_umtx.c
--- a/sys/kern/kern_umtx.c
+++ b/sys/kern/kern_umtx.c
@@ -2028,7 +2028,7 @@
umtxq_sleep_pi(struct umtx_q *uq, struct umtx_pi *pi, uint32_t owner,
const char *wmesg, struct umtx_abs_timeout *timo, bool shared)
{
- struct thread *td, *td1;
+ struct thread *td;
struct umtx_q *uq1;
int error, pri;
#ifdef INVARIANTS
@@ -2044,13 +2044,22 @@
umtxq_insert(uq);
mtx_lock(&umtx_lock);
if (pi->pi_owner == NULL) {
+ struct thread *ownertd;
+
mtx_unlock(&umtx_lock);
- td1 = tdfind(owner, shared ? -1 : td->td_proc->p_pid);
+ ownertd = tdfind(owner, shared ? -1 : td->td_proc->p_pid);
mtx_lock(&umtx_lock);
- if (td1 != NULL) {
- if (pi->pi_owner == NULL)
- umtx_pi_setowner(pi, td1);
- PROC_UNLOCK(td1->td_proc);
+ if (ownertd != NULL) {
+ /*
+ * An exiting thread that has already called
+ * umtx_thread_exit() must not be made the owner of a
+ * shared mutex.
+ */
+ if ((ownertd->td_proc->p_flag & P_WEXIT) == 0 &&
+ (ownertd->td_dbgflags & TDB_EXIT) == 0 &&
+ pi->pi_owner == NULL)
+ umtx_pi_setowner(pi, ownertd);
+ PROC_UNLOCK(ownertd->td_proc);
}
}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sun, Nov 22, 1:52 AM (21 h, 48 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41899075
Default Alt Text
D58447.1795312361.diff (1 KB)
Attached To
Mode
D58447: umtx: Do not make an exiting thread the owner of a PI mutex
Attached
Detach File
Event Timeline