X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fenv%2F__init_tls.c;h=e02242435226d070489735f3bce3856de94a43fc;hb=11ce1b133d594b6a454d3e8d5941e7a6a432c42b;hp=c80f0528bd78ff68630346421e74ee945ce04032;hpb=561e0a0968f13b6d6c2b092501e210728e236fd7;p=musl diff --git a/src/env/__init_tls.c b/src/env/__init_tls.c index c80f0528..e0224243 100644 --- a/src/env/__init_tls.c +++ b/src/env/__init_tls.c @@ -2,6 +2,7 @@ #include #include #include +#include #include "pthread_impl.h" #include "libc.h" #include "atomic.h" @@ -11,68 +12,69 @@ int __init_tp(void *p) { pthread_t td = p; td->self = td; - if (__set_thread_area(TP_ADJ(p)) < 0) - return -1; - td->tid = td->pid = __syscall(SYS_set_tid_address, &td->tid); - td->errno_ptr = &td->errno_val; - /* Currently, both of these predicates depend in the same thing: - * successful initialization of the thread pointer. However, in - * the future, we may support setups where setting the thread - * pointer is possible but threads other than the main thread - * cannot work, so it's best to keep the predicates separate. */ - libc.has_thread_pointer = 1; - libc.can_do_threads = 1; + int r = __set_thread_area(TP_ADJ(p)); + if (r < 0) return -1; + if (!r) libc.can_do_threads = 1; + td->detach_state = DT_JOINABLE; + td->tid = __syscall(SYS_set_tid_address, &td->detach_state); + td->locale = &libc.global_locale; + td->robust_list.head = &td->robust_list.head; return 0; } -#ifndef SHARED +static struct builtin_tls { + char c; + struct pthread pt; + void *space[16]; +} builtin_tls[1]; +#define MIN_TLS_ALIGN offsetof(struct builtin_tls, pt) -static long long builtin_tls[(sizeof(struct pthread) + 64)/sizeof(long long)]; - -struct tls_image { - void *image; - size_t len, size, align; -} __static_tls ATTR_LIBC_VISIBILITY; - -#define T __static_tls +static struct tls_module main_tls; void *__copy_tls(unsigned char *mem) { pthread_t td; - if (!T.image) return mem; - void **dtv = (void *)mem; - dtv[0] = (void *)1; + struct tls_module *p; + size_t i; + void **dtv; + #ifdef TLS_ABOVE_TP - mem += sizeof(void *) * 2; - mem += -((uintptr_t)mem + sizeof(struct pthread)) & (T.align-1); + dtv = (void **)(mem + libc.tls_size) - (libc.tls_cnt + 1); + + mem += -((uintptr_t)mem + sizeof(struct pthread)) & (libc.tls_align-1); td = (pthread_t)mem; mem += sizeof(struct pthread); + + for (i=1, p=libc.tls_head; p; i++, p=p->next) { + dtv[i] = mem + p->offset; + memcpy(dtv[i], p->image, p->len); + } #else + dtv = (void **)mem; + mem += libc.tls_size - sizeof(struct pthread); - mem -= (uintptr_t)mem & (T.align-1); + mem -= (uintptr_t)mem & (libc.tls_align-1); td = (pthread_t)mem; - mem -= T.size; + + for (i=1, p=libc.tls_head; p; i++, p=p->next) { + dtv[i] = mem - p->offset; + memcpy(dtv[i], p->image, p->len); + } #endif - td->dtv = dtv; - dtv[1] = mem; - memcpy(mem, T.image, T.len); + dtv[0] = (void *)libc.tls_cnt; + td->dtv = td->dtv_copy = dtv; return td; } -void *__tls_get_addr(size_t *v) -{ - return (char *)__pthread_self()->dtv[1]+v[1]; -} - -void *__mmap(void *, size_t, int, int, int, off_t); - #if ULONG_MAX == 0xffffffff typedef Elf32_Phdr Phdr; #else typedef Elf64_Phdr Phdr; #endif -void __init_tls(size_t *aux) +extern weak hidden const size_t _DYNAMIC[]; + +static void static_init_tls(size_t *aux) { unsigned char *p; size_t n; @@ -80,35 +82,49 @@ void __init_tls(size_t *aux) size_t base = 0; void *mem; - libc.tls_size = sizeof(struct pthread); - for (p=(void *)aux[AT_PHDR],n=aux[AT_PHNUM]; n; n--,p+=aux[AT_PHENT]) { phdr = (void *)p; if (phdr->p_type == PT_PHDR) base = aux[AT_PHDR] - phdr->p_vaddr; + if (phdr->p_type == PT_DYNAMIC && _DYNAMIC) + base = (size_t)_DYNAMIC - phdr->p_vaddr; if (phdr->p_type == PT_TLS) tls_phdr = phdr; } if (tls_phdr) { - T.image = (void *)(base + tls_phdr->p_vaddr); - T.len = tls_phdr->p_filesz; - T.size = tls_phdr->p_memsz; - T.align = tls_phdr->p_align; + main_tls.image = (void *)(base + tls_phdr->p_vaddr); + main_tls.len = tls_phdr->p_filesz; + main_tls.size = tls_phdr->p_memsz; + main_tls.align = tls_phdr->p_align; + libc.tls_cnt = 1; + libc.tls_head = &main_tls; } - T.size += (-T.size - (uintptr_t)T.image) & (T.align-1); - if (T.align < 4*sizeof(size_t)) T.align = 4*sizeof(size_t); + main_tls.size += (-main_tls.size - (uintptr_t)main_tls.image) + & (main_tls.align-1); +#ifdef TLS_ABOVE_TP + main_tls.offset = GAP_ABOVE_TP; + main_tls.offset += -GAP_ABOVE_TP & (main_tls.align-1); +#else + main_tls.offset = main_tls.size; +#endif + if (main_tls.align < MIN_TLS_ALIGN) main_tls.align = MIN_TLS_ALIGN; - libc.tls_size = 2*sizeof(void *)+T.size+T.align+sizeof(struct pthread); + libc.tls_align = main_tls.align; + libc.tls_size = 2*sizeof(void *) + sizeof(struct pthread) +#ifdef TLS_ABOVE_TP + + main_tls.offset +#endif + + main_tls.size + main_tls.align + + MIN_TLS_ALIGN-1 & -MIN_TLS_ALIGN; if (libc.tls_size > sizeof builtin_tls) { +#ifndef SYS_mmap2 +#define SYS_mmap2 SYS_mmap +#endif mem = (void *)__syscall( -#ifdef SYS_mmap2 SYS_mmap2, -#else - SYS_mmap, -#endif 0, libc.tls_size, PROT_READ|PROT_WRITE, MAP_ANONYMOUS|MAP_PRIVATE, -1, 0); /* -4095...-1 cast to void * will crash on dereference anyway, @@ -118,10 +134,9 @@ void __init_tls(size_t *aux) mem = builtin_tls; } - /* Failure to initialize thread pointer is fatal if TLS is used. */ - if (__init_tp(__copy_tls(mem)) < 0 && tls_phdr) + /* Failure to initialize thread pointer is always fatal. */ + if (__init_tp(__copy_tls(mem)) < 0) a_crash(); } -#else -void __init_tls(size_t *auxv) { } -#endif + +weak_alias(static_init_tls, __init_tls);