mirror of
git://sourceware.org/git/glibc.git
synced 2025-03-06 20:58:33 +01:00
653d74f12a
This adds _hurd_sigstate_set_global_rcv used by libpthread to enable
POSIX-confirming behavior of signals on a per-thread basis.
This also provides a sigstate destructor _hurd_sigstate_delete, and a
global process signal state, which needs to be locked and check when
global disposition is enabled, thus the addition of _hurd_sigstate_lock
_hurd_sigstate_actions _hurd_sigstate_pending _hurd_sigstate_unlock helpers.
This also updates all the glibc code accordingly.
This also drops support for get_int(INIT_SIGMASK), which did not make sense
any more since we do not have a single signal thread any more.
During fork/spawn, this also reinitializes the child global sigstate's
lock. That cures an issue that would very rarely cause a deadlock in the
child in fork, tries to unlock ss' critical section lock at the end of
fork. This will typically (always?) be observed in /bin/sh, which is not
surprising as that is the foremost caller of fork.
To reproduce an intermediate state, add an endless loop if
_hurd_global_sigstate is locked after __proc_dostop (cast through
volatile); that is, while still being in the fork's parent process.
When that triggers (use the libtool testsuite), the signal thread has
already locked ss (which is _hurd_global_sigstate), and is stuck at
hurdsig.c:685 in post_signal, trying to lock _hurd_siglock (which the
main thread already has locked and keeps locked until after
__task_create). This is the case that ss->thread == MACH_PORT_NULL, that
is, a global signal. In the main thread, between __proc_dostop and
__task_create is the __thread_abort call on the signal thread which would
abort any current kernel operation (but leave ss locked). Later in fork,
in the parent, when _hurd_siglock is unlocked in fork, the parent's
signal thread can proceed and will unlock eventually the global sigstate.
In the client, _hurd_siglock will likewise be unlocked, but the global
sigstate never will be, as the client's signal thread has been configured
to restart execution from _hurd_msgport_receive. Thus, when the child
tries to unlock ss' critical section lock at the end of fork, it will
first lock the global sigstate, will spin trying to lock it, which can
never be successful, and we get our deadlock.
Options seem to be:
* Move the locking of _hurd_siglock earlier in post_signal -- but that
may generally impact performance, if this locking isn't generally
needed anyway?
On the other hand, would it actually make sense to wait here until we
are not any longer in a critical section (which is meant to disable
signal delivery anyway (but not for preempted signals?))?
* Clear the global sigstate in the fork's child with the rationale that
we're anyway restarting the signal thread from a clean state. This
has now been implemented.
Why has this problem not been observed before Jérémie's patches? (Or has
it? Perhaps even more rarely?) In _S_msg_sig_post, the signal is now
posted to a *global receiver thread*, whereas previously it was posted to
the *designated signal-receiving thread*. The latter one was in a
critical section in fork, so didn't try to handle the signal until after
leaving the critical section? (Not completely analyzed and verified.)
Another question is what the signal is that is being received
during/around the time __proc_dostop executes.
83 lines
2.6 KiB
C
83 lines
2.6 KiB
C
/* _hurd_ctty_input -- Do an input RPC and generate SIGTTIN if necessary.
|
|
Copyright (C) 1995-2019 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 <hurd.h>
|
|
#include <hurd/signal.h>
|
|
|
|
/* Call *RPC on PORT and/or CTTY. If a call on CTTY returns EBACKGROUND,
|
|
generate SIGTTIN or EIO as appropriate. */
|
|
|
|
error_t
|
|
_hurd_ctty_input (io_t port, io_t ctty, error_t (*rpc) (io_t))
|
|
{
|
|
error_t err;
|
|
|
|
if (ctty == MACH_PORT_NULL)
|
|
return (*rpc) (port);
|
|
|
|
do
|
|
{
|
|
err = (*rpc) (ctty);
|
|
if (err == EBACKGROUND)
|
|
{
|
|
/* We are a background job and tried to read from the tty.
|
|
We should probably get a SIGTTIN signal. */
|
|
if (_hurd_orphaned)
|
|
/* Our process group is orphaned. Don't stop; just fail. */
|
|
err = EIO;
|
|
else
|
|
{
|
|
struct hurd_sigstate *ss = _hurd_self_sigstate ();
|
|
struct sigaction *actions;
|
|
|
|
_hurd_sigstate_lock (ss);
|
|
actions = _hurd_sigstate_actions (ss);
|
|
if (__sigismember (&ss->blocked, SIGTTIN)
|
|
|| actions[SIGTTIN].sa_handler == SIG_IGN)
|
|
/* We are blocking or ignoring SIGTTIN. Just fail. */
|
|
err = EIO;
|
|
_hurd_sigstate_unlock (ss);
|
|
|
|
if (err == EBACKGROUND)
|
|
{
|
|
/* Send a SIGTTIN signal to our process group.
|
|
|
|
We must remember here not to clobber ERR, since
|
|
the loop condition below uses it to recall that
|
|
we should retry after a stop. */
|
|
|
|
__USEPORT (CTTYID, _hurd_sig_post (0, SIGTTIN, port));
|
|
/* XXX what to do if error here? */
|
|
|
|
/* At this point we should have just run the handler for
|
|
SIGTTIN or resumed after being stopped. Now this is
|
|
still a "system call", so check to see if we should
|
|
restart it. */
|
|
_hurd_sigstate_lock (ss);
|
|
actions = _hurd_sigstate_actions (ss);
|
|
if (!(actions[SIGTTIN].sa_flags & SA_RESTART))
|
|
err = EINTR;
|
|
_hurd_sigstate_unlock (ss);
|
|
}
|
|
}
|
|
}
|
|
/* If the last RPC generated a SIGTTIN, loop to try it again. */
|
|
} while (err == EBACKGROUND);
|
|
|
|
return err;
|
|
}
|