add support for TLS variant I, presently needed for arm and mips

[musl] / src / thread / pthread_create.c

diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c
index d8b8f0f..e67616e 100644 (file)
--- a/src/thread/pthread_create.c
+++ b/src/thread/pthread_create.c
@@ -4,8 +4,8 @@
 static void dummy_0()
 {
 }
-weak_alias(dummy_0, __synccall_lock);
-weak_alias(dummy_0, __synccall_unlock);
+weak_alias(dummy_0, __acquire_ptc);
+weak_alias(dummy_0, __release_ptc);
 weak_alias(dummy_0, __pthread_tsd_run_dtors);
 
 _Noreturn void pthread_exit(void *result)
@@ -84,6 +84,8 @@ static void init_file_lock(FILE *f)
        if (f && f->lock<0) f->lock = 0;
 }
 
+void *__copy_tls(unsigned char *);
+
 int pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict attr, void *(*entry)(void *), void *restrict arg)
 {
        int ret;
@@ -103,21 +105,32 @@ int pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict attr,
                libc.threaded = 1;
        }
 
+       __acquire_ptc();
+
        if (attr && attr->_a_stackaddr) {
                map = 0;
                tsd = (void *)(attr->_a_stackaddr-__pthread_tsd_size & -16);
        } else {
                if (attr) {
                        guard = ROUND(attr->_a_guardsize + DEFAULT_GUARD_SIZE);
-                       size = guard + ROUND(attr->_a_stacksize + DEFAULT_STACK_SIZE);
+                       size = guard + ROUND(attr->_a_stacksize
+                               + DEFAULT_STACK_SIZE + libc.tls_size);
                }
                size += __pthread_tsd_size;
-               map = mmap(0, size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, -1, 0);
-               if (map == MAP_FAILED) return EAGAIN;
-               if (guard) mprotect(map, guard, PROT_NONE);
+               if (guard) {
+                       map = mmap(0, size, PROT_NONE, MAP_PRIVATE|MAP_ANON, -1, 0);
+                       if (map == MAP_FAILED) return EAGAIN;
+                       if (mprotect(map+guard, size-guard, PROT_READ|PROT_WRITE)) {
+                               munmap(map, size);
+                               return EAGAIN;
+                       }
+               } else {
+                       map = mmap(0, size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANON, -1, 0);
+                       if (map == MAP_FAILED) return EAGAIN;
+               }
                tsd = map + size - __pthread_tsd_size;
        }
-       new = (void *)(tsd - sizeof *new - PAGE_SIZE%sizeof *new);
+       new = __copy_tls(stack = tsd - libc.tls_size);
        new->map_base = map;
        new->map_size = size;
        new->pid = self->pid;
@@ -131,15 +144,12 @@ int pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict attr,
                flags -= 0x200000;
        }
        new->unblock_cancel = self->cancel;
-       new->canary = self->canary ^ (uintptr_t)&new;
-       stack = (void *)new;
-
-       __synccall_lock();
+       new->canary = self->canary;
 
        a_inc(&libc.threads_minus_1);
-       ret = __clone(start, stack, flags, new, &new->tid, new, &new->tid);
+       ret = __clone(start, stack, flags, new, &new->tid, TP_ADJ(new), &new->tid);
 
-       __synccall_unlock();
+       __release_ptc();
 
        if (ret < 0) {
                a_dec(&libc.threads_minus_1);