From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org, Florian Weimer <fweimer@redhat.com>
Subject: Re: [PATCH v3 22/37] elf: Introduce __tls_init_tp for second-phase TCB initialization
Date: Tue, 23 Mar 2021 15:25:41 -0300 [thread overview]
Message-ID: <fdf100f7-93ff-b58c-c1e5-494cc5abda99@linaro.org> (raw)
In-Reply-To: <43278f21dab16dae26ffc58b51c04326419b9d2e.1615914632.git.fweimer@redhat.com>
On 16/03/2021 14:30, Florian Weimer via Libc-alpha wrote:
> 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.
LGTM, thanks.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
> ---
> csu/libc-tls.c | 8 +-------
> elf/Makefile | 2 +-
> elf/dl-tls_init_tp.c | 24 ++++++++++++++++++++++++
> elf/rtld.c | 14 ++------------
> sysdeps/generic/ldsodefs.h | 5 +++++
> sysdeps/nptl/dl-tls_init_tp.c | 30 ++++++++++++++++++++++++++++++
> 6 files changed, 63 insertions(+), 20 deletions(-)
> create mode 100644 elf/dl-tls_init_tp.c
> create mode 100644 sysdeps/nptl/dl-tls_init_tp.c
>
> diff --git a/csu/libc-tls.c b/csu/libc-tls.c
> index f3a6a6a075..22f8e4838d 100644
> --- a/csu/libc-tls.c
> +++ b/csu/libc-tls.c
> @@ -24,7 +24,6 @@
> #include <stdio.h>
> #include <sys/param.h>
> #include <array_length.h>
> -#include <list.h>
>
> #ifdef SHARED
> #error makefile bug, this file is for static only
> @@ -193,12 +192,7 @@ __libc_setup_tls (void)
> #endif
> if (__builtin_expect (lossage != NULL, 0))
> _startup_fatal (lossage);
> -
> -#if THREAD_GSCOPE_IN_TCB
> - INIT_LIST_HEAD (&_dl_stack_used);
> - INIT_LIST_HEAD (&_dl_stack_user);
> - list_add (&THREAD_SELF->list, &_dl_stack_user);
> -#endif
> + __tls_init_tp ();
>
> /* Update the executable's link map with enough information to make
> the TLS routines happy. */
Ok.
> diff --git a/elf/Makefile b/elf/Makefile
> index deb76aed99..22b3a06cab 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
Ok.
> diff --git a/elf/dl-tls_init_tp.c b/elf/dl-tls_init_tp.c
> new file mode 100644
> index 0000000000..728cd84c00
> --- /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)
> +{
> +}
Ok.
> diff --git a/elf/rtld.c b/elf/rtld.c
> index c2ca4b7ce3..34879016ad 100644
> --- a/elf/rtld.c
> +++ b/elf/rtld.c
> @@ -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;
Ok.
> @@ -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. */
Ok.
> 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. */
Ok.
> diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
> index dfc117a445..67c6686015 100644
> --- a/sysdeps/generic/ldsodefs.h
> +++ b/sysdeps/generic/ldsodefs.h
> @@ -1163,6 +1163,11 @@ extern void _dl_determine_tlsoffset (void) attribute_hidden;
> number of audit modules are loaded. */
> void _dl_tls_static_surplus_init (size_t naudit) attribute_hidden;
>
> +/* This function is called after processor-specific initialization of
> + the TCB and thread pointer via TLS_INIT_TP, to complete very early
> + initialization of the thread library. */
> +void __tls_init_tp (void) attribute_hidden;
> +
> #ifndef SHARED
> /* Set up the TCB for statically linked applications. This is called
> early during startup because we always use TLS (for errno and the
Ok.
> diff --git a/sysdeps/nptl/dl-tls_init_tp.c b/sysdeps/nptl/dl-tls_init_tp.c
> new file mode 100644
> index 0000000000..8983808233
> --- /dev/null
> +++ b/sysdeps/nptl/dl-tls_init_tp.c
> @@ -0,0 +1,30 @@
> +/* Completion of TCB initialization after TLS_INIT_TP. NPTL version.
> + Copyright (C) 2020-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>
> +#include <list.h>
> +#include <tls.h>
> +
> +void
> +__tls_init_tp (void)
> +{
> + /* Set up thread stack list management. */
> + INIT_LIST_HEAD (&GL (dl_stack_used));
> + INIT_LIST_HEAD (&GL (dl_stack_user));
> + list_add (&THREAD_SELF->list, &GL (dl_stack_user));
> +}
>
Ok.
next prev parent reply other threads:[~2021-03-23 18:25 UTC|newest]
Thread overview: 99+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-16 17:27 [PATCH v3 00/37] libpthread removal: NPTL forwarders are gone Florian Weimer
2021-03-16 17:27 ` [PATCH v3 01/37] nptl: Move pthread_mutex_consistent into libc Florian Weimer
2021-03-17 11:36 ` Adhemerval Zanella
2021-03-16 17:27 ` [PATCH v3 02/37] nptl: Move __pthread_cleanup_routine " Florian Weimer
2021-03-16 17:27 ` [PATCH v3 03/37] nptl: Move legacy unwinding implementation " Florian Weimer
2021-03-16 17:27 ` [PATCH v3 04/37] nptl: Move legacy cancelation handling into libc as compat symbols Florian Weimer
2021-03-16 17:27 ` [PATCH v3 05/37] nptl: Remove longjmp, siglongjmp from libpthread Florian Weimer
2021-03-17 11:38 ` Adhemerval Zanella
2021-03-16 17:28 ` [PATCH v3 06/37] x86: Restore compile-time check for shadow stack pointer in longjmp Florian Weimer
2021-03-16 17:28 ` [PATCH v3 07/37] nptl: Move __pthread_cleanup_upto into libc Florian Weimer
2021-03-16 17:28 ` [PATCH v3 08/37] nptl: Move pthread_once and __pthread_once " Florian Weimer
2021-03-17 13:30 ` Adhemerval Zanella
2021-03-17 13:37 ` Adhemerval Zanella
2021-03-17 14:45 ` Florian Weimer
2021-03-17 16:39 ` Adhemerval Zanella
2021-03-17 16:56 ` Florian Weimer
2021-03-17 17:22 ` Adhemerval Zanella
2021-03-17 17:43 ` Florian Weimer
2021-03-17 19:09 ` Adhemerval Zanella
2021-03-16 17:29 ` [PATCH v3 09/37] nptl: Move __pthread_unwind_next " Florian Weimer
2021-03-17 19:42 ` Adhemerval Zanella
2021-03-17 19:54 ` Florian Weimer
2021-03-17 20:16 ` Adhemerval Zanella
2021-03-17 20:33 ` Florian Weimer
2021-03-17 20:44 ` Adhemerval Zanella
2021-03-16 17:29 ` [PATCH v3 10/37] csu: Move calling main out of __libc_start_main_impl Florian Weimer
2021-03-17 20:45 ` Adhemerval Zanella
2021-03-16 17:29 ` [PATCH v3 11/37] nptl: Move internal __nptl_nthreads variable into libc Florian Weimer
2021-03-18 12:42 ` Adhemerval Zanella
2021-03-16 17:29 ` [PATCH v3 12/37] nptl_db: Introduce DB_MAIN_ARRAY_VARIABLE Florian Weimer
2021-03-18 12:43 ` Adhemerval Zanella
2021-03-16 17:29 ` [PATCH v3 13/37] nptl: Move __pthread_keys global variable into libc Florian Weimer
2021-03-18 12:44 ` Adhemerval Zanella
2021-03-16 17:29 ` [PATCH v3 14/37] nptl: Move __nptl_deallocate_tsd " Florian Weimer
2021-03-18 12:46 ` Adhemerval Zanella
2021-03-18 17:16 ` Florian Weimer
2021-03-18 17:54 ` Adhemerval Zanella
2021-03-16 17:29 ` [PATCH v3 15/37] nptl: Move pthread_exit " Florian Weimer
2021-03-18 12:49 ` Adhemerval Zanella
2021-03-16 17:29 ` [PATCH v3 16/37] nptl: Move pthread_setcancelstate " Florian Weimer
2021-03-18 12:52 ` Adhemerval Zanella
2021-03-16 17:29 ` [PATCH v3 17/37] nptl: Move pthread_setcanceltype " Florian Weimer
2021-03-18 12:53 ` Adhemerval Zanella
2021-03-16 17:29 ` [PATCH v3 18/37] nptl: Invoke the set_robust_list system call directly in fork Florian Weimer
2021-03-18 12:54 ` Adhemerval Zanella
2021-03-16 17:30 ` [PATCH v3 19/37] dlfcn: Failures after dlmopen should not terminate process [BZ #24772] Florian Weimer
2021-03-19 19:56 ` Adhemerval Zanella
2021-03-27 16:57 ` Florian Weimer
2021-03-16 17:30 ` [PATCH v3 20/37] dlfcn: dlerror needs to call free from the base namespace [BZ #24773] Florian Weimer
2021-03-23 14:47 ` Adhemerval Zanella
2021-03-16 17:30 ` [PATCH v3 21/37] Remove pthread_key_create-related internals from libc-lock.h Florian Weimer
2021-03-23 16:39 ` Adhemerval Zanella
2021-03-16 17:30 ` [PATCH v3 22/37] elf: Introduce __tls_init_tp for second-phase TCB initialization Florian Weimer
2021-03-23 18:25 ` Adhemerval Zanella [this message]
2021-03-16 17:30 ` [PATCH v3 23/37] nptl: Move part of TCB initialization from libpthread to __tls_init_tp Florian Weimer
2021-03-24 13:56 ` Adhemerval Zanella
2021-03-27 17:19 ` Florian Weimer
2021-03-16 17:30 ` [PATCH v3 24/37] nptl: Move pthread_key_create, __pthread_key_create into libc Florian Weimer
2021-03-24 14:09 ` Adhemerval Zanella
2021-03-24 14:32 ` Florian Weimer
2021-03-24 14:42 ` Adhemerval Zanella
2021-03-24 15:08 ` Florian Weimer
2021-03-24 15:46 ` Adhemerval Zanella
2021-03-16 17:30 ` [PATCH v3 25/37] nptl: Move pthread_getspecific, __pthread_getspecific " Florian Weimer
2021-03-24 14:12 ` Adhemerval Zanella
2021-03-24 14:38 ` Florian Weimer
2021-03-24 14:43 ` Adhemerval Zanella
2021-03-16 17:30 ` [PATCH v3 26/37] nptl: Move pthread_setspecific, __pthread_setspecific " Florian Weimer
2021-03-24 14:26 ` Adhemerval Zanella
2021-03-16 17:30 ` [PATCH v3 27/37] nptl: Move pthread_key_delete " Florian Weimer
2021-03-24 14:45 ` Adhemerval Zanella
2021-03-16 17:31 ` [PATCH v3 28/37] nptl: Move rwlock functions with forwarders " Florian Weimer
2021-03-25 19:52 ` Adhemerval Zanella
2021-03-27 21:41 ` Florian Weimer
2021-03-16 17:31 ` [PATCH v3 29/37] nptl: Move the internal thread priority protection symbols " Florian Weimer
2021-03-25 20:21 ` Adhemerval Zanella
2021-03-16 17:31 ` [PATCH v3 30/37] pthread: Introduce __pthread_early_init Florian Weimer
2021-03-25 20:22 ` Adhemerval Zanella
2021-03-16 17:31 ` [PATCH v3 31/37] nptl: Move internal symbol __mutex_aconf into libc Florian Weimer
2021-03-25 20:24 ` Adhemerval Zanella
2021-03-16 17:31 ` [PATCH v3 32/37] nptl: pthread_mutex_lock, pthread_mutex_unock single-threaded optimization Florian Weimer
2021-03-26 18:00 ` Adhemerval Zanella
2021-03-16 17:31 ` [PATCH v3 33/37] x86: Remove low-level lock optimization Florian Weimer
2021-03-25 20:30 ` Adhemerval Zanella
2021-03-16 17:31 ` [PATCH v3 34/37] nptl: Move core mutex functions into libc Florian Weimer
2021-03-25 20:46 ` Adhemerval Zanella
2021-03-16 17:31 ` [PATCH v3 35/37] nptl: Move core condition variable " Florian Weimer
2021-03-26 17:14 ` Adhemerval Zanella
2021-03-16 17:31 ` [PATCH v3 36/37] nptl: Move setxid broadcast implementation " Florian Weimer
2021-03-26 18:15 ` Adhemerval Zanella
2021-04-06 18:41 ` Florian Weimer
2021-04-06 18:54 ` Adhemerval Zanella
2021-04-06 19:23 ` Florian Weimer
2021-04-06 19:40 ` Adhemerval Zanella
2021-03-16 17:31 ` [PATCH v3 37/37] nptl: Remove remnants of the libc/libpthread forwarder interface Florian Weimer
2021-03-26 18:19 ` Adhemerval Zanella
2021-03-18 22:06 ` [PATCH v3 00/37] libpthread removal: NPTL forwarders are gone Florian Weimer
2021-03-26 18:25 ` Adhemerval Zanella
2021-03-31 10:18 ` Florian Weimer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=fdf100f7-93ff-b58c-c1e5-494cc5abda99@linaro.org \
--to=adhemerval.zanella@linaro.org \
--cc=fweimer@redhat.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).