diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-04-21 19:49:51 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-04-21 19:49:51 +0200 |
| commit | 90d7e7e5bd3b0683a27c658388b6515ce950c78e (patch) | |
| tree | e0de4856de1b728a33cd778d1b05a3a169953cd7 /elf | |
| parent | 90e97b37201c9b33ee79296b6eb034d5d5db925c (diff) | |
| download | glibc-90d7e7e5bd3b0683a27c658388b6515ce950c78e.zip glibc-90d7e7e5bd3b0683a27c658388b6515ce950c78e.tar.gz glibc-90d7e7e5bd3b0683a27c658388b6515ce950c78e.tar.bz2 | |
elf: Introduce __tls_init_tp for second-phase TCB initialization
TLS_INIT_TP is processor-specific, so it is not a good place to
put thread library initialization code (it would have to be repeated
for all CPUs). Introduce __tls_init_tp as a separate function,
to be called immediately after TLS_INIT_TP. Move the existing
stack list setup code for NPTL to this function.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/Makefile | 2 | ||||
| -rw-r--r-- | elf/dl-tls_init_tp.c | 24 | ||||
| -rw-r--r-- | elf/rtld.c | 14 |
3 files changed, 27 insertions, 13 deletions
diff --git a/elf/Makefile b/elf/Makefile index b51c158..f09988f 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -35,7 +35,7 @@ dl-routines = $(addprefix dl-,load lookup object reloc deps \ execstack open close trampoline \ exception sort-maps lookup-direct \ call-libc-early-init write \ - thread_gscope_wait) + thread_gscope_wait tls_init_tp) ifeq (yes,$(use-ldconfig)) dl-routines += dl-cache endif diff --git a/elf/dl-tls_init_tp.c b/elf/dl-tls_init_tp.c new file mode 100644 index 0000000..728cd84 --- /dev/null +++ b/elf/dl-tls_init_tp.c @@ -0,0 +1,24 @@ +/* Completion of TCB initialization after TLS_INIT_TP. Generic version. + Copyright (C) 2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <https://www.gnu.org/licenses/>. */ + +#include <ldsodefs.h> + +void +__tls_init_tp (void) +{ +} @@ -48,7 +48,6 @@ #include <array_length.h> #include <libc-early-init.h> #include <dl-main.h> -#include <list.h> #include <gnu/lib-names.h> #include <dl-tunables.h> @@ -807,9 +806,7 @@ cannot allocate TLS data structures for initial thread\n"); const char *lossage = TLS_INIT_TP (tcbp); if (__glibc_unlikely (lossage != NULL)) _dl_fatal_printf ("cannot set up thread-local storage: %s\n", lossage); -#if THREAD_GSCOPE_IN_TCB - list_add (&THREAD_SELF->list, &GL (dl_stack_user)); -#endif + __tls_init_tp (); tls_init_tp_called = true; return tcbp; @@ -1150,11 +1147,6 @@ dl_main (const ElfW(Phdr) *phdr, GL(dl_rtld_unlock_recursive) = rtld_lock_default_unlock_recursive; #endif -#if THREAD_GSCOPE_IN_TCB - INIT_LIST_HEAD (&GL (dl_stack_used)); - INIT_LIST_HEAD (&GL (dl_stack_user)); -#endif - /* The explicit initialization here is cheaper than processing the reloc in the _rtld_local definition's initializer. */ GL(dl_make_stack_executable_hook) = &_dl_make_stack_executable; @@ -2454,9 +2446,7 @@ dl_main (const ElfW(Phdr) *phdr, if (__glibc_unlikely (lossage != NULL)) _dl_fatal_printf ("cannot set up thread-local storage: %s\n", lossage); -#if THREAD_GSCOPE_IN_TCB - list_add (&THREAD_SELF->list, &GL (dl_stack_user)); -#endif + __tls_init_tp (); } /* Make sure no new search directories have been added. */ |