From patchwork Thu May 6 18:10:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 43277 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 391CB3AAB481; Thu, 6 May 2021 18:10:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 391CB3AAB481 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1620324659; bh=BYeeBwaIknW6oDB4pX3K8L+qjnCY1qyCF/TejfU8aJ8=; 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=EIoVA87PKJc4eKo+3tfg1muQhpjj8U/t0ahNFT2L1rEVNB+VWeE2ilNa2e/ZTD6ph 876njYmi0wEx7YHY/Wbw/XLaOCIRnaCjkIxiK46fVfehzO/fKxPMqf7DThszrEWUkV IdXZEQ50nSloAx42oak+NCpNjbABoJRntnLSCWtc= 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 [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id 41D703AAB455 for ; Thu, 6 May 2021 18:10:56 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 41D703AAB455 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-201-v_BPbWuBOuyjNqXa1pMO5g-1; Thu, 06 May 2021 14:10:53 -0400 X-MC-Unique: v_BPbWuBOuyjNqXa1pMO5g-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BC5D7188361E for ; Thu, 6 May 2021 18:10:31 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-112-137.ams2.redhat.com [10.36.112.137]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E3C8118101 for ; Thu, 6 May 2021 18:10:30 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 07/13] elf: Introduce __tls_pre_init_tp In-Reply-To: References: Message-Id: <34f3a445c6c083b135bef0e147ebf994082bcb42.1620323953.git.fweimer@redhat.com> Date: Thu, 06 May 2021 20:10:49 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.8 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" This is an early variant of __tls_init_tp, primarily for initializing thread-related elements of _rtld_global/GL. Some existing initialization code not needed for NPTL is moved into the generic version of this function. Tested-by: Carlos O'Donell Reviewed-by: Carlos O'Donell --- csu/libc-tls.c | 2 ++ elf/dl-mutex.c | 2 +- elf/dl-tls_init_tp.c | 29 ++++++++++++++++++++++++++ elf/rtld.c | 38 +---------------------------------- sysdeps/generic/ldsodefs.h | 4 ++++ sysdeps/nptl/dl-tls_init_tp.c | 25 +++++++++++++++++++++-- 6 files changed, 60 insertions(+), 40 deletions(-) diff --git a/csu/libc-tls.c b/csu/libc-tls.c index 22f8e4838d..5515204863 100644 --- a/csu/libc-tls.c +++ b/csu/libc-tls.c @@ -114,6 +114,8 @@ __libc_setup_tls (void) struct link_map *main_map = GL(dl_ns)[LM_ID_BASE]._ns_loaded; + __tls_pre_init_tp (); + /* Look through the TLS segment if there is any. */ if (_dl_phdr != NULL) for (phdr = _dl_phdr; phdr < &_dl_phdr[_dl_phnum]; ++phdr) diff --git a/elf/dl-mutex.c b/elf/dl-mutex.c index 2cd9d49c2e..ae1d8a84f0 100644 --- a/elf/dl-mutex.c +++ b/elf/dl-mutex.c @@ -16,4 +16,4 @@ License along with the GNU C Library; if not, see . */ -/* The generic version initialization happpens in dl_main. */ +/* Initialization happens in __tls_pre_init_tp in dl-tls_init_tp.c. */ diff --git a/elf/dl-tls_init_tp.c b/elf/dl-tls_init_tp.c index 728cd84c00..d84adc992c 100644 --- a/elf/dl-tls_init_tp.c +++ b/elf/dl-tls_init_tp.c @@ -18,6 +18,35 @@ #include +#if defined SHARED && defined _LIBC_REENTRANT \ + && defined __rtld_lock_default_lock_recursive +static void +rtld_lock_default_lock_recursive (void *lock) +{ + __rtld_lock_default_lock_recursive (lock); +} + +static void +rtld_lock_default_unlock_recursive (void *lock) +{ + __rtld_lock_default_unlock_recursive (lock); +} +#endif + +void +__tls_pre_init_tp (void) +{ +#if !THREAD_GSCOPE_IN_TCB + GL(dl_init_static_tls) = &_dl_nothread_init_static_tls; +#endif + +#if defined SHARED && defined _LIBC_REENTRANT \ + && defined __rtld_lock_default_lock_recursive + GL(dl_rtld_lock_recursive) = rtld_lock_default_lock_recursive; + GL(dl_rtld_unlock_recursive) = rtld_lock_default_unlock_recursive; +#endif +} + void __tls_init_tp (void) { diff --git a/elf/rtld.c b/elf/rtld.c index a359167f8a..1255d5cc7d 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -843,30 +843,6 @@ ERROR: ld.so: object '%s' from %s cannot be preloaded (%s): ignored.\n", return 0; } -#if defined SHARED && defined _LIBC_REENTRANT \ - && defined __rtld_lock_default_lock_recursive -static void -rtld_lock_default_lock_recursive (void *lock) -{ - __rtld_lock_default_lock_recursive (lock); -} - -static void -rtld_lock_default_unlock_recursive (void *lock) -{ - __rtld_lock_default_unlock_recursive (lock); -} -#endif -#if PTHREAD_IN_LIBC -/* Dummy implementation. See __rtld_mutex_init. */ -static int -rtld_mutex_dummy (pthread_mutex_t *lock) -{ - return 0; -} -#endif - - static void security_init (void) { @@ -1147,19 +1123,7 @@ dl_main (const ElfW(Phdr) *phdr, struct dl_main_state state; dl_main_state_init (&state); -#if !THREAD_GSCOPE_IN_TCB - GL(dl_init_static_tls) = &_dl_nothread_init_static_tls; -#endif - -#if defined SHARED && defined _LIBC_REENTRANT \ - && defined __rtld_lock_default_lock_recursive - GL(dl_rtld_lock_recursive) = rtld_lock_default_lock_recursive; - GL(dl_rtld_unlock_recursive) = rtld_lock_default_unlock_recursive; -#endif -#if PTHREAD_IN_LIBC - ___rtld_mutex_lock = rtld_mutex_dummy; - ___rtld_mutex_unlock = rtld_mutex_dummy; -#endif + __tls_pre_init_tp (); /* The explicit initialization here is cheaper than processing the reloc in the _rtld_local definition's initializer. */ diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index 6d590d1335..ee851ac789 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -1165,6 +1165,10 @@ 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 very early from dl_main to set up TLS and + other thread-related data structures. */ +void __tls_pre_init_tp (void) 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. */ diff --git a/sysdeps/nptl/dl-tls_init_tp.c b/sysdeps/nptl/dl-tls_init_tp.c index 05d2b6cfcc..cb29222727 100644 --- a/sysdeps/nptl/dl-tls_init_tp.c +++ b/sysdeps/nptl/dl-tls_init_tp.c @@ -27,12 +27,33 @@ bool __nptl_set_robust_list_avail __attribute__ ((nocommon)); rtld_hidden_data_def (__nptl_set_robust_list_avail) #endif +#ifdef SHARED +/* Dummy implementation. See __rtld_mutex_init. */ +static int +rtld_mutex_dummy (pthread_mutex_t *lock) +{ + return 0; +} +#endif + void -__tls_init_tp (void) +__tls_pre_init_tp (void) { - /* Set up thread stack list management. */ + /* The list data structures are not consistent until + initialized. */ INIT_LIST_HEAD (&GL (dl_stack_used)); INIT_LIST_HEAD (&GL (dl_stack_user)); + +#ifdef SHARED + ___rtld_mutex_lock = rtld_mutex_dummy; + ___rtld_mutex_unlock = rtld_mutex_dummy; +#endif +} + +void +__tls_init_tp (void) +{ + /* Set up thread stack list management. */ list_add (&THREAD_SELF->list, &GL (dl_stack_user)); /* Early initialization of the TCB. */