fix powerpc sigsetjmp asm to match the new jmp_buf size/offsets

[musl] / src / thread / pthread_create.c

diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c
index 4567b41..a65e88e 100644 (file)
--- a/src/thread/pthread_create.c
+++ b/src/thread/pthread_create.c
@@ -1,14 +1,15 @@
 #include "pthread_impl.h"
 #include "stdio_impl.h"
+#include <sys/mman.h>
 
 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);
 
-void pthread_exit(void *result)
+_Noreturn void pthread_exit(void *result)
 {
        pthread_t self = pthread_self();
        int n;
@@ -43,7 +44,7 @@ void pthread_exit(void *result)
                __unmapself(self->map_base, self->map_size);
        }
 
-       __syscall(SYS_exit, 0);
+       for (;;) __syscall(SYS_exit, 0);
 }
 
 void __do_cleanup_push(struct __ptcb *cb)
@@ -61,6 +62,15 @@ void __do_cleanup_pop(struct __ptcb *cb)
 static int start(void *p)
 {
        pthread_t self = p;
+       if (self->startlock[0]) {
+               __wait(self->startlock, 0, 1, 1);
+               if (self->startlock[0]) {
+                       self->detached = 2;
+                       pthread_exit(0);
+               }
+               __syscall(SYS_rt_sigprocmask, SIG_SETMASK,
+                       self->sigmask, 0, __SYSCALL_SSLEN);
+       }
        if (self->unblock_cancel)
                __syscall(SYS_rt_sigprocmask, SIG_UNBLOCK,
                        SIGPT_SET, 0, __SYSCALL_SSLEN);
@@ -84,6 +94,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;
@@ -92,6 +104,7 @@ int pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict attr,
        struct pthread *self = pthread_self(), *new;
        unsigned char *map, *stack, *tsd;
        unsigned flags = 0x7d8f00;
+       int do_sched = 0;
 
        if (!self) return ENOSYS;
        if (!libc.threaded) {
@@ -103,21 +116,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;
@@ -130,22 +154,38 @@ int pthread_create(pthread_t *restrict res, const pthread_attr_t *restrict attr,
                new->detached = 1;
                flags -= 0x200000;
        }
+       if (attr && attr->_a_sched) {
+               do_sched = new->startlock[0] = 1;
+               __syscall(SYS_rt_sigprocmask, SIG_BLOCK,
+                       SIGALL_SET, self->sigmask, __SYSCALL_SSLEN);
+       }
        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);
+
+       __release_ptc();
 
-       __synccall_unlock();
+       if (do_sched) {
+               __syscall(SYS_rt_sigprocmask, SIG_SETMASK,
+                       new->sigmask, 0, __SYSCALL_SSLEN);
+       }
 
        if (ret < 0) {
                a_dec(&libc.threads_minus_1);
                munmap(map, size);
                return EAGAIN;
        }
+
+       if (do_sched) {
+               ret = __syscall(SYS_sched_setscheduler, new->tid,
+                       attr->_a_policy, &attr->_a_prio);
+               a_store(new->startlock, ret<0 ? 2 : 0);
+               __wake(new->startlock, 1, 1);
+               if (ret < 0) return -ret;
+       }
+
        *res = new;
        return 0;
 }