From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qv1-xf2d.google.com (mail-qv1-xf2d.google.com [IPv6:2607:f8b0:4864:20::f2d]) by sourceware.org (Postfix) with ESMTPS id 35D393861857 for ; Tue, 23 Mar 2021 18:25:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 35D393861857 Received: by mail-qv1-xf2d.google.com with SMTP id h3so10966267qvh.8 for ; Tue, 23 Mar 2021 11:25:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=Z/+KKdTaalbaHdlMXoRZ7I0EEyMRfsEKNsoTV6+sec4=; b=ZTaFJdPp/HIGfZeWrA82vbU9KYQp0YOfDWt+3CxZ+iwRO8A8xO7ejkbToBfRSFAg/S 9TPPo6kvxz/AvEbRgciwWrDSA4kTK71gT/DcmogtO6FxKue2eA8cdZxcMRfNJrK5nCg/ Tq+cjc0tZ5H0WkEJbNtty1RJQ4+qAE1rEsga84oIpeWEPnMkM1iqTA9kI3a//a5q5SV6 GoQtO6jmokd+I3SPGNDjj+CCgxyCAOuRq70cfp8DVtdfHW9WOfdVgIhD0U6IeqL2BDy+ LYYQ2EmAMFyPEPqX9wts+9J1MXPJe4mW+CfZlKub65EAv9BNcSUQjqjpKGM0jiPNwEPK tIRw== X-Gm-Message-State: AOAM5322ocH34k/B5sak5DZBRpfWcoRDQkj8bZYfSme6XUob98wUfMOr /uvSG3LV1EjnKiPOQ0l2LEZPBOAKXtyCBA== X-Google-Smtp-Source: ABdhPJxgBkZZMIsRdPs2/fJTZEuLDz3bl0Sw+nYxtZXUIWy5JrlKX3hD6Qgxj8px/mOVG4hYBHa6yw== X-Received: by 2002:a0c:f6cd:: with SMTP id d13mr6047676qvo.20.1616523943750; Tue, 23 Mar 2021 11:25:43 -0700 (PDT) Received: from [192.168.1.132] ([177.194.41.149]) by smtp.gmail.com with ESMTPSA id d2sm13947824qkk.42.2021.03.23.11.25.42 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 23 Mar 2021 11:25:43 -0700 (PDT) Subject: Re: [PATCH v3 22/37] elf: Introduce __tls_init_tp for second-phase TCB initialization To: libc-alpha@sourceware.org, Florian Weimer References: <43278f21dab16dae26ffc58b51c04326419b9d2e.1615914632.git.fweimer@redhat.com> From: Adhemerval Zanella Message-ID: Date: Tue, 23 Mar 2021 15:25:41 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: <43278f21dab16dae26ffc58b51c04326419b9d2e.1615914632.git.fweimer@redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, NICE_REPLY_A, RCVD_IN_DNSWL_NONE, 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-List-Received-Date: Tue, 23 Mar 2021 18:25:46 -0000 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 > --- > 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. */ 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 > + . */ > + > +#include > + > +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 > #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; 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 > + . */ > + > +#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)); > +} > Ok.