mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-28 00:21:52 +03:00
linux: Consolidate sigaction implementation
This patch consolidates all Linux sigaction implementations on the default
sysdeps/unix/sysv/linux/sigaction.c. The idea is remove redundant code
and simplify new ports addition by following the current generic
Linux User API (UAPI).
The UAPI for new ports defines a generic extensible sigaction struct as:
struct sigaction
{
__sighandler_t sa_handler;
unsigned long sa_flags;
#ifdef SA_RESTORER
void (*sa_restorer) (void);
#endif
sigset_t sa_mask;
};
Where SA_RESTORER is just placed for compatibility reasons (news ports
should not add it). A similar definition is used on generic
kernel_sigaction.h.
The user exported sigaction definition is not changed, so for most
architectures it requires an adjustment to kernel expected one for the
syscall.
The main changes are:
- All architectures now define and use a kernel_sigaction struct meant
for the syscall, even for the architectures where the user sigaction
has the same layout of the kernel expected one (s390-64 and ia64).
Although it requires more work for these architectures, it simplifies
the generic implementation. Also, sigaction is hardly a hotspot where
micro optimization would play an important role.
- The generic kernel_sigaction definition is now aligned with expected
UAPI one for newer ports, where SA_RESTORER and sa_restorer are not
expected to be defined. This means adding kernel_sigaction for
current architectures that does define it (m68k, nios2, powerpc, s390,
sh, sparc, and tile) and which rely on previous generic definition.
- Remove old MIPS usage of sa_restorer. This was removed since 2.6.27
(2957c9e61ee9c - "[MIPS] IRIX: Goodbye and thanks for all the fish").
- The remaining arch-specific sigaction.c are to handle ABI idiosyncrasies
(like SPARC kernel ABI for rt_sigaction that requires an additional
stub argument).
So for new ports the generic implementation should work if its uses
Linux UAPI. If SA_RESTORER is still required (due some architecture
limitation), it should define its own kernel_sigaction.h, define it and
include generic header (assuming it still uses the default generic kernel
layout).
Checked on x86_64-linux-gnu, i686-linux-gnu, arm-linux-gnueabihf,
aarch64-linux-gnu, sparc64-linux-gnu, sparcv9-linux-gnu, powerpc-linux-gnu,
powerpc64-linux-gnu, ia64-linux-gnu and alpha-linux-gnu. I also checked the
build on all remaining affected ABIs.
* sysdeps/unix/sysv/linux/aarch64/sigaction.c: Use default Linux version
as base implementation.
* sysdeps/unix/sysv/linux/arm/sigaction.c: Likewise.
* sysdeps/unix/sysv/linux/i386/sigaction.c: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc32/sigaction.c: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/sigaction.c: Likewise.
* sysdeps/unix/sysv/linux/x86_64/sigaction.c: Likewise.
* sysdeps/unix/sysv/linux/alpha/kernel_sigaction.h: Add include guards,
remove unrequired definitions and update comments.
* sysdeps/unix/sysv/linux/kernel_sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/mips/kernel_sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/ia64/kernel_sigaction.h: New file.
* sysdeps/unix/sysv/linux/m68k/kernel_sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/nios2/kernel_sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/powerpc/kernel_sigaction: Likewise.
* sysdeps/unix/sysv/linux/s390/kernel_sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/sh/kernel_sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/sparc/kernel_sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/tile/kernel_sigaction.h: Likewise.
* sysdeps/unix/sysv/linux/ia64/sigaction.c: Remove file.
* sysdeps/unix/sysv/linux/mips/sigaction.c: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/sigaction.c: Likewise.
* sysdeps/unix/sysv/linux/sigaction.c: Add STUB, SET_SA_RESTORER,
and RESET_SA_RESTORER hooks.
This commit is contained in:
Adhemerval Zanella
10
sysdeps/unix/sysv/linux/sparc/kernel_sigaction.h
Normal file
10
sysdeps/unix/sysv/linux/sparc/kernel_sigaction.h
Normal file
@ -0,0 +1,10 @@
|
||||
/* SPARC 'struct __new_sigaction' is similar to generic Linux UAPI with
|
||||
a sa_restorer field, even though function is passed as an argument
|
||||
to rt_sigaction syscall. */
|
||||
#define SA_RESTORER 0x04000000
|
||||
#include <sysdeps/unix/sysv/linux/kernel_sigaction.h>
|
||||
|
||||
#define SET_SA_RESTORER(kact, act) \
|
||||
(kact)->sa_restorer = NULL
|
||||
#define RESET_SA_RESTORER(act, kact) \
|
||||
(act)->sa_restorer = (kact)->sa_restorer
|
||||
@ -27,43 +27,13 @@
|
||||
static void __rt_sigreturn_stub (void);
|
||||
static void __sigreturn_stub (void);
|
||||
|
||||
int
|
||||
__libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oact)
|
||||
{
|
||||
struct kernel_sigaction kact, koact;
|
||||
unsigned long stub = 0;
|
||||
int ret;
|
||||
|
||||
if (act)
|
||||
{
|
||||
kact.k_sa_handler = act->sa_handler;
|
||||
memcpy (&kact.sa_mask, &act->sa_mask, sizeof (sigset_t));
|
||||
if (((kact.sa_flags = act->sa_flags) & SA_SIGINFO) != 0)
|
||||
stub = (unsigned long) &__rt_sigreturn_stub;
|
||||
else
|
||||
stub = (unsigned long) &__sigreturn_stub;
|
||||
stub -= 8;
|
||||
kact.sa_restorer = NULL;
|
||||
}
|
||||
|
||||
/* XXX The size argument hopefully will have to be changed to the
|
||||
real size of the user-level sigset_t. */
|
||||
ret = INLINE_SYSCALL (rt_sigaction, 5, sig, act ? &kact : 0,
|
||||
oact ? &koact : 0, stub, _NSIG / 8);
|
||||
|
||||
if (oact && ret >= 0)
|
||||
{
|
||||
oact->sa_handler = koact.k_sa_handler;
|
||||
memcpy (&oact->sa_mask, &koact.sa_mask, sizeof (sigset_t));
|
||||
oact->sa_flags = koact.sa_flags;
|
||||
oact->sa_restorer = koact.sa_restorer;
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
libc_hidden_def (__libc_sigaction)
|
||||
|
||||
#include <nptl/sigaction.c>
|
||||
#define STUB(act) \
|
||||
(act) ? ((unsigned long)((act->sa_flags & SA_SIGINFO) \
|
||||
? &__rt_sigreturn_stub \
|
||||
: &__sigreturn_stub) - 8) \
|
||||
: 0,
|
||||
|
||||
#include <sysdeps/unix/sysv/linux/sigaction.c>
|
||||
|
||||
static
|
||||
inhibit_stack_protector
|
||||
|
||||
@ -21,50 +21,13 @@
|
||||
#include <string.h>
|
||||
#include <syscall.h>
|
||||
#include <sysdep.h>
|
||||
#include <sys/signal.h>
|
||||
#include <errno.h>
|
||||
|
||||
#include <kernel_sigaction.h>
|
||||
|
||||
/* SPARC 64bit userland requires a kernel that has rt signals anyway. */
|
||||
|
||||
static void __rt_sigreturn_stub (void);
|
||||
|
||||
int
|
||||
__libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oact)
|
||||
{
|
||||
int ret;
|
||||
struct kernel_sigaction kact, koact;
|
||||
unsigned long stub = ((unsigned long) &__rt_sigreturn_stub) - 8;
|
||||
|
||||
if (act)
|
||||
{
|
||||
kact.k_sa_handler = act->sa_handler;
|
||||
memcpy (&kact.sa_mask, &act->sa_mask, sizeof (sigset_t));
|
||||
kact.sa_flags = act->sa_flags;
|
||||
kact.sa_restorer = NULL;
|
||||
}
|
||||
|
||||
/* XXX The size argument hopefully will have to be changed to the
|
||||
real size of the user-level sigset_t. */
|
||||
ret = INLINE_SYSCALL (rt_sigaction, 5, sig,
|
||||
act ? &kact : 0,
|
||||
oact ? &koact : 0, stub, _NSIG / 8);
|
||||
|
||||
if (oact && ret >= 0)
|
||||
{
|
||||
oact->sa_handler = koact.k_sa_handler;
|
||||
memcpy (&oact->sa_mask, &koact.sa_mask, sizeof (sigset_t));
|
||||
oact->sa_flags = koact.sa_flags;
|
||||
oact->sa_restorer = koact.sa_restorer;
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
libc_hidden_def (__libc_sigaction)
|
||||
|
||||
#include <nptl/sigaction.c>
|
||||
#define STUB(act) \
|
||||
(((unsigned long) &__rt_sigreturn_stub) - 8),
|
||||
|
||||
#include <sysdeps/unix/sysv/linux/sigaction.c>
|
||||
|
||||
static
|
||||
inhibit_stack_protector
|
||||
|
||||
Reference in New Issue
Block a user