system call cleanup.
From: Martin Schwidefsky <[email protected]>
[S390] system call cleanup.
Remove system call glue for sys_clone, sys_fork, sys_vfork, sys_execve, sys_sigreturn, sys_rt_sigreturn and sys_sigaltstack. Call do_execve from kernel_execve directly, move pt_regs to the right place and branch to sysc_return to start the user space program. This removes the last in-kernel system call.
---
arch/s390/kernel/compat_linux.c | 56 ++++++++++++--------- arch/s390/kernel/compat_signal.c | 10 ++- arch/s390/kernel/entry.S | 87 ++++++++++++--------------------- arch/s390/kernel/entry64.S | 100 ++++++++++----------------------------- arch/s390/kernel/process.c | 76 +++++++++++++++++------------ arch/s390/kernel/signal.c | 10 ++- arch/s390/kernel/sys_s390.c | 20 ------- arch/s390/kernel/syscalls.S | 14 ++--- 8 files changed, 155 insertions(+), 218 deletions(-)
arch/s390/kernel/compat_linux.c +31 -25
@@ -495,29 +495,34 @@ sys32_rt_sigqueueinfo(int pid, int sig,* sys32_execve() executes a new program after the asm stub has set * things up for us. This should basically do what I want it to. */ -asmlinkage long -sys32_execve (struct pt_regs regs) +asmlinkage long sys32_execve (void ) { -int error; -char * filename; - - filename =getname (compat_ptr (regs.orig_gpr2)); - error =PTR_ERR (filename); -if (IS_ERR (filename)) +struct pt_regs *regs =task_pt_regs (current); +char *filename; +unsigned long result; +int rc; + + filename =getname (compat_ptr (regs->orig_gpr2)); +if (IS_ERR (filename)) { + result =PTR_ERR (filename); goto out; - error =compat_do_execve (filename,compat_ptr (regs.gprs[3 ]), -compat_ptr (regs.gprs[4 ]), ®s); -if (error ==0 ) - { -task_lock (current); - current->ptrace &= ~PT_DTRACE ; -task_unlock (current); - current->thread.fp_regs.fpc=0 ; - asmvolatile ("sfpc %0,0" : :"d" (0 )); } + rc =compat_do_execve (filename,compat_ptr (regs->gprs[3 ]), +compat_ptr (regs->gprs[4 ]), regs); +if (rc) { + result = rc; + goto out_putname; + } +task_lock (current); + current->ptrace &= ~PT_DTRACE ; +task_unlock (current); + current->thread.fp_regs.fpc=0 ; + asmvolatile ("sfpc %0,0" : :"d" (0 )); + result = regs->gprs[2 ]; +out_putname:putname (filename); out: -return error; +return result; }
@@ -918,19 +923,20 @@ asmlinkage long sys32_write(unsigned intreturn sys_write (fd, buf, count); } -asmlinkage long sys32_clone (struct pt_regs regs) +asmlinkage long sys32_clone (void ) { +struct pt_regs *regs =task_pt_regs (current);unsigned long clone_flags;unsigned long newsp;int __user *parent_tidptr, *child_tidptr; - clone_flags = regs.gprs[3 ] &0xffffffffUL ; - newsp = regs.orig_gpr2 &0x7fffffffUL ; - parent_tidptr =compat_ptr (regs.gprs[4 ]); - child_tidptr =compat_ptr (regs.gprs[5 ]); + clone_flags = regs->gprs[3 ] &0xffffffffUL ; + newsp = regs->orig_gpr2 &0x7fffffffUL ; + parent_tidptr =compat_ptr (regs->gprs[4 ]); + child_tidptr =compat_ptr (regs->gprs[5 ]);if (!newsp) - newsp = regs.gprs[15 ]; -return do_fork (clone_flags, newsp, ®s,0 , + newsp = regs->gprs[15 ]; +return do_fork (clone_flags, newsp, regs,0 , parent_tidptr, child_tidptr); }
arch/s390/kernel/compat_signal.c +6 -4
@@ -255,9 +255,9 @@ sys32_rt_sigaction(int sig, const struct }asmlinkage long -sys32_sigaltstack (const stack_t32 __user *uss,stack_t32 __user *uoss, -struct pt_regs *regs) +sys32_sigaltstack (const stack_t32 __user *uss,stack_t32 __user *uoss) { +struct pt_regs *regs =task_pt_regs (current);stack_t kss, koss;unsigned long ss_sp;int ret, err =0 ;
@@ -344,8 +344,9 @@ static int restore_sigregs32(struct pt_rreturn 0 ; } -asmlinkage long sys32_sigreturn (struct pt_regs *regs) +asmlinkage long sys32_sigreturn (void ) { +struct pt_regs *regs =task_pt_regs (current);sigframe32 __user *frame = (sigframe32 __user *)regs->gprs[15 ];sigset_t set;
@@ -370,8 +371,9 @@ badframe:return 0 ; } -asmlinkage long sys32_rt_sigreturn (struct pt_regs *regs) +asmlinkage long sys32_rt_sigreturn (void ) { +struct pt_regs *regs =task_pt_regs (current);rt_sigframe32 __user *frame = (rt_sigframe32 __user *)regs->gprs[15 ];sigset_t set;stack_t st;
arch/s390/kernel/entry64.S +28 -72
113 lines not on this page · raw message
arch/s390/kernel/entry.S +32 -55
109 lines not on this page · raw message
arch/s390/kernel/process.c +45 -31
109 lines not on this page · raw message
arch/s390/kernel/signal.c +6 -4
@@ -102,9 +102,9 @@ sys_sigaction(int sig, const struct old_ }asmlinkage long -sys_sigaltstack (const stack_t __user *uss,stack_t __user *uoss, -struct pt_regs *regs) +sys_sigaltstack (const stack_t __user *uss,stack_t __user *uoss) { +struct pt_regs *regs =task_pt_regs (current);return do_sigaltstack (uss, uoss, regs->gprs[15 ]); }
@@ -163,8 +163,9 @@ static int restore_sigregs(struct pt_regreturn 0 ; } -asmlinkage long sys_sigreturn (struct pt_regs *regs) +asmlinkage long sys_sigreturn (void ) { +struct pt_regs *regs =task_pt_regs (current);sigframe __user *frame = (sigframe __user *)regs->gprs[15 ];sigset_t set;
@@ -189,8 +190,9 @@ badframe:return 0 ; } -asmlinkage long sys_rt_sigreturn (struct pt_regs *regs) +asmlinkage long sys_rt_sigreturn (void ) { +struct pt_regs *regs =task_pt_regs (current);rt_sigframe __user *frame = (rt_sigframe __user *)regs->gprs[15 ];sigset_t set;
arch/s390/kernel/syscalls.S +7 -7
@@ -10,7 +10,7 @@ NI_SYSCALL /* 0 */ SYSCALL(sys_exit,sys_exit,sys32_exit_wrapper) -SYSCALL(sys_fork_glue,sys_fork_glue,sys_fork_glue) +SYSCALL(sys_fork,sys_fork,sys_fork) SYSCALL(sys_read,sys_read,sys32_read_wrapper) SYSCALL(sys_write,sys_write,sys32_write_wrapper) SYSCALL(sys_open,sys_open,sys32_open_wrapper) /* 5 */
@@ -19,7 +19,7 @@ SYSCALL(sys_restart_syscall,sys_restart_ SYSCALL(sys_creat,sys_creat,sys32_creat_wrapper) SYSCALL(sys_link,sys_link,sys32_link_wrapper) SYSCALL(sys_unlink,sys_unlink,sys32_unlink_wrapper) /* 10 */ -SYSCALL(sys_execve_glue,sys_execve_glue,sys32_execve_glue) +SYSCALL(sys_execve,sys_execve,sys32_execve) SYSCALL(sys_chdir,sys_chdir,sys32_chdir_wrapper) SYSCALL(sys_time,sys_ni_syscall,sys32_time_wrapper) /* old time syscall */ SYSCALL(sys_mknod,sys_mknod,sys32_mknod_wrapper)
@@ -127,8 +127,8 @@ SYSCALL(sys_swapoff,sys_swapoff,sys32_sw SYSCALL(sys_sysinfo,sys_sysinfo,compat_sys_sysinfo_wrapper) SYSCALL(sys_ipc,sys_ipc,sys32_ipc_wrapper) SYSCALL(sys_fsync,sys_fsync,sys32_fsync_wrapper) -SYSCALL(sys_sigreturn_glue,sys_sigreturn_glue,sys32_sigreturn_glue) -SYSCALL(sys_clone_glue,sys_clone_glue,sys32_clone_glue) /* 120 */ +SYSCALL(sys_sigreturn,sys_sigreturn,sys32_sigreturn) +SYSCALL(sys_clone,sys_clone,sys32_clone) /* 120 */ SYSCALL(sys_setdomainname,sys_setdomainname,sys32_setdomainname_wrapper) SYSCALL(sys_newuname,s390x_newuname,sys32_newuname_wrapper) NI_SYSCALL /* modify_ldt for i386 */
@@ -181,7 +181,7 @@ SYSCALL(sys_nfsservctl,sys_nfsservctl,co SYSCALL(sys_setresgid16,sys_ni_syscall,sys32_setresgid16_wrapper) /* 170 old setresgid16 syscall */ SYSCALL(sys_getresgid16,sys_ni_syscall,sys32_getresgid16_wrapper) /* old getresgid16 syscall */ SYSCALL(sys_prctl,sys_prctl,sys32_prctl_wrapper) -SYSCALL(sys_rt_sigreturn_glue,sys_rt_sigreturn_glue,sys32_rt_sigreturn_glue) +SYSCALL(sys_rt_sigreturn,sys_rt_sigreturn,sys32_rt_sigreturn) SYSCALL(sys_rt_sigaction,sys_rt_sigaction,sys32_rt_sigaction_wrapper) SYSCALL(sys_rt_sigprocmask,sys_rt_sigprocmask,sys32_rt_sigprocmask_wrapper) /* 175 */ SYSCALL(sys_rt_sigpending,sys_rt_sigpending,sys32_rt_sigpending_wrapper)
@@ -194,11 +194,11 @@ SYSCALL(sys_chown16,sys_ni_syscall,sys32 SYSCALL(sys_getcwd,sys_getcwd,sys32_getcwd_wrapper) SYSCALL(sys_capget,sys_capget,sys32_capget_wrapper) SYSCALL(sys_capset,sys_capset,sys32_capset_wrapper) /* 185 */ -SYSCALL(sys_sigaltstack_glue,sys_sigaltstack_glue,sys32_sigaltstack_glue) +SYSCALL(sys_sigaltstack,sys_sigaltstack,sys32_sigaltstack) SYSCALL(sys_sendfile,sys_sendfile64,sys32_sendfile_wrapper) NI_SYSCALL /* streams1 */ NI_SYSCALL /* streams2 */ -SYSCALL(sys_vfork_glue,sys_vfork_glue,sys_vfork_glue) /* 190 */ +SYSCALL(sys_vfork,sys_vfork,sys_vfork) /* 190 */ SYSCALL(sys_getrlimit,sys_getrlimit,compat_sys_getrlimit_wrapper) SYSCALL(sys_mmap2,sys_mmap2,sys32_mmap2_wrapper) SYSCALL(sys_truncate64,sys_ni_syscall,sys32_truncate64_wrapper)
arch/s390/kernel/sys_s390.c +0 -20
@@ -266,23 +266,3 @@ s390_fadvise64_64(struct fadvise64_64_arreturn -EFAULT ;return sys_fadvise64_64 (a.fd, a.offset, a.len, a.advice); } - -/* -* Do a system call from kernel instead of calling sys_execve so we -* end up with proper pt_regs. -*/ -int kernel_execve (const char *filename,char *const argv[],char *const envp[]) -{ - register const char *__arg1 asm("2") = filename; - register char *const*__arg2 asm("3") = argv; - register char *const*__arg3 asm("4") = envp; - registerlong __svcres asm("2" ); - asmvolatile ( -"svc %b1" - :"=d" (__svcres) - :"i" (__NR_execve), -"0" (__arg1), -"d" (__arg2), -"d" (__arg3) :"memory" ); -return __svcres; -}
arch/s390/kernel/compat_linux.c sys32_rt_sigqueueinfo(int pid, int sig, · line 508
Quoted 9 lines
arch/s390/kernel/compat_linux.c +8
-0+struct pt_regs *regs =task_pt_regs (current); +char *filename; +unsigned long result; +int rc; + + filename =getname (compat_ptr (regs->orig_gpr2)); +if (IS_ERR (filename)) { + result =PTR_ERR (filename); goto out;
The old code here..
arch/s390/kernel/compat_linux.c asmlinkage long sys32_write(unsigned int · line 931
Quoted 4 lines
arch/s390/kernel/compat_linux.c +1
-0+struct pt_regs *regs =task_pt_regs (current);unsigned long clone_flags;unsigned long newsp;int __user *parent_tidptr, *child_tidptr;
..and here..
arch/s390/kernel/process.c int copy_thread(int nr, unsigned long cl · line 294
Quoted 6 lines
arch/s390/kernel/process.c +2
-0+asmlinkage long sys_clone (void ) { +struct pt_regs *regs =task_pt_regs (current);unsigned long clone_flags;unsigned long newsp;int __user *parent_tidptr, *child_tidptr;
..and here used spaces instead of tabs, it would be nice to clean this up while you're at it.
Quoted 19 lines · Christoph Hellwig
arch/s390/kernel/compat_linux.c sys32_rt_sigqueueinfo(int pid, int sig, · line 508
Quoted 9 lines
arch/s390/kernel/compat_linux.c +8
-0+struct pt_regs *regs =task_pt_regs (current); +char *filename; +unsigned long result; +int rc; + + filename =getname (compat_ptr (regs->orig_gpr2)); +if (IS_ERR (filename)) { + result =PTR_ERR (filename); goto out;The old code here..
arch/s390/kernel/compat_linux.c asmlinkage long sys32_write(unsigned int · line 931
Quoted 4 lines
arch/s390/kernel/compat_linux.c +1
-0+struct pt_regs *regs =task_pt_regs (current);unsigned long clone_flags;unsigned long newsp;int __user *parent_tidptr, *child_tidptr;..and here..
Quoted 9 lines
arch/s390/kernel/process.c int copy_thread(int nr, unsigned long cl · line 294
Quoted 6 lines
arch/s390/kernel/process.c +2
-0+asmlinkage long sys_clone (void ) { +struct pt_regs *regs =task_pt_regs (current);unsigned long clone_flags;unsigned long newsp;int __user *parent_tidptr, *child_tidptr;..and here used spaces instead of tabs, it would be nice to clean this up while you're at it.
Will do, thanks for the hint.
Signature · 8 lines
blue skies, IBM Deutschland Entwicklung GmbH
Martin Vorsitzender des Aufsichtsrats: Johann Weihen
Geschäftsführung: Herbert Kircher
Martin Schwidefsky Sitz der Gesellschaft: Böblingen
Linux on zSeries Registergericht: Amtsgericht Stuttgart,
Development HRB 243294
"Reality continues to ruin my life." - Calvin.