s390: Add support for new syscalls/TIF_RESTORE_SIGMASK.
PATCH 2/4 s390: Add support for new syscalls/TIF_RESTORE_SIGMASK.
From: Heiko Carstens <[email protected]>
Add support for the new *at, pselect6 and ppoll system calls. This includes adding required support for TIF_RESTORE_SIGMASK.
Signed-off-by Heiko Carstens <[email protected]>
---
arch/s390/kernel/compat_signal.c | 100 +++++--------------------- arch/s390/kernel/compat_wrapper.S | 137 ++++++++++++++++++++++++++++++++++- arch/s390/kernel/entry.S | 51 +++---------- arch/s390/kernel/entry64.S | 75 +++---------------- arch/s390/kernel/signal.c | 146 ++++++++++++++++++-------------------- arch/s390/kernel/syscalls.S | 22 ++++- include/asm-s390/thread_info.h | 6 - include/asm-s390/unistd.h | 24 +++++- 8 files changed, 296 insertions(+), 265 deletions(-)
arch/s390/kernel/compat_signal.c +22 -78
@@ -1,8 +1,7 @@/* -* arch/s390/kernel/signal32.c +* arch/s390/kernel/compat_signal.c * -* S390 version -* Copyright (C) 2000 IBM Deutschland Entwicklung GmbH, IBM Corporation +* Copyright (C) IBM Corp. 2000,2006 * Author(s): Denis Joseph Barrow ([email protected],[email protected]) * Gerhard Tonn ([email protected]) *
@@ -52,8 +51,6 @@ typedef structstruct ucontext32 uc; } rt_sigframe32; -asmlinkage int FASTCALL(do_signal(struct pt_regs *regs, sigset_t *oldset)); -int copy_siginfo_to_user32 (compat_siginfo_t __user *to,siginfo_t *from) {int err;
@@ -161,66 +158,6 @@ int copy_siginfo_from_user32(siginfo_t *return err; } -/* -* Atomically swap in the new signal mask, and wait for a signal. -*/ -asmlinkage int -sys32_sigsuspend (struct pt_regs * regs,int history0,int history1,old_sigset_t mask) -{ -sigset_t saveset; - - mask &= _BLOCKABLE; -spin_lock_irq (¤t->sighand->siglock); - saveset = current->blocked; -siginitset (¤t->blocked, mask); -recalc_sigpending (); -spin_unlock_irq (¤t->sighand->siglock); - regs->gprs[2 ] = -EINTR ; - -while (1 ) { -set_current_state (TASK_INTERRUPTIBLE ); -schedule (); -if (do_signal (regs, &saveset)) -return -EINTR ; - } -} - -asmlinkage int -sys32_rt_sigsuspend (struct pt_regs * regs,compat_sigset_t __user *unewset, -size_t sigsetsize) -{ -sigset_t saveset, newset; -compat_sigset_t set32; - -/* XXX: Don't preclude handling different sized sigset_t's. */ -if (sigsetsize !=sizeof (sigset_t)) -return -EINVAL ; - -if (copy_from_user (&set32, unewset,sizeof (set32))) -return -EFAULT ; -switch (_NSIG_WORDS) { -case 4 : newset.sig[3 ] = set32.sig[6 ] + (((long )set32.sig[7 ]) <<32 ); -case 3 : newset.sig[2 ] = set32.sig[4 ] + (((long )set32.sig[5 ]) <<32 ); -case 2 : newset.sig[1 ] = set32.sig[2 ] + (((long )set32.sig[3 ]) <<32 ); -case 1 : newset.sig[0 ] = set32.sig[0 ] + (((long )set32.sig[1 ]) <<32 ); - } -sigdelsetmask (&newset, ~_BLOCKABLE); - -spin_lock_irq (¤t->sighand->siglock); - saveset = current->blocked; - current->blocked = newset; -recalc_sigpending (); -spin_unlock_irq (¤t->sighand->siglock); - regs->gprs[2 ] = -EINTR ; - -while (1 ) { -set_current_state (TASK_INTERRUPTIBLE ); -schedule (); -if (do_signal (regs, &saveset)) -return -EINTR ; - } -} -asmlinkage long sys32_sigaction (int sig,const struct old_sigaction32 __user *act,struct old_sigaction32 __user *oact)
@@ -520,7 +457,7 @@ static inline int map_signal(int sig)return sig; } -static void setup_frame32 (int sig,struct k_sigaction *ka, +static int setup_frame32 (int sig,struct k_sigaction *ka,sigset_t *set,struct pt_regs * regs) {sigframe32 __user *frame =get_sigframe (ka, regs,sizeof (sigframe32));
@@ -565,13 +502,14 @@ static void setup_frame32(int sig, struc/* Place signal number on stack to allow backtrace from handler. */ if (__put_user (regs->gprs[2 ], (int __user *) &frame->signo)) goto give_sigsegv; -return ; +return 0 ; give_sigsegv:force_sigsegv (sig, current); +return -EFAULT ; } -static void setup_rt_frame32 (int sig,struct k_sigaction *ka,siginfo_t *info, +static int setup_rt_frame32 (int sig,struct k_sigaction *ka,siginfo_t *info,sigset_t *set,struct pt_regs * regs) {int err =0 ;
@@ -615,31 +553,37 @@ static void setup_rt_frame32(int sig, st regs->gprs[2 ] =map_signal (sig); regs->gprs[3 ] = (__u64) &frame->info; regs->gprs[4 ] = (__u64) &frame->uc; -return ; +return 0 ; give_sigsegv:force_sigsegv (sig, current); +return -EFAULT ; }/* * OK, we're invoking a handler */ -void +int handle_signal32 (unsigned long sig,struct k_sigaction *ka,siginfo_t *info,sigset_t *oldset,struct pt_regs * regs) { +int ret; +/* Set up the stack frame */ if (ka->sa.sa_flags &SA_SIGINFO ) -setup_rt_frame32 (sig, ka, info, oldset, regs); + ret =setup_rt_frame32 (sig, ka, info, oldset, regs);else -setup_frame32 (sig, ka, oldset, regs); + ret =setup_frame32 (sig, ka, oldset, regs); -spin_lock_irq (¤t->sighand->siglock); -sigorsets (¤t->blocked,¤t->blocked,&ka->sa.sa_mask); -if (!(ka->sa.sa_flags &SA_NODEFER )) -sigaddset (¤t->blocked,sig); -recalc_sigpending (); -spin_unlock_irq (¤t->sighand->siglock); +if (ret ==0 ) { +spin_lock_irq (¤t->sighand->siglock); +sigorsets (¤t->blocked,¤t->blocked,&ka->sa.sa_mask); +if (!(ka->sa.sa_flags &SA_NODEFER )) +sigaddset (¤t->blocked,sig); +recalc_sigpending (); +spin_unlock_irq (¤t->sighand->siglock); + } +return ret; }
arch/s390/kernel/compat_wrapper.S +132 -5
158 lines not on this page · raw message
arch/s390/kernel/entry.S +13 -38
107 lines not on this page · raw message
arch/s390/kernel/entry64.S +14 -61
131 lines not on this page · raw message
arch/s390/kernel/signal.c +71 -75
247 lines not on this page · raw message
arch/s390/kernel/syscalls.S +19 -3
@@ -80,7 +80,7 @@ NI_SYSCALL /* old sgetmask syscall NI_SYSCALL /* old ssetmask syscall*/ SYSCALL(sys_setreuid16,sys_ni_syscall,sys32_setreuid16_wrapper) /* old setreuid16 syscall */ SYSCALL(sys_setregid16,sys_ni_syscall,sys32_setregid16_wrapper) /* old setregid16 syscall */ -SYSCALL(sys_sigsuspend_glue,sys_sigsuspend_glue,sys32_sigsuspend_glue) +SYSCALL(sys_sigsuspend,sys_sigsuspend,sys_sigsuspend_wrapper) SYSCALL(sys_sigpending,sys_sigpending,compat_sys_sigpending_wrapper) SYSCALL(sys_sethostname,sys_sethostname,sys32_sethostname_wrapper) SYSCALL(sys_setrlimit,sys_setrlimit,compat_sys_setrlimit_wrapper) /* 75 */
@@ -187,7 +187,7 @@ SYSCALL(sys_rt_sigprocmask,sys_rt_sigpro SYSCALL(sys_rt_sigpending,sys_rt_sigpending,sys32_rt_sigpending_wrapper) SYSCALL(sys_rt_sigtimedwait,sys_rt_sigtimedwait,compat_sys_rt_sigtimedwait_wrapper) SYSCALL(sys_rt_sigqueueinfo,sys_rt_sigqueueinfo,sys32_rt_sigqueueinfo_wrapper) -SYSCALL(sys_rt_sigsuspend_glue,sys_rt_sigsuspend_glue,sys32_rt_sigsuspend_glue) +SYSCALL(sys_rt_sigsuspend,sys_rt_sigsuspend,compat_sys_rt_sigsuspend_wrapper) SYSCALL(sys_pread64,sys_pread64,sys32_pread64_wrapper) /* 180 */ SYSCALL(sys_pwrite64,sys_pwrite64,sys32_pwrite64_wrapper) SYSCALL(sys_chown16,sys_ni_syscall,sys32_chown16_wrapper) /* old chown16 syscall */
@@ -293,5 +293,21 @@ SYSCALL(sys_waitid,sys_waitid,compat_sys SYSCALL(sys_ioprio_set,sys_ioprio_set,sys_ioprio_set_wrapper) SYSCALL(sys_ioprio_get,sys_ioprio_get,sys_ioprio_get_wrapper) SYSCALL(sys_inotify_init,sys_inotify_init,sys_inotify_init) -SYSCALL(sys_inotify_add_watch,sys_inotify_add_watch,sys_inotify_add_watch_wrapper) +SYSCALL(sys_inotify_add_watch,sys_inotify_add_watch,sys_inotify_add_watch_wrapper) /* 285 */ SYSCALL(sys_inotify_rm_watch,sys_inotify_rm_watch,sys_inotify_rm_watch_wrapper) +NI_SYSCALL /* 287 sys_migrate_pages */ +SYSCALL(sys_openat,sys_openat,compat_sys_openat_wrapper) +SYSCALL(sys_mkdirat,sys_mkdirat,sys_mkdirat_wrapper) +SYSCALL(sys_mknodat,sys_mknodat,sys_mknodat_wrapper) /* 290 */ +SYSCALL(sys_fchownat,sys_fchownat,sys_fchownat_wrapper) +SYSCALL(sys_futimesat,sys_futimesat,compat_sys_futimesat_wrapper) +SYSCALL(sys_newfstatat,sys_newfstatat,compat_sys_newfstatat_wrapper) +SYSCALL(sys_unlinkat,sys_unlinkat,sys_unlinkat_wrapper) +SYSCALL(sys_renameat,sys_renameat,sys_renameat_wrapper) /* 295 */ +SYSCALL(sys_linkat,sys_linkat,sys_linkat_wrapper) +SYSCALL(sys_symlinkat,sys_symlinkat,sys_symlinkat_wrapper) +SYSCALL(sys_readlinkat,sys_readlinkat,sys_readlinkat_wrapper) +SYSCALL(sys_fchmodat,sys_fchmodat,sys_fchmodat_wrapper) +SYSCALL(sys_faccessat,sys_faccessat,sys_faccessat_wrapper) /* 300 */ +SYSCALL(sys_pselect6,sys_pselect6,compat_sys_pselect6_wrapper) +SYSCALL(sys_ppoll,sys_ppoll,compat_sys_ppoll_wrapper)
include/asm-s390/thread_info.h +3 -3
@@ -2,7 +2,7 @@* include/asm-s390/thread_info.h * * S390 version -* Copyright (C) 2002 IBM Deutschland Entwicklung GmbH, IBM Corporation +* Copyright (C) IBM Corp. 2002,2006 * Author(s): Martin Schwidefsky ([email protected]) */
@@ -88,7 +88,7 @@ static inline struct thread_info *curren* thread information flags bit numbers */ #define TIF_SYSCALL_TRACE 0/* syscall trace active */ -#define TIF_NOTIFY_RESUME 1/* resumption notification requested */ +#define TIF_RESTORE_SIGMASK 1/* restore signal mask in do_signal() */ #define TIF_SIGPENDING 2/* signal pending */ #define TIF_NEED_RESCHED 3/* rescheduling necessary */ #define TIF_RESTART_SVC 4/* restart svc with new svc number */
@@ -102,7 +102,7 @@ static inline struct thread_info *curren#define TIF_MEMDIE 19#define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE) -#define _TIF_NOTIFY_RESUME (1<<TIF_NOTIFY_RESUME) +#define _TIF_RESTORE_SIGMASK (1<<TIF_RESTORE_SIGMASK)#define _TIF_SIGPENDING (1<<TIF_SIGPENDING)#define _TIF_NEED_RESCHED (1<<TIF_NEED_RESCHED)#define _TIF_RESTART_SVC (1<<TIF_RESTART_SVC)
include/asm-s390/unistd.h +22 -2
@@ -279,8 +279,24 @@#define __NR_inotify_init 284#define __NR_inotify_add_watch 285#define __NR_inotify_rm_watch 286 +/* Number 287 is reserved for new sys_migrate_pages */ +#define __NR_openat 288 +#define __NR_mkdirat 289 +#define __NR_mknodat 290 +#define __NR_fchownat 291 +#define __NR_futimesat 292 +#define __NR_newfstatat 293 +#define __NR_unlinkat 294 +#define __NR_renameat 295 +#define __NR_linkat 296 +#define __NR_symlinkat 297 +#define __NR_readlinkat 298 +#define __NR_fchmodat 299 +#define __NR_faccessat 300 +#define __NR_pselect6 301 +#define __NR_ppoll 302 -#define NR_syscalls 287 +#define NR_syscalls 303/* * There are some system calls that are not present on 64 bit, some
@@ -539,11 +555,15 @@ type name(type1 arg1, type2 arg2, type3#define __ARCH_WANT_SYS_SIGPENDING#define __ARCH_WANT_SYS_SIGPROCMASK#define __ARCH_WANT_SYS_RT_SIGACTION +#define __ARCH_WANT_SYS_RT_SIGSUSPEND# ifndef CONFIG_64BIT # define __ARCH_WANT_STAT64# define __ARCH_WANT_SYS_TIME# endif -# define __ARCH_WANT_COMPAT_SYS_TIME +# ifdef CONFIG_COMPAT +# define __ARCH_WANT_COMPAT_SYS_TIME +# define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND +# endif #endif #ifdef __KERNEL_SYSCALLS__