From patchwork Tue Mar 16 17:30:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 42612 X-Patchwork-Delegate: azanella@linux.vnet.ibm.com Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9FAEB38618FF; Tue, 16 Mar 2021 17:30:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9FAEB38618FF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1615915826; bh=0BYbocCPV6vZXrPgWkdfCKXOPGENmxz4aKbkvuXadgw=; h=To:Subject:In-Reply-To:References:Date:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=UOPcfyeHeJDSqBFI8rx2UQvp3gWvvAnUZhtHef/sZozcie3VSaHQaInrgpa05V1Pt JL3VKsAgsBNbvjwhU1tLGBHbwdUNfPgfaCyeyWdG/hONrNSnGoAlziR0ZAXd7zSIue OHGEt5Btamim35TSltuavFFvobsgA2rHi4CkEKD4= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id 55834385480F for ; Tue, 16 Mar 2021 17:30:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 55834385480F Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-162-AwrlGgFZNBuRVLiDRnrhnA-1; Tue, 16 Mar 2021 13:30:21 -0400 X-MC-Unique: AwrlGgFZNBuRVLiDRnrhnA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 78BCC800FF0 for ; Tue, 16 Mar 2021 17:30:20 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-112-254.ams2.redhat.com [10.36.112.254]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 731A05D747 for ; Tue, 16 Mar 2021 17:30:19 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH v3 22/37] elf: Introduce __tls_init_tp for second-phase TCB initialization In-Reply-To: References: Message-Id: <43278f21dab16dae26ffc58b51c04326419b9d2e.1615914632.git.fweimer@redhat.com> Date: Tue, 16 Mar 2021 18:30:27 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" 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 --- 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 #include #include -#include #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. */ 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 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 + . */ + +#include + +void +__tls_init_tp (void) +{ +} 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 #include #include -#include #include #include @@ -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. */ 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 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 + . */ + +#include +#include +#include + +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)); +}