Message ID | 20240725184356.27086-1-adhemerval.zanella@linaro.org |
---|---|
State | Accepted |
Commit | f6ba993e0cda0ca5554fd47b00e6a87be5fdf05e |
Headers | show |
Series | stdlib: Allow concurrent exit (BZ 31997) | expand |
On 7/25/24 2:41 PM, Adhemerval Zanella wrote: > Even if C/POSIX standard states that exit is not formally thread-unsafe, > calling it more than once is UB. The glibc already supports > it for the single-thread, and both elf/nodelete2.c and tst-rseq-disable.c > call exit from a DSO destructor (which is called by _dl_fini, registered > at program startup with __cxa_atexit). > > However, there are still race issues when it is called more than once > concurrently by multiple threads. A recent Rust PR triggered this > issue [1], which resulted in an Austin Group ask for clarification [2]. > Besides it, there is a discussion to make concurrent calling not UB [3], > wtiha defined semantic where any remaining callers block until the first Please fix: s/wtiha/with a/g > call to exit has finished (reentrant calls, leaving through longjmp, and > exceptions are still undefined). > > For glibc, at least reentrant calls are required to be supported to avoid > changing the current behaviour. This requires locking using a recursive > lock, where any exit called by atexit() handlers resumes at the point of > the current handler (thus avoiding calling the current handle multiple > times). This is a good conservative balance between backwards compatibility and MT-safety. I also noticed that a second exit() call like this allows an atexit() handler to influence the exit code *and* keep running the shutdown functions, and that may be something that libraries have come to expect. I was hoping we could just call abort() in this case :-} I look forward to seeing this deployed into OpenSUSE Tumbleweed and Fedora Rawhide ASAP to look for compatibility issues. LGTM. Please keep my RB and push if you only make textual "Please fix:" changes indicated. Reviewed-by: Carlos O'Donell <carlos@redhat.com> > Checked on x86_64-linux-gnu and aarch64-linux-gnu. > > [1] https://github.com/rust-lang/rust/issues/126600 > [2] https://austingroupbugs.net/view.php?id=1845 > [3] https://www.openwall.com/lists/libc-coord/2024/07/24/4 > --- > stdlib/Makefile | 1 + > stdlib/exit.c | 8 ++ > stdlib/tst-concurrent-exit.c | 157 +++++++++++++++++++++++++++++++++++ > 3 files changed, 166 insertions(+) > create mode 100644 stdlib/tst-concurrent-exit.c > > diff --git a/stdlib/Makefile b/stdlib/Makefile > index 8b0ac63ddb..7eec68b73a 100644 > --- a/stdlib/Makefile > +++ b/stdlib/Makefile > @@ -273,6 +273,7 @@ tests := \ > tst-bsearch \ > tst-bz20544 \ > tst-canon-bz26341 \ > + tst-concurrent-exit \ OK. New test. > tst-cxa_atexit \ > tst-environ \ > tst-getrandom \ > diff --git a/stdlib/exit.c b/stdlib/exit.c > index 5166c78044..bbaf138806 100644 > --- a/stdlib/exit.c > +++ b/stdlib/exit.c > @@ -132,9 +132,17 @@ __run_exit_handlers (int status, struct exit_function_list **listp, > } > > > +/* The lock handles concurrent exit(), even though the C/POSIX standard states > + that calling exit() more than once is UB. The recursive lock allows > + atexit() handlers or destructors to call exit() itself. In this case, the > + handler list execution will resume at the point of the current handler. */ > +__libc_lock_define_initialized_recursive (static, __exit_lock) OK. Great comment. Using light-weight internal libc lock. > + > void > exit (int status) > { > + /* The exit should never return, so there is no need to unlock it. */ > + __libc_lock_lock_recursive (__exit_lock); OK. Take the recursive lock. > __run_exit_handlers (status, &__exit_funcs, true, true); > } > libc_hidden_def (exit) > diff --git a/stdlib/tst-concurrent-exit.c b/stdlib/tst-concurrent-exit.c > new file mode 100644 > index 0000000000..6cc9e32777 > --- /dev/null > +++ b/stdlib/tst-concurrent-exit.c > @@ -0,0 +1,157 @@ > +/* Check if exit can be called concurrently by multiple threads. OK. > + Copyright (C) 2024 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 <array_length.h> > +#include <stdlib.h> > +#include <support/check.h> > +#include <support/xthread.h> > +#include <stdio.h> > +#include <support/xunistd.h> > +#include <string.h> > + > +#define MAX_atexit 32 > + > +static pthread_barrier_t barrier; > + > +static void * > +tf (void *closure) > +{ > + xpthread_barrier_wait (&barrier); > + exit (0); > + > + return NULL; > +} > + > +static const char expected[] = "00000000000000000000000003021121130211"; OK. Reconstructed from first principles: "00000000000000000000000003021121130211F" Matches. With "F" denoting final (or initial atexit registration). Notes: - A 0 prints just 0. - A 1 prints just 1. - A 2 prints 2 and registers a 1. - A 3 prints 3 and registers a 2 and 0 If any thread runs the handlers in parallel we would expect to see the order change. > +static char crumbs[sizeof (expected)]; > +static int next_slot = 0; > + > +static void > +exit_with_flush (int code) > +{ > + fflush (stdout); > + /* glibc allows recursive exit, the atexit handlers execution will be > + resumed from the where the previous exit was interrrupted. */ Please fix: s/interrrupted/interrupted/g > + exit (code); OK. > +} > + > +/* Take some time, so another thread potentially issue exit. */ > +#define SETUP_NANOSLEEP \ > + if (nanosleep (&(struct timespec) { .tv_sec = 0, .tv_nsec = 1000L }, \ > + NULL) != 0) \ > + FAIL_EXIT1 ("nanosleep: %m") > + > +static void > +fn0 (void) > +{ > + crumbs[next_slot++] = '0'; OK. This does not need to be an atomic operation because exit() is now blocked from concurrent execution due to the recursive lock. Otherwise this would be a data race and trigger UB. This writes '0' into the crumbs. > + SETUP_NANOSLEEP; > +} > + > +static void > +fn1 (void) > +{ > + crumbs[next_slot++] = '1'; > + SETUP_NANOSLEEP; OK. Writes 1. > +} > + > +static void > +fn2 (void) > +{ > + crumbs[next_slot++] = '2'; > + atexit (fn1); OK. Write 2 and register fn1. > + SETUP_NANOSLEEP; > +} > + > +static void > +fn3 (void) > +{ > + crumbs[next_slot++] = '3'; > + atexit (fn2); > + atexit (fn0); > + SETUP_NANOSLEEP; OK. Write 3 and register fn2 and fn0. > +} > + > +static void > +fn_final (void) > +{ > + TEST_COMPARE_STRING (crumbs, expected); OK. This may set the recorded failure... > + exit_with_flush (0); > +} OK. ... this skips the error reporting but the shared mapping is inherited. > + > +_Noreturn static void > +child (void) > +{ > + enum { nthreads = 8 }; > + > + xpthread_barrier_init (&barrier, NULL, nthreads + 1); > + > + pthread_t thr[nthreads]; > + for (int i = 0; i < nthreads; i++) > + thr[i] = xpthread_create (NULL, tf, NULL); OK. Start 8 threads. > + > + xpthread_barrier_wait (&barrier); OK. Barrier allows all threads to continue. > + > + for (int i = 0; i < nthreads; i++) > + { > + pthread_join (thr[i], NULL); OK. We will reach exit(0); before this ever returns. > + /* It should not be reached, it means that thread did not exit for > + some reason. */ > + support_record_failure (); OK. It is an error to return from all joins because that means no thread called exit(0); > + } > + > + exit (2); OK. It is an error to return. > +} > + > +static int > +do_test (void) > +{ > + /* Register a large number of handler that will trigger a heap allocation > + for the handle state. On exit, each block will be freed after the > + handle is processed. */ > + int slots_remaining = MAX_atexit; > + > + /* Register this first so it can verify expected order of the rest. */ > + atexit (fn_final); --slots_remaining; OK. Last one. > + > + TEST_VERIFY_EXIT (atexit (fn1) == 0); --slots_remaining; > + TEST_VERIFY_EXIT (atexit (fn3) == 0); --slots_remaining; > + TEST_VERIFY_EXIT (atexit (fn1) == 0); --slots_remaining; > + TEST_VERIFY_EXIT (atexit (fn2) == 0); --slots_remaining; > + TEST_VERIFY_EXIT (atexit (fn1) == 0); --slots_remaining; > + TEST_VERIFY_EXIT (atexit (fn3) == 0); --slots_remaining; OK. Six registrations "312131" > + > + while (slots_remaining > 0) > + { > + TEST_VERIFY_EXIT (atexit (fn0) == 0); --slots_remaining; OK. Twenty-five registrations "0000000000000000000000000" > + } > + > + pid_t pid = xfork (); > + if (pid != 0) > + { > + int status; > + xwaitpid (pid, &status, 0); > + TEST_VERIFY (WIFEXITED (status)); > + } > + else > + child (); OK. We fork a child to do the exit. > + > + return 0; OK. Returns from the function and the recorded errors in the shared mapping override. > +} > + > +#include <support/test-driver.c>
diff --git a/stdlib/Makefile b/stdlib/Makefile index 8b0ac63ddb..7eec68b73a 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -273,6 +273,7 @@ tests := \ tst-bsearch \ tst-bz20544 \ tst-canon-bz26341 \ + tst-concurrent-exit \ tst-cxa_atexit \ tst-environ \ tst-getrandom \ diff --git a/stdlib/exit.c b/stdlib/exit.c index 5166c78044..bbaf138806 100644 --- a/stdlib/exit.c +++ b/stdlib/exit.c @@ -132,9 +132,17 @@ __run_exit_handlers (int status, struct exit_function_list **listp, } +/* The lock handles concurrent exit(), even though the C/POSIX standard states + that calling exit() more than once is UB. The recursive lock allows + atexit() handlers or destructors to call exit() itself. In this case, the + handler list execution will resume at the point of the current handler. */ +__libc_lock_define_initialized_recursive (static, __exit_lock) + void exit (int status) { + /* The exit should never return, so there is no need to unlock it. */ + __libc_lock_lock_recursive (__exit_lock); __run_exit_handlers (status, &__exit_funcs, true, true); } libc_hidden_def (exit) diff --git a/stdlib/tst-concurrent-exit.c b/stdlib/tst-concurrent-exit.c new file mode 100644 index 0000000000..6cc9e32777 --- /dev/null +++ b/stdlib/tst-concurrent-exit.c @@ -0,0 +1,157 @@ +/* Check if exit can be called concurrently by multiple threads. + Copyright (C) 2024 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 <array_length.h> +#include <stdlib.h> +#include <support/check.h> +#include <support/xthread.h> +#include <stdio.h> +#include <support/xunistd.h> +#include <string.h> + +#define MAX_atexit 32 + +static pthread_barrier_t barrier; + +static void * +tf (void *closure) +{ + xpthread_barrier_wait (&barrier); + exit (0); + + return NULL; +} + +static const char expected[] = "00000000000000000000000003021121130211"; +static char crumbs[sizeof (expected)]; +static int next_slot = 0; + +static void +exit_with_flush (int code) +{ + fflush (stdout); + /* glibc allows recursive exit, the atexit handlers execution will be + resumed from the where the previous exit was interrrupted. */ + exit (code); +} + +/* Take some time, so another thread potentially issue exit. */ +#define SETUP_NANOSLEEP \ + if (nanosleep (&(struct timespec) { .tv_sec = 0, .tv_nsec = 1000L }, \ + NULL) != 0) \ + FAIL_EXIT1 ("nanosleep: %m") + +static void +fn0 (void) +{ + crumbs[next_slot++] = '0'; + SETUP_NANOSLEEP; +} + +static void +fn1 (void) +{ + crumbs[next_slot++] = '1'; + SETUP_NANOSLEEP; +} + +static void +fn2 (void) +{ + crumbs[next_slot++] = '2'; + atexit (fn1); + SETUP_NANOSLEEP; +} + +static void +fn3 (void) +{ + crumbs[next_slot++] = '3'; + atexit (fn2); + atexit (fn0); + SETUP_NANOSLEEP; +} + +static void +fn_final (void) +{ + TEST_COMPARE_STRING (crumbs, expected); + exit_with_flush (0); +} + +_Noreturn static void +child (void) +{ + enum { nthreads = 8 }; + + xpthread_barrier_init (&barrier, NULL, nthreads + 1); + + pthread_t thr[nthreads]; + for (int i = 0; i < nthreads; i++) + thr[i] = xpthread_create (NULL, tf, NULL); + + xpthread_barrier_wait (&barrier); + + for (int i = 0; i < nthreads; i++) + { + pthread_join (thr[i], NULL); + /* It should not be reached, it means that thread did not exit for + some reason. */ + support_record_failure (); + } + + exit (2); +} + +static int +do_test (void) +{ + /* Register a large number of handler that will trigger a heap allocation + for the handle state. On exit, each block will be freed after the + handle is processed. */ + int slots_remaining = MAX_atexit; + + /* Register this first so it can verify expected order of the rest. */ + atexit (fn_final); --slots_remaining; + + TEST_VERIFY_EXIT (atexit (fn1) == 0); --slots_remaining; + TEST_VERIFY_EXIT (atexit (fn3) == 0); --slots_remaining; + TEST_VERIFY_EXIT (atexit (fn1) == 0); --slots_remaining; + TEST_VERIFY_EXIT (atexit (fn2) == 0); --slots_remaining; + TEST_VERIFY_EXIT (atexit (fn1) == 0); --slots_remaining; + TEST_VERIFY_EXIT (atexit (fn3) == 0); --slots_remaining; + + while (slots_remaining > 0) + { + TEST_VERIFY_EXIT (atexit (fn0) == 0); --slots_remaining; + } + + pid_t pid = xfork (); + if (pid != 0) + { + int status; + xwaitpid (pid, &status, 0); + TEST_VERIFY (WIFEXITED (status)); + } + else + child (); + + return 0; +} + +#include <support/test-driver.c>