From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org, Florian Weimer <fweimer@redhat.com>
Subject: Re: [PATCH v3 10/37] csu: Move calling main out of __libc_start_main_impl
Date: Wed, 17 Mar 2021 17:45:29 -0300 [thread overview]
Message-ID: <5ef1e58c-ca0f-cb42-02a2-b2f7320630a8@linaro.org> (raw)
In-Reply-To: <3ec0825ceb5514f7f94d170f40cae12a3111a3fd.1615914631.git.fweimer@redhat.com>
On 16/03/2021 14:29, Florian Weimer via Libc-alpha wrote:
> This code depends on whether glibc has unwinding support for
> a particular port.
LGTM.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
> ---
> csu/libc-start.c | 74 ++--------------------
> sysdeps/generic/libc_start_call_main.h | 24 +++++++
> sysdeps/nptl/libc_start_call_main.h | 88 ++++++++++++++++++++++++++
> 3 files changed, 116 insertions(+), 70 deletions(-)
> create mode 100644 sysdeps/generic/libc_start_call_main.h
> create mode 100644 sysdeps/nptl/libc_start_call_main.h
>
> diff --git a/csu/libc-start.c b/csu/libc-start.c
> index 05ff7afddf..8688cba76d 100644
> --- a/csu/libc-start.c
> +++ b/csu/libc-start.c
> @@ -58,12 +58,6 @@ uintptr_t __pointer_chk_guard_local
> # endif
> #endif
>
> -#ifdef HAVE_PTR_NTHREADS
> -/* We need atomic operations. */
> -# include <atomic.h>
> -#endif
> -
> -
> #ifndef SHARED
> # include <link.h>
> # include <dl-irel.h>
> @@ -123,6 +117,9 @@ apply_irel (void)
> # define ARCH_INIT_CPU_FEATURES()
> #endif
>
> +/* Obtain the definition of __libc_start_call_main. */
> +#include <libc_start_call_main.h>
> +
> #ifdef SHARED
> /* Initialization for dynamic executables. Find the main executable
> link map and run its init functions. */
> @@ -245,9 +242,6 @@ LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL),
> void (*fini) (void),
> void (*rtld_fini) (void), void *stack_end)
> {
> - /* Result of the 'main' function. */
> - int result;
> -
> #ifndef SHARED
> char **ev = &argv[argc + 1];
>
> @@ -413,68 +407,8 @@ LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL),
> #ifndef SHARED
> _dl_debug_initialize (0, LM_ID_BASE);
> #endif
> -#ifdef HAVE_CLEANUP_JMP_BUF
> - /* Memory for the cancellation buffer. */
> - struct pthread_unwind_buf unwind_buf;
> -
> - int not_first_call;
> - DIAG_PUSH_NEEDS_COMMENT;
> -#if __GNUC_PREREQ (7, 0)
> - /* This call results in a -Wstringop-overflow warning because struct
> - pthread_unwind_buf is smaller than jmp_buf. setjmp and longjmp
> - do not use anything beyond the common prefix (they never access
> - the saved signal mask), so that is a false positive. */
> - DIAG_IGNORE_NEEDS_COMMENT (11, "-Wstringop-overflow=");
> -#endif
> - not_first_call = setjmp ((struct __jmp_buf_tag *) unwind_buf.cancel_jmp_buf);
> - DIAG_POP_NEEDS_COMMENT;
> - if (__glibc_likely (! not_first_call))
> - {
> - struct pthread *self = THREAD_SELF;
> -
> - /* Store old info. */
> - unwind_buf.priv.data.prev = THREAD_GETMEM (self, cleanup_jmp_buf);
> - unwind_buf.priv.data.cleanup = THREAD_GETMEM (self, cleanup);
> -
> - /* Store the new cleanup handler info. */
> - THREAD_SETMEM (self, cleanup_jmp_buf, &unwind_buf);
> -
> - /* Run the program. */
> - result = main (argc, argv, __environ MAIN_AUXVEC_PARAM);
> - }
> - else
> - {
> - /* Remove the thread-local data. */
> -# ifdef SHARED
> - PTHFCT_CALL (ptr__nptl_deallocate_tsd, ());
> -# else
> - extern void __nptl_deallocate_tsd (void) __attribute ((weak));
> - __nptl_deallocate_tsd ();
> -# endif
> -
> - /* One less thread. Decrement the counter. If it is zero we
> - terminate the entire process. */
> - result = 0;
> -# ifdef SHARED
> - unsigned int *ptr = __libc_pthread_functions.ptr_nthreads;
> -# ifdef PTR_DEMANGLE
> - PTR_DEMANGLE (ptr);
> -# endif
> -# else
> - extern unsigned int __nptl_nthreads __attribute ((weak));
> - unsigned int *const ptr = &__nptl_nthreads;
> -# endif
> -
> - if (! atomic_decrement_and_test (ptr))
> - /* Not much left to do but to exit the thread, not the process. */
> - __exit_thread ();
> - }
> -#else
> - /* Nothing fancy, just call the function. */
> - result = main (argc, argv, __environ MAIN_AUXVEC_PARAM);
> -#endif
>
> - exit (result);
> + __libc_start_call_main (main, argc, argv MAIN_AUXVEC_PARAM);
> }
>
> /* Starting with glibc 2.34, the init parameter is always NULL. Older
Ok.
> diff --git a/sysdeps/generic/libc_start_call_main.h b/sysdeps/generic/libc_start_call_main.h
> new file mode 100644
> index 0000000000..8a06eec4a3
> --- /dev/null
> +++ b/sysdeps/generic/libc_start_call_main.h
> @@ -0,0 +1,24 @@
> +/* Invoking main from __libc_start. Generic version without unwinding.
> + Copyright (C) 1998-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/>. */
> +
> +_Noreturn static __always_inline void
> +__libc_start_call_main (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL),
> + int argc, char **argv MAIN_AUXVEC_DECL)
> +{
> + exit (main (argc, argv, __environ MAIN_AUXVEC_PARAM));
> +}
Ok.
> diff --git a/sysdeps/nptl/libc_start_call_main.h b/sysdeps/nptl/libc_start_call_main.h
> new file mode 100644
> index 0000000000..5218e7ab1e
> --- /dev/null
> +++ b/sysdeps/nptl/libc_start_call_main.h
> @@ -0,0 +1,88 @@
> +/* Invoking main from __libc_start_main. nptl version.
> + Copyright (C) 1998-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 <atomic.h>
> +
> +_Noreturn static void
> +__libc_start_call_main (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL),
> + int argc, char **argv
> +#ifdef LIBC_START_MAIN_AUXVEC_ARG
> + , ElfW(auxv_t) *auxvec
> +#endif
> + )
> +{
> + int result;
> +
> + /* Memory for the cancellation buffer. */
> + struct pthread_unwind_buf unwind_buf;
> +
> + int not_first_call;
> + DIAG_PUSH_NEEDS_COMMENT;
> +#if __GNUC_PREREQ (7, 0)
> + /* This call results in a -Wstringop-overflow warning because struct
> + pthread_unwind_buf is smaller than jmp_buf. setjmp and longjmp
> + do not use anything beyond the common prefix (they never access
> + the saved signal mask), so that is a false positive. */
> + DIAG_IGNORE_NEEDS_COMMENT (11, "-Wstringop-overflow=");
> +#endif
> + not_first_call = setjmp ((struct __jmp_buf_tag *) unwind_buf.cancel_jmp_buf);
> + DIAG_POP_NEEDS_COMMENT;
> + if (__glibc_likely (! not_first_call))
> + {
> + struct pthread *self = THREAD_SELF;
> +
> + /* Store old info. */
> + unwind_buf.priv.data.prev = THREAD_GETMEM (self, cleanup_jmp_buf);
> + unwind_buf.priv.data.cleanup = THREAD_GETMEM (self, cleanup);
> +
> + /* Store the new cleanup handler info. */
> + THREAD_SETMEM (self, cleanup_jmp_buf, &unwind_buf);
> +
> + /* Run the program. */
> + result = main (argc, argv, __environ MAIN_AUXVEC_PARAM);
> + }
> + else
> + {
> + /* Remove the thread-local data. */
> +# ifdef SHARED
> + PTHFCT_CALL (ptr__nptl_deallocate_tsd, ());
> +# else
> + extern void __nptl_deallocate_tsd (void) __attribute ((weak));
> + __nptl_deallocate_tsd ();
> +# endif
> +
> + /* One less thread. Decrement the counter. If it is zero we
> + terminate the entire process. */
> + result = 0;
> +# ifdef SHARED
> + unsigned int *ptr = __libc_pthread_functions.ptr_nthreads;
> +# ifdef PTR_DEMANGLE
> + PTR_DEMANGLE (ptr);
> +# endif
> +# else
> + extern unsigned int __nptl_nthreads __attribute ((weak));
> + unsigned int *const ptr = &__nptl_nthreads;
> +# endif
> +
> + if (! atomic_decrement_and_test (ptr))
> + /* Not much left to do but to exit the thread, not the process. */
> + __exit_thread ();
> + }
> +
> + exit (result);
> +}
>
Ok.
next prev parent reply other threads:[~2021-03-17 20:45 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 [this message]
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
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=5ef1e58c-ca0f-cb42-02a2-b2f7320630a8@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).