Repository navigation
Conversation
|
I do not feel particularly confident overall, can this test be tried ? --TEST--
GH-25541 (Signal whose handler was removed keeps its default action on a thread that never ran PHP)
--EXTENSIONS--
pcntl
posix
zend_test
--SKIPIF--
<?php
if (!function_exists('zend_test_start_foreign_thread')) die('skip ZTS only');
?>
--FILE--
<?php
$pid = pcntl_fork();
if ($pid === 0) {
pcntl_signal(SIGUSR1, function () {});
pcntl_signal(SIGUSR1, SIG_DFL);
zend_test_start_foreign_thread();
/* The PHP thread blocks the signal, so the kernel picks the other thread. */
pcntl_sigprocmask(SIG_BLOCK, [SIGUSR1]);
posix_kill(posix_getpid(), SIGUSR1);
usleep(500000);
echo "child survived", PHP_EOL;
exit(0);
}
pcntl_waitpid($pid, $status);
var_dump(pcntl_wifsignaled($status));
var_dump(pcntl_wifsignaled($status) && pcntl_wtermsig($status) === SIGUSR1);
?>
--EXPECT--
bool(true)
bool(true) |
|
Thanks, your doubt was justified: the test found a real regression. I ran it three times per build, on stock 8.4 and on this branch, with and without zend signals:
Fixed in 9e158b5. The flag is now a count of PHP threads whose handler is neither I added your test unchanged except for the macOS skip, with With the fix, the five gh25541 tests pass 5/5 on glibc, musl and FreeBSD in both modes, and ext/pcntl, ext/posix, ext/zend_test and Zend/tests show no new failures. |
|
It seems better, however it probably needs noticeably more work. I ll get back to in the following days. |
|
Thanks, take your time. In the meantime I've added one commit here, 351719a, after a review of the range. It fixes a crash that already exists on 8.4. Say the embedder installed an |
The re-routing, e.g. a handled SIGABRT sent with kill() is taken for abort(). zend_signal_is_synchronous() compares si_pid with getpid(), which is also true for the signal the re-route sends. To keep an eye on for master however. |
…ls the process Under ZTS, a process signal can be delivered to a thread that has no TSRM storage, e.g. a Go runtime thread in FrankenPHP or any thread an embedder creates. pcntl_signal_handler() then read PCNTL_G() through a NULL pointer (--disable-zend-signals), and zend_signal_handler_defer() fell back to the original disposition, so SIG_DFL killed the process although the script registered a handler. On such a thread, for a signal PHP handles, add the signal to the mask saved in the interrupted context and send it to the process again. The kernel delivers it to a thread that does not block it, which converges on a PHP thread. Threads unblock re-routed signals when they start a request. Faults and abort() keep their default action on the thread they hit. Re-routing is enabled on Linux, macOS and FreeBSD, where it was verified.
A signal whose handler was set back to SIG_DFL kept being sent on from a thread that never ran PHP. If every PHP thread blocked it, the signal stayed pending instead of taking its default action. Count the PHP threads whose handler is neither SIG_DFL nor SIG_IGN, and only re-route while that count is positive. The count follows every write to a thread's handlers and drops when a thread's storage is freed. zend_test_start_foreign_thread() starts a thread that never runs PHP and stays alive, so a test can block the signal on the PHP thread only.
On a thread without TSRM, or after TSRM shutdown, zend_signal_handler() calls the handler that was installed before PHP started. When that handler has SA_RESETHAND, it then wrote to SIGG(handlers), which such a thread has no storage for, and crashed. It also decremented the count of PHP threads handling the signal, although that thread was never counted. Only reset the entry when it comes from this thread's SIGG(handlers). macOS does not report SA_RESETHAND back from sigaction(), so it was not affected.
zend_signal_is_synchronous() took a SIGABRT whose sender is this process for abort(). That is also true of kill(getpid(), SIGABRT) from a script, and of the signal the re-route itself sends, so with a pcntl handler set: - a SIGABRT the process sends itself, received by a thread without TSRM, killed the process (zend signals) or was dropped (without); - a SIGABRT from another process, re-sent by one such thread and received by a second one, did the same. abort() needs no exception: when a handler returns, it restores the default action and raises SIGABRT again, also when the handler left it blocked in uc_sigmask (measured on glibc, musl and macOS). macOS can't tell kill() from raise() within a process anyway.
351719a to
c2b07bd
Compare
|
You're right, thanks. I measured it before changing anything. What
So on macOS, Is the exception needed? No. When a handler returns, Reproducers (3 runs each, ZTS debug; stock measured on glibc and musl, the rest on glibc, musl and FreeBSD, all the same):
With a single foreign thread, the second case passes on the PR before the fix. With two, the second one receives the signal the first one re-sent, so the re-route itself caused that failure, as you said. Fixed in c2b07bd: The 8 gh25541 tests pass 3/3 on glibc, musl and FreeBSD, with and without zend signals. The 4 that run on macOS pass there in both modes; the others need per-thread About #25627 for master: if it lands, |
The previous commit re-routed every SIGABRT. When the handler leaves SIGABRT blocked on the thread that called abort(), glibc 2.39 and older can't raise it again and the process ends with another signal (SIGTRAP on aarch64, measured on glibc 2.35, 2.36 and 2.39). Count SIGABRT as abort() again when it was sent to this thread: SI_TKILL on Linux, SI_LWP on FreeBSD. kill(), including the re-route's own, reports SI_USER, so it is still re-routed. macOS reports both alike, and its abort() still ends with SIGABRT, so SIGABRT is re-routed there. Also poll pcntl_signal_dispatch() in the tests that block the signal, and skip the other foreign-thread helpers in arginfo_zpp_mismatch.inc.
|
Correction to my last comment: Fixed in d0984a2: SIGABRT counts as Also from a review of the range: the tests that block the signal now poll The 8 gh25541 tests pass 3/3 with and without zend signals on glibc 2.39, glibc 2.41, musl and FreeBSD 15.1. The 4 that run on macOS pass there in both modes. ext/pcntl, ext/posix, ext/zend_test and Zend/tests fail only the tests that already fail without this PR in those environments. |
Under ZTS, the kernel may deliver a process signal to any thread that does not block it, including threads that never ran PHP and have no TSRM storage. Examples are the Go runtime threads in FrankenPHP, or any thread an embedding application creates. When that happens:
--disable-zend-signals,pcntl_signal_handler()readsPCNTL_G()through a NULL TSRM pointer and crashes;zend_signal_handler_defer()falls back to the original disposition, soSIG_DFLkills the process even though the script registered a pcntl handler.Reproducer (ZTS, with the new zend_test hook):
pcntl_signal(SIGUSR1, fn() => print "ok\n"); zend_test_raise_on_foreign_thread(SIGUSR1); pcntl_signal_dispatch();. On a stock 8.4 build, the process dies from SIGUSR1, or crashes with--disable-zend-signals.Fix: on a thread without TSRM, for a signal that at least one PHP thread still handles (neither
SIG_DFLnorSIG_IGN) and the embedder does not, the handler adds the signal to the mask saved in itsucontext(so the thread blocks it aftersigreturn) and sends it to the process again withkill(getpid(), signo). The kernel then delivers it to a thread that does not block it, and foreign threads stop taking it after the first time, so it ends up on a PHP thread. A thread unblocks re-routed signals when it starts a request, which covers threads created by a masked thread. Faults andabort()keep their default action on the thread they hit; SIGABRT counts asabort()when it was sent to that thread (SI_TKILLon Linux,SI_LWPon FreeBSD), so a SIGABRT sent withkill()is re-routed. Signals with no PHP handler, or handled by the embedder, keep the original disposition, as before. A per-signal count of PHP threads with a handler followszend_sigaction(), request start and thread exit, so a handler set back toSIG_DFLstops the re-routing. There's no new thread and no lock. Re-routing is enabled on Linux, macOS and FreeBSD, where I measured it (glibc and musl, arm64 and amd64; macOS arm64; FreeBSD 15.1 arm64).It also fixes a crash that already exists on 8.4: if the embedder installed an
SA_SIGINFO | SA_RESETHANDhandler before PHP started, a signal on a thread without TSRM ran that handler and then wrote toSIGG(handlers), which that thread has no storage for. With a pcntl handler for the same signal, this segfaults on stock 8.4 (measured on glibc, and with this PR's earlier commits on musl and FreeBSD). macOS doesn't reportSA_RESETHANDback fromsigaction(), so it isn't affected.Not covered:
zend_sigaction()already does for the signals it registers.kill()carry a fault code, so they are treated as faults. SIGABRT fromabort()can't be told apart from one sent withkill()there, so it is re-routed;abort()still ends the process with SIGABRT.GH-25548 (the execution timer) is a separate PR on top of this one.
Questions for reviewers:
ZEND_APIfunctions on 8.4 so pcntl can use them without zend signals. Is that OK on a stable branch, or should pcntl keep its own copy?Merge-up notes (this PR and #25581 merged up locally through 8.5, 8.6 and master, built with and without zend signals on macOS arm64 and Linux glibc; the GH-25541/GH-25548 tests, ext/pcntl, ext/posix, ext/zend_test and Zend/tests pass on each; the SIGABRT commit was only checked for conflicts there, and adds none):
# ifdef HAVE_STRUCT_SIGINFO_T/# endifaround the re-route inpcntl_signal_handler(), since ext/pcntl simplification. #13975 removed that macro. Otherwise it still compiles, but signals are dropped with--disable-zend-signals, which no CI job builds.ext/zend_test/test.cconflicts on the includes (keep both sides;<signal.h>is already included there), and the zend_test arginfo headers needbuild/gen_stub.php.Zend/zend_signal.c,zend_atomic_bool/zend_atomic_intbecomeatomic_bool/atomic_int,zend_atomic_*_load_ex()/_store_ex()becomeatomic_load()/atomic_store(), andzend_atomic_int_compare_exchange_ex()becomesatomic_compare_exchange_strong();zend_signal_startup()passeszend_signal_globals_dtortots_allocate_tls_id().Zend/zend_signal.cis gone, but pcntl andzend_activate()still needzend_signal_is_synchronous(),zend_signal_reroute_from_foreign_thread()andzend_signal_unblock_rerouted(), which don't depend on zend signals. They move to a file that stays.