#include <kernel-features.h>
#include <tls-internal-struct.h>
#include <sys/rseq.h>
+#include <internal-sigset.h>
#ifndef TCB_ALIGNMENT
# define TCB_ALIGNMENT 32
/* Signal mask for the new thread. Used during thread startup to
restore the signal mask. (Threads are launched with all signals
masked.) */
- sigset_t sigmask;
+ internal_sigset_t sigmask;
/* Indicates whether is a C11 thread created by thrd_creat. */
bool c11;
/* Filter out internal signals. */
struct pthread_attr *iattr = (struct pthread_attr *) attr;
- __clear_internal_signals (&iattr->extension->sigmask);
+ clear_internal_signals (&iattr->extension->sigmask);
return 0;
}
/* Store the new cleanup handler info. */
THREAD_SETMEM (pd, cleanup_jmp_buf, &unwind_buf);
- __libc_signal_restore_set (&pd->sigmask);
+ internal_signal_restore_set (&pd->sigmask);
LIBC_PROBE (pthread_start, 3, (pthread_t) pd, pd->start_routine, pd->arg);
signal to be delivered. (SIGSETXID cannot run application code,
nor does it use pthread_kill.) Reuse the pd->sigmask space for
computing the signal mask, to save stack space. */
- __sigfillset (&pd->sigmask);
- __sigdelset (&pd->sigmask, SIGSETXID);
+ internal_sigfillset (&pd->sigmask);
+ internal_sigdelset (&pd->sigmask, SIGSETXID);
INTERNAL_SYSCALL_CALL (rt_sigprocmask, SIG_BLOCK, &pd->sigmask, NULL,
__NSIG_BYTES);
/* Block all signals, so that the new thread starts out with
signals disabled. This avoids race conditions in the thread
startup. */
- sigset_t original_sigmask;
- __libc_signal_block_all (&original_sigmask);
+ internal_sigset_t original_sigmask;
+ internal_signal_block_all (&original_sigmask);
if (iattr->extension != NULL && iattr->extension->sigmask_set)
/* Use the signal mask in the attribute. The internal signals
have already been filtered by the public
pthread_attr_setsigmask_np interface. */
- pd->sigmask = iattr->extension->sigmask;
+ internal_sigset_from_sigset (&pd->sigmask, &iattr->extension->sigmask);
else
{
/* Conceptually, the new thread needs to inherit the signal mask
pd->sigmask = original_sigmask;
/* Reset the cancellation signal mask in case this thread is
running cancellation. */
- __sigdelset (&pd->sigmask, SIGCANCEL);
+ internal_sigdelset (&pd->sigmask, SIGCANCEL);
}
/* Start the thread. */
/* Return to the previous signal mask, after creating the new
thread. */
- __libc_signal_restore_set (&original_sigmask);
+ internal_signal_restore_set (&original_sigmask);
if (__glibc_unlikely (retval != 0))
{
}
/* Block all signals, as required by pd->exit_lock. */
- sigset_t old_mask;
- __libc_signal_block_all (&old_mask);
+ internal_sigset_t old_mask;
+ internal_signal_block_all (&old_mask);
__libc_lock_lock (pd->exit_lock);
int ret;
}
__libc_lock_unlock (pd->exit_lock);
- __libc_signal_restore_set (&old_mask);
+ internal_signal_restore_set (&old_mask);
return ret;
}
{
/* Disallow sending the signal we use for cancellation, timers,
for the setxid implementation. */
- if (__is_internal_signal (signo))
+ if (is_internal_signal (signo))
return EINVAL;
return __pthread_kill_internal (threadid, signo);
attribute_compat_text_section
__pthread_kill_esrch (pthread_t threadid, int signo)
{
- if (__is_internal_signal (signo))
+ if (is_internal_signal (signo))
return EINVAL;
return __pthread_kill_implementation (threadid, signo, ESRCH);
|| __glibc_unlikely (__sigismember (newmask, SIGSETXID))))
{
local_newmask = *newmask;
- __clear_internal_signals (&local_newmask);
+ clear_internal_signals (&local_newmask);
newmask = &local_newmask;
}
if (sigismember (&ss, sig))
{
TEST_VERIFY (sig != SIGKILL && sig != SIGSTOP);
- TEST_VERIFY (!__is_internal_signal (sig));
+ TEST_VERIFY (!is_internal_signal (sig));
}
if (test_verbose && sigismember (&ss, sig))
printf ("%d, ", sig);
int
__sigaction (int sig, const struct sigaction *act, struct sigaction *oact)
{
- if (sig <= 0 || sig >= NSIG || __is_internal_signal (sig))
+ if (sig <= 0 || sig >= NSIG || is_internal_signal (sig))
{
__set_errno (EINVAL);
return -1;
sigaddset (sigset_t *set, int signo)
{
if (set == NULL || signo <= 0 || signo >= NSIG
- || __is_internal_signal (signo))
+ || is_internal_signal (signo))
{
__set_errno (EINVAL);
return -1;
sigdelset (sigset_t *set, int signo)
{
if (set == NULL || signo <= 0 || signo >= NSIG
- || __is_internal_signal (signo))
+ || is_internal_signal (signo))
{
__set_errno (EINVAL);
return -1;
}
__sigfillset (set);
- __clear_internal_signals (set);
+ clear_internal_signals (set);
return 0;
}
libc_hidden_def (sigfillset)
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <sigsetops.h>
+#include <internal-signals.h>
/* Try to get a machine dependent instruction which will make the
program crash. This is used in case everything else fails. */
abort (void)
{
struct sigaction act;
- sigset_t sigs;
/* First acquire the lock. */
__libc_lock_lock_recursive (lock);
if (stage == 0)
{
++stage;
- __sigemptyset (&sigs);
- __sigaddset (&sigs, SIGABRT);
- __sigprocmask (SIG_UNBLOCK, &sigs, 0);
+ internal_sigset_t sigs;
+ internal_sigemptyset (&sigs);
+ internal_sigaddset (&sigs, SIGABRT);
+ internal_sigprocmask (SIG_UNBLOCK, &sigs, NULL);
}
/* Send signal which possibly calls a user handler. */
#define RESERVED_SIGRT 0
static inline bool
-__is_internal_signal (int sig)
+is_internal_signal (int sig)
{
return false;
}
static inline void
-__clear_internal_signals (sigset_t *set)
+clear_internal_signals (sigset_t *set)
{
}
-static inline void
-__libc_signal_block_all (sigset_t *set)
-{
- sigset_t allset;
- __sigfillset (&allset);
- __sigprocmask (SIG_BLOCK, &allset, set);
-}
-
-static inline void
-__libc_signal_block_app (sigset_t *set)
-{
- sigset_t allset;
- __sigfillset (&allset);
- __clear_internal_signals (&allset);
- __sigprocmask (SIG_BLOCK, &allset, set);
-}
-
-/* Restore current process signal mask. */
-static inline void
-__libc_signal_restore_set (const sigset_t *set)
-{
- __sigprocmask (SIG_SETMASK, set, NULL);
-}
+typedef sigset_t internal_sigset_t;
+#define internal_sigemptyset(__s) sigemptyset (__s)
+#define internal_sigaddset(__s, __i) sigaddset (__s, __i)
+#define internal_sigprocmask(__h, __s, __o) sigprocmask (__h, __s, __o)
#endif /* __INTERNAL_SIGNALS_H */
/* Check signal extents to protect __sigismember. */
if (handler == SIG_ERR || sig < 1 || sig >= NSIG
- || __is_internal_signal (sig))
+ || is_internal_signal (sig))
{
__set_errno (EINVAL);
return SIG_ERR;
if (env[0].__mask_was_saved)
/* Restore the saved signal mask. */
- __libc_signal_restore_set (&env[0].__saved_mask);
+ __sigprocmask (SIG_SETMASK, &env[0].__saved_mask, NULL);
/* Call the machine-dependent function to restore machine state. */
__sigstack_longjmp (env[0].__jmpbuf, val ?: 1);
#ifndef __INTERNAL_SIGNALS_H
# define __INTERNAL_SIGNALS_H
+#include <internal-sigset.h>
+#include <limits.h>
#include <signal.h>
#include <sigsetops.h>
#include <stdbool.h>
-#include <limits.h>
#include <stddef.h>
#include <sysdep.h>
/* Return is sig is used internally. */
static inline bool
-__is_internal_signal (int sig)
+is_internal_signal (int sig)
{
return (sig == SIGCANCEL) || (sig == SIGSETXID);
}
/* Remove internal glibc signal from the mask. */
static inline void
-__clear_internal_signals (sigset_t *set)
+clear_internal_signals (sigset_t *set)
{
__sigdelset (set, SIGCANCEL);
__sigdelset (set, SIGSETXID);
}
-static const sigset_t sigall_set = {
- .__val = {[0 ... _SIGSET_NWORDS-1 ] = -1 }
-};
-
-static const sigset_t sigtimer_set = {
- .__val = { [0] = __sigmask (SIGTIMER),
- [1 ... _SIGSET_NWORDS-1] = 0 }
+static const internal_sigset_t sigall_set = {
+ .__val = {[0 ... __NSIG_WORDS-1 ] = -1 }
};
-/* Block all signals, including internal glibc ones. */
-static inline void
-__libc_signal_block_all (sigset_t *set)
+/* Obtain and change blocked signals, including internal glibc ones. */
+static inline int
+internal_sigprocmask (int how, const internal_sigset_t *set,
+ internal_sigset_t *oldset)
{
- INTERNAL_SYSCALL_CALL (rt_sigprocmask, SIG_BLOCK, &sigall_set, set,
- __NSIG_BYTES);
+ return INTERNAL_SYSCALL_CALL (rt_sigprocmask, how, set, oldset,
+ __NSIG_BYTES);
}
-/* Block all application signals (excluding internal glibc ones). */
+/* Block all signals, including internal glibc ones. */
static inline void
-__libc_signal_block_app (sigset_t *set)
+internal_signal_block_all (internal_sigset_t *oset)
{
- sigset_t allset = sigall_set;
- __clear_internal_signals (&allset);
- INTERNAL_SYSCALL_CALL (rt_sigprocmask, SIG_BLOCK, &allset, set,
+ INTERNAL_SYSCALL_CALL (rt_sigprocmask, SIG_BLOCK, &sigall_set, oset,
__NSIG_BYTES);
}
-/* Block only SIGTIMER and return the previous set on SET. */
+/* Restore current process signal mask. */
static inline void
-__libc_signal_block_sigtimer (sigset_t *set)
+internal_signal_restore_set (const internal_sigset_t *set)
{
- INTERNAL_SYSCALL_CALL (rt_sigprocmask, SIG_BLOCK, &sigtimer_set, set,
+ INTERNAL_SYSCALL_CALL (rt_sigprocmask, SIG_SETMASK, set, NULL,
__NSIG_BYTES);
}
-/* Unblock only SIGTIMER and return the previous set on SET. */
-static inline void
-__libc_signal_unblock_sigtimer (sigset_t *set)
-{
- INTERNAL_SYSCALL_CALL (rt_sigprocmask, SIG_UNBLOCK, &sigtimer_set, set,
- __NSIG_BYTES);
-}
-/* Restore current process signal mask. */
+/* It is used on timer_create code directly on sigwaitinfo call, so it can not
+ use the internal_sigset_t definitions. */
+static const sigset_t sigtimer_set = {
+ .__val = { [0] = __sigmask (SIGTIMER),
+ [1 ... _SIGSET_NWORDS-1] = 0
+ }
+};
+
+/* Unblock only SIGTIMER. */
static inline void
-__libc_signal_restore_set (const sigset_t *set)
+signal_unblock_sigtimer (void)
{
- INTERNAL_SYSCALL_CALL (rt_sigprocmask, SIG_SETMASK, set, NULL,
+ INTERNAL_SYSCALL_CALL (rt_sigprocmask, SIG_UNBLOCK, &sigtimer_set, NULL,
__NSIG_BYTES);
}
+
#endif
--- /dev/null
+/* Internal sigset_t definition.
+ Copyright (C) 2022 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/>. */
+
+#ifndef _INTERNAL_SIGSET_H
+#define _INTERNAL_SIGSET_H
+
+#include <sigsetops.h>
+
+typedef struct
+{
+ unsigned long int __val[__NSIG_WORDS];
+} internal_sigset_t;
+
+static inline void
+internal_sigset_from_sigset (internal_sigset_t *iset, const sigset_t *set)
+{
+ int cnt = __NSIG_WORDS;
+ while (--cnt >= 0)
+ iset->__val[cnt] = set->__val[cnt];
+}
+
+static inline void
+internal_sigemptyset (internal_sigset_t *set)
+{
+ int cnt = __NSIG_WORDS;
+ while (--cnt >= 0)
+ set->__val[cnt] = 0;
+}
+
+static inline void
+internal_sigfillset (internal_sigset_t *set)
+{
+ int cnt = __NSIG_WORDS;
+ while (--cnt >= 0)
+ set->__val[cnt] = ~0UL;
+}
+
+static inline int
+internal_sigisemptyset (const internal_sigset_t *set)
+{
+ int cnt = __NSIG_WORDS;
+ int ret = set->__val[--cnt];
+ while (ret == 0 && --cnt >= 0)
+ ret = set->__val[cnt];
+ return ret == 0;
+}
+
+static inline void
+internal_sigandset (internal_sigset_t *dest, const internal_sigset_t *left,
+ const internal_sigset_t *right)
+{
+ int cnt = __NSIG_WORDS;
+ while (--cnt >= 0)
+ dest->__val[cnt] = left->__val[cnt] & right->__val[cnt];
+}
+
+static inline void
+internal_sigorset (internal_sigset_t *dest, const internal_sigset_t *left,
+ const internal_sigset_t *right)
+{
+ int cnt = __NSIG_WORDS;
+ while (--cnt >= 0)
+ dest->__val[cnt] = left->__val[cnt] | right->__val[cnt];
+}
+
+static inline int
+internal_sigismember (const internal_sigset_t *set, int sig)
+{
+ unsigned long int mask = __sigmask (sig);
+ unsigned long int word = __sigword (sig);
+ return set->__val[word] & mask ? 1 : 0;
+}
+
+static inline void
+internal_sigaddset (internal_sigset_t *set, int sig)
+{
+ unsigned long int mask = __sigmask (sig);
+ unsigned long int word = __sigword (sig);
+ set->__val[word] |= mask;
+}
+
+static inline void
+internal_sigdelset (internal_sigset_t *set, int sig)
+{
+ unsigned long int mask = __sigmask (sig);
+ unsigned long int word = __sigword (sig);
+ set->__val[word] &= ~mask;
+}
+
+#endif /* _INTERNAL_SIGSET_H */
struct posix_spawn_args
{
- sigset_t oldmask;
+ internal_sigset_t oldmask;
const char *file;
int (*exec) (const char *, char *const *, char *const *);
const posix_spawn_file_actions_t *fa;
}
else if (__sigismember (&hset, sig))
{
- if (__is_internal_signal (sig))
+ if (is_internal_signal (sig))
sa.sa_handler = SIG_IGN;
else
{
/* Set the initial signal mask of the child if POSIX_SPAWN_SETSIGMASK
is set, otherwise restore the previous one. */
- __sigprocmask (SIG_SETMASK, (attr->__flags & POSIX_SPAWN_SETSIGMASK)
- ? &attr->__ss : &args->oldmask, 0);
+ if (attr->__flags & POSIX_SPAWN_SETSIGMASK)
+ __sigprocmask (SIG_SETMASK, &attr->__ss, NULL);
+ else
+ internal_sigprocmask (SIG_SETMASK, &args->oldmask, NULL);
args->exec (args->file, args->argv, args->envp);
args.envp = envp;
args.xflags = xflags;
- __libc_signal_block_all (&args.oldmask);
+ internal_signal_block_all (&args.oldmask);
/* The clone flags used will create a new child that will run in the same
memory space (CLONE_VM) and the execution of calling thread will be
if ((ec == 0) && (pid != NULL))
*pid = new_pid;
- __libc_signal_restore_set (&args.oldmask);
+ internal_signal_restore_set (&args.oldmask);
__pthread_setcancelstate (state, NULL);
static void *
timer_sigev_thread (void *arg)
{
- __libc_signal_unblock_sigtimer (NULL);
+ signal_unblock_sigtimer ();
struct thread_start_data *td = (struct thread_start_data *) arg;
void (*thrfunc) (sigval_t) = td->thrfunc;
projects / thirdparty / glibc.git / commitdiff
