Repository navigation
Conversation
…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.
|
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) |
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.
|
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. |
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; 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).Not covered:
zend_sigaction()already does for the signals it registers.kill()carry a fault code, so they are treated as faults.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 (first commit checked locally on 8.5, 8.6 and master, with and without zend signals; the second commit checked on master only, on macOS):
# 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.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().