RepoMirrors/musl
1
0
Fork 0
mirror of git://git.musl-libc.org/musl synced 2025-02-19 04:16:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

use a dedicated futex object for pthread_join instead of tid field

Browse Source 
the tid field in the pthread structure is not volatile, and really
shouldn't be, so as not to limit the compiler's ability to reorder,
merge, or split loads in code paths that may be relevant to
performance (like controlling lock ownership).

however, use of objects which are not volatile or atomic with futex
wait is inherently broken, since the compiler is free to transform a
single load into multiple loads, thereby using a different value for
the controlling expression of the loop and the value passed to the
futex syscall, leading the syscall to block instead of returning.

reportedly glibc's pthread_join was actually affected by an equivalent
issue in glibc on s390.

add a separate, dedicated join_futex object for pthread_join to use.
This commit is contained in:
Rich Felker 2018-05-02 12:13:43 -04:00
parent 941bd884cc
commit 9e2d820a55
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/env/__init_tls.c vendored
View File

@ -15,7 +15,8 @@ int __init_tp(void *p)
int r = __set_thread_area(TP_ADJ(p));
if (r < 0) return -1;
if (!r) libc.can_do_threads = 1;
td->tid = __syscall(SYS_set_tid_address, &td->tid);
td->join_futex = -1;
td->tid = __syscall(SYS_set_tid_address, &td->join_futex);
td->locale = &libc.global_locale;
td->robust_list.head = &td->robust_list.head;
return 0;

1
src/internal/pthread_impl.h
View File

@ -43,6 +43,7 @@ struct pthread {
int unblock_cancel;
volatile int timer_id;
locale_t locale;
volatile int join_futex;
volatile int killlock[1];
volatile int exitlock[1];
volatile int startlock[2];

3
src/thread/pthread_create.c
View File

@ -282,9 +282,10 @@ int __pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict att
new->robust_list.head = &new->robust_list.head;
new->unblock_cancel = self->cancel;
new->CANARY = self->CANARY;
new->join_futex = -1;
a_inc(&libc.threads_minus_1);
ret = __clone((c11 ? start_c11 : start), stack, flags, new, &new->tid, TP_ADJ(new), &new->tid);
ret = __clone((c11 ? start_c11 : start), stack, flags, new, &new->tid, TP_ADJ(new), &new->join_futex);
__release_ptc();

6
src/thread/pthread_join.c
View File

@ -12,8 +12,8 @@ int __pthread_timedjoin_np(pthread_t t, void **res, const struct timespec *at)
__pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
if (cs == PTHREAD_CANCEL_ENABLE) __pthread_setcancelstate(cs, 0);
if (t->detached) a_crash();
while ((tmp = t->tid) && r != ETIMEDOUT && r != EINVAL)
r = __timedwait_cp(&t->tid, tmp, CLOCK_REALTIME, at, 0);
while ((tmp = t->join_futex) && r != ETIMEDOUT && r != EINVAL)
r = __timedwait_cp(&t->join_futex, tmp, CLOCK_REALTIME, at, 0);
__pthread_setcancelstate(cs, 0);
if (r == ETIMEDOUT || r == EINVAL) return r;
a_barrier();
@ -29,7 +29,7 @@ int __pthread_join(pthread_t t, void **res)
int __pthread_tryjoin_np(pthread_t t, void **res)
{
return t->tid ? EBUSY : __pthread_join(t, res);
return t->join_futex ? EBUSY : __pthread_join(t, res);
}
weak_alias(__pthread_tryjoin_np, pthread_tryjoin_np);