public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Florian Weimer <fw@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc] ld.so: Export tls_init_tp_called as __rtld_tls_init_tp_called Date: Thu, 27 Oct 2022 09:37:04 +0000 (GMT) [thread overview] Message-ID: <20221027093704.B8566382EA30@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=a65ff76c9a1811dd2396ab45563f645579c0e687 commit a65ff76c9a1811dd2396ab45563f645579c0e687 Author: Florian Weimer <fweimer@redhat.com> Date: Thu Oct 27 11:36:44 2022 +0200 ld.so: Export tls_init_tp_called as __rtld_tls_init_tp_called This allows the rest of dynamic loader to check whether the TCB has been set up (and THREAD_GETMEM and THREAD_SETMEM will work). Reviewed-by: Siddhesh Poyarekar <siddhesh@gotplt.org> Diff: --- elf/rtld.c | 10 +++++----- sysdeps/generic/ldsodefs.h | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/elf/rtld.c b/elf/rtld.c index 3b78f40562..221be5c71e 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -730,7 +730,7 @@ match_version (const char *string, struct link_map *map) return 0; } -static bool tls_init_tp_called; +bool __rtld_tls_init_tp_called; static void * init_tls (size_t naudit) @@ -800,7 +800,7 @@ cannot allocate TLS data structures for initial thread\n"); if (__glibc_unlikely (lossage != NULL)) _dl_fatal_printf ("cannot set up thread-local storage: %s\n", lossage); __tls_init_tp (); - tls_init_tp_called = true; + __rtld_tls_init_tp_called = true; return tcbp; } @@ -2050,7 +2050,7 @@ dl_main (const ElfW(Phdr) *phdr, an old kernel that can't perform TLS_INIT_TP, even if no TLS is ever used. Trying to do it lazily is too hairy to try when there could be multiple threads (from a non-TLS-using libpthread). */ - bool was_tls_init_tp_called = tls_init_tp_called; + bool was_tls_init_tp_called = __rtld_tls_init_tp_called; if (tcbp == NULL) tcbp = init_tls (0); @@ -2321,7 +2321,7 @@ dl_main (const ElfW(Phdr) *phdr, consider_profiling); /* Add object to slot information data if necessasy. */ - if (l->l_tls_blocksize != 0 && tls_init_tp_called) + if (l->l_tls_blocksize != 0 && __rtld_tls_init_tp_called) _dl_add_to_slotinfo (l, true); } } @@ -2347,7 +2347,7 @@ dl_main (const ElfW(Phdr) *phdr, _dl_allocate_tls_init (tcbp, false); /* And finally install it for the main thread. */ - if (! tls_init_tp_called) + if (! __rtld_tls_init_tp_called) { const char *lossage = TLS_INIT_TP (tcbp); if (__glibc_unlikely (lossage != NULL)) diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index 6b256b8388..0223aa9f12 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -1219,6 +1219,9 @@ extern void *_dl_allocate_tls_storage (void) attribute_hidden; extern void *_dl_allocate_tls_init (void *, bool); rtld_hidden_proto (_dl_allocate_tls_init) +/* True if the TCB has been set up. */ +extern bool __rtld_tls_init_tp_called attribute_hidden; + /* Deallocate memory allocated with _dl_allocate_tls. */ extern void _dl_deallocate_tls (void *tcb, bool dealloc_tcb); rtld_hidden_proto (_dl_deallocate_tls)
reply other threads:[~2022-10-27 9:37 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20221027093704.B8566382EA30@sourceware.org \ --to=fw@sourceware.org \ --cc=glibc-cvs@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: linkBe 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).