s390 (13/13): 31 bit compatability layer.
Subsystems (2)
PATCH 1/1 s390 (13/13): 31 bit compatability layer.
Fixes for the 31 bit compatability layer:
* add compat function for jiffies_to_timeval
* convert parameters of clone system call
* incorporate changes from setup_arg_pages to setup_arg_pages32
* incorporate changes from do_execve to do_execve32
* take care of nanosecond field in struct timespec
* remove functions of old module system calls
* add TIF_31BIT thread flag and replace S390_FLAG_31BIT with it
* add arch_get_unmapped_area
* add wrapper for sys_set_tid_address
arch/s390x/kernel/binfmt_elf32.c +19 -11
@@ -9,9 +9,10 @@* Copyright (C) 1995, 1996, 1997, 1998 Jakub Jelinek ([email protected]) */ -#define __ASMS390_ELF_H +#include <linux/time.h> +/* * These are used to set parameters in the core dumps. */
@@ -38,7 +39,7 @@#define ELF_PLAT_INIT (_r) \ do { \ _r->gprs[14] = 0; \ - current->thread.flags |= S390_FLAG_31BIT; \ + set_thread_flag(TIF_31BIT); \ } while(0)#define USE_ELF_CORE_DUMP
@@ -49,9 +50,7 @@the loader. We need to make sure that it is out of the way of the program that it will "exec", and that there is sufficient room for the brk. */ -#define ELF_ET_DYN_BASE ((TASK31_SIZE & 0x80000000) \ - ? TASK31_SIZE / 3 * 2 \ - : 2 * TASK31_SIZE / 3) +#define ELF_ET_DYN_BASE (TASK31_SIZE / 3 * 2)/* Wow, the "main" arch needs arch dependent functions too.. :) */
@@ -86,7 +85,6 @@#define ELF_PLATFORM (NULL) -#ifdef __KERNEL__#define SET_PERSONALITY (ex, ibcs2) \ do { \ if (ibcs2) \
@@ -94,7 +92,6 @@else if (current->personality !=PER_LINUX32 ) \set_personality (PER_LINUX ); \ }while (0 ) -#endif #include "linux32.h"
@@ -186,6 +183,14 @@#undef MODULE_DESCRIPTION#undef MODULE_AUTHOR +#define jiffies_to_timeval jiffies_to_compat_timeval +static __inline__void +jiffies_to_compat_timeval (unsigned long jiffies,struct compat_timeval *value) +{ + value->tv_usec = (jiffies %HZ ) * (1000000L /HZ ); + value->tv_sec = jiffies /HZ ; +} +#include "../../../fs/binfmt_elf.c" static unsigned long
@@ -193,14 +198,17 @@ {unsigned long map_addr; -if (!addr) - addr =0x40000000 ; +if (!addr) + addr =0x40000000 ; + +if (prot &PROT_READ ) + prot |=PROT_EXEC ;down_write (¤t->mm->mmap_sem); map_addr =do_mmap (filep,ELF_PAGESTART (addr), - eppnt->p_filesz +ELF_PAGEOFFSET (eppnt->p_vaddr), prot, type, + eppnt->p_filesz +ELF_PAGEOFFSET (eppnt->p_vaddr), + prot, type, eppnt->p_offset -ELF_PAGEOFFSET (eppnt->p_vaddr));up_write (¤t->mm->mmap_sem);return (map_addr); } -
arch/s390x/kernel/entry.S +8 -2
@@ -280,6 +280,12 @@ la %r2,SP_PTREGS(%r15) # load pt_regs jg sys_clone # branch to sys_clone +#ifdef CONFIG_S390_SUPPORT +sys32_clone_glue: + la %r2,SP_PTREGS(%r15) # load pt_regs + jg sys32_clone # branch to sys32_clone +#endif + sys_fork_glue: la %r2,SP_PTREGS(%r15) # load pt_regs jg sys_fork # branch to sys_fork
@@ -511,7 +517,7 @@ .long SYSCALL(sys_ipc,sys32_ipc_wrapper) .long SYSCALL(sys_fsync,sys32_fsync_wrapper) .long SYSCALL(sys_sigreturn_glue,sys32_sigreturn_glue) - .long SYSCALL(sys_clone_glue,sys_clone_glue) /* 120 */ + .long SYSCALL(sys_clone_glue,sys32_clone_glue) /* 120 */ .long SYSCALL(sys_setdomainname,sys32_setdomainname_wrapper) .long SYSCALL(s390x_newuname,sys32_newuname_wrapper) .long SYSCALL(sys_ni_syscall,sys_ni_syscall) /* modify_ldt for i386 */
@@ -643,7 +649,7 @@ .long SYSCALL(sys_epoll_create,sys_ni_syscall) .long SYSCALL(sys_epoll_ctl,sys_ni_syscall) .long SYSCALL(sys_epoll_wait,sys_ni_syscall) - .long SYSCALL(sys_set_tid_address,sys_ni_syscall) + .long SYSCALL(sys_set_tid_address,sys32_set_tid_address_wrapper) .long SYSCALL(sys_fadvise64,sys_ni_syscall) .rept 255-253 .long SYSCALL(sys_ni_syscall,sys_ni_syscall)
arch/s390x/kernel/exec32.c +13 -5
@@ -42,9 +42,11 @@ {unsigned long stack_base;struct vm_area_struct *mpnt; +struct mm_struct *mm = current->mm;int i; stack_base =STACK_TOP -MAX_ARG_PAGES *PAGE_SIZE ; + mm->arg_start = bprm->p + stack_base; bprm->p += stack_base;if (bprm->loader)
@@ -55,9 +57,14 @@if (!mpnt)return -ENOMEM ; -down_write (¤t->mm->mmap_sem); +if (!vm_enough_memory ((STACK_TOP - (PAGE_MASK & (unsigned long ) bprm->p))>>PAGE_SHIFT )) { +kmem_cache_free (vm_area_cachep, mpnt); +return -ENOMEM ; + } + +down_write (&mm->mmap_sem); { - mpnt->vm_mm = current->mm; + mpnt->vm_mm = mm; mpnt->vm_start =PAGE_MASK & (unsigned long ) bprm->p; mpnt->vm_end =STACK_TOP ; mpnt->vm_page_prot =PAGE_COPY ;
@@ -65,9 +72,10 @@ mpnt->vm_ops =NULL ; mpnt->vm_pgoff =0 ; mpnt->vm_file =NULL ; +INIT_LIST_HEAD (&mpnt->shared); mpnt->vm_private_data = (void *)0 ; -insert_vm_struct (current->mm, mpnt); - current->mm->total_vm = (mpnt->vm_end - mpnt->vm_start) >>PAGE_SHIFT ; +insert_vm_struct (mm, mpnt); + mm->total_vm = (mpnt->vm_end - mpnt->vm_start) >>PAGE_SHIFT ; }for (i =0 ; i <MAX_ARG_PAGES ; i++) {
@@ -78,7 +86,7 @@ } stack_base +=PAGE_SIZE ; } -up_write (¤t->mm->mmap_sem); +up_write (&mm->mmap_sem);return 0 ; }
arch/s390x/kernel/linux32.c +65 -284
393 lines not on this page · raw message
arch/s390x/kernel/process.c +1 -1
@@ -206,7 +206,7 @@/* Set a new TLS ? */ if (clone_flags &CLONE_SETTLS ) { -if (current->thread.flags &S390_FLAG_31BIT ) { +if (test_thread_flag (TIF_31BIT )) { frame->childregs.acrs[0 ] = (unsigned int ) regs->gprs[6 ]; }else {
arch/s390x/kernel/ptrace.c +5 -6
@@ -58,7 +58,7 @@if (per_info->single_step) { per_info->control_regs.bits.starting_addr =0 ;#ifdef CONFIG_S390_SUPPORT -if (current->thread.flags &S390_FLAG_31BIT ) +if (test_thread_flag (TIF_31BIT )) per_info->control_regs.bits.ending_addr =0x7fffffffUL ; else#endif
@@ -290,7 +290,7 @@addr_t offset;__u32 tmp; -if (!(child->thread.flags &S390_FLAG_31BIT ) || +if (!test_thread_flag (TIF_31BIT ) || (addr &3 ) || addr >sizeof (struct user ) -3 )return -EIO ;
@@ -349,9 +349,8 @@per_struct32 *dummy_per32 =NULL ;addr_t offset;__u32 tmp; -int ret; -if (!(child->thread.flags &S390_FLAG_31BIT ) || +if (!test_thread_flag (TIF_31BIT ) || (addr &3 ) || addr >sizeof (struct user32 ) -3 )return -EIO ;
@@ -382,7 +381,7 @@*/ if (addr == (addr_t) &dummy32->regs.fp_regs.fpc && (tmp & ~FPC_VALID_MASK ) !=0 ) -/* Invalid floating pointer control. */ +/* Invalid floating point control. */ return -EINVAL ; offset = addr - (addr_t) &dummy32->regs.fp_regs; *(__u32 *)((addr_t ) &child->thread.fp_regs + offset) = tmp;
@@ -542,7 +541,7 @@/* Do requests that differ for 31/64 bit */ default :#ifdef CONFIG_S390_SUPPORT -if (current->thread.flags &S390_FLAG_31BIT ) +if (test_thread_flag (TIF_31BIT ))return do_ptrace_emu31 (child, request, addr, data);#endif return do_ptrace_normal (child, request, addr, data);
arch/s390x/kernel/signal.c +1 -1
@@ -455,7 +455,7 @@if (!oldset) oldset = ¤t->blocked;#ifdef CONFIG_S390_SUPPORT -if (current->thread.flags &S390_FLAG_31BIT ) { +if (test_thread_flag (TIF_31BIT )) { extern asmlinkage int do_signal32(struct pt_regs *regs, sigset_t *oldset);return do_signal32 (regs, oldset); }
arch/s390x/kernel/signal32.c +1 -1
@@ -556,7 +556,7 @@ handle_signal32(unsigned long sig, siginfo_t *info, sigset_t *oldset, struct pt_regs * regs) { -struct k_sigaction *ka = ¤t->sig->action[sig-1 ]; +struct k_sigaction *ka = ¤t->sighand->action[sig-1 ];/* Are we from a system call? */ if (regs->trap == __LC_SVC_OLD_PSW) {
arch/s390x/kernel/sys_s390.c +32 -0
@@ -117,6 +117,38 @@return error; } +unsigned long +arch_get_unmapped_area (struct file *filp,unsigned long addr, +unsigned long len,unsigned long pgoff, +unsigned long flags) +{ +struct vm_area_struct *vma; +unsigned long end; + +if (test_thread_flag (TIF_31BIT )) { +if (!addr) + addr =0x40000000 ; + end =0x80000000 ; + }else { +if (!addr) + addr =TASK_SIZE /2 ; + end =TASK_SIZE ; + } + +if (len > end) +return -ENOMEM ; + addr =PAGE_ALIGN (addr); + +for (vma =find_vma (current->mm, addr); ; vma = vma->vm_next) { +/* At this point: (!vma || addr < vma->vm_end). */ +if (end - len < addr) +return -ENOMEM ; +if (!vma || addr + len <= vma->vm_start) +return addr; + addr = vma->vm_end; + } +} + extern asmlinkage int sys_select(int, fd_set *, fd_set *, fd_set *, struct timeval *);/*
arch/s390x/kernel/wrapper32.S +5 -0
@@ -1204,3 +1204,8 @@ sys32_exit_group_wrapper: lgfr %r2,%r2 # int jg sys_exit_group # branch to system call + + .globl sys32_set_tid_address_wrapper +sys32_set_tid_address_wrapper: + llgtr %r2,%r2 # int * + jg sys_set_tid_address # branch to system call
include/asm-s390x/compat.h +3 -3
@@ -49,11 +49,11 @@u32 st_blksize;u32 st_blocks;u32 st_atime; -u32 __unused1; +u32 st_atime_nsec;u32 st_mtime; -u32 __unused2; +u32 st_mtime_nsec;u32 st_ctime; -u32 __unused3; +u32 st_ctime_nsec;u32 __unused4;u32 __unused5; };
include/asm-s390x/elf.h +2 -1
@@ -39,7 +39,7 @@#define ELF_PLAT_INIT (_r) \ do { \ _r->gprs[14] = 0; \ - current->thread.flags = 0; \ + clear_thread_flag(TIF_31BIT); \ } while(0)#define USE_ELF_CORE_DUMP
@@ -83,6 +83,7 @@set_personality (PER_SVR4 ); \ else if (current->personality != PER_LINUX32) \ set_personality(PER_LINUX); \ +clear_thread_flag (TIF_31BIT ); \ } while (0)#endif
include/asm-s390x/pgtable.h +2 -0
@@ -544,5 +544,7 @@*/ #define pgtable_cache_init () do { } while (0) +#define HAVE_ARCH_UNMAPPED_AREA +#endif /* _S390_PAGE_H */
include/asm-s390x/processor.h +2 -4
@@ -55,8 +55,6 @@/* Lazy FPU handling on uni-processor */ extern struct task_struct *last_task_used_math; -#define S390_FLAG_31BIT 0x01UL -/* * User space process size: 4TB (default). */
@@ -66,8 +64,8 @@/* This decides where the kernel will search for a free chunk of vm * space during mmap's. */ -#define TASK_UNMAPPED_BASE ((current->thread.flags & S390_FLAG_31BIT) ? \ - (TASK31_SIZE / 2) : (TASK_SIZE / 2)) +#define TASK_UNMAPPED_BASE \ + (test_thread_flag(TIF_31BIT) ? (TASK31_SIZE / 2) : (TASK_SIZE / 2))#define THREAD_SIZE (4*PAGE_SIZE)
include/asm-s390x/thread_info.h +2 -0
@@ -77,6 +77,7 @@#define TIF_USEDFPU 16/* FPU was used by this task this quantum (SMP) */ #define TIF_POLLING_NRFLAG 17/* true if poll_idle() is polling TIF_NEED_RESCHED */ +#define TIF_31BIT 18/* 32bit process */ #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)#define _TIF_NOTIFY_RESUME (1<<TIF_NOTIFY_RESUME)
@@ -85,6 +86,7 @@#define _TIF_RESTART_SVC (1<<TIF_RESTART_SVC)#define _TIF_USEDFPU (1<<TIF_USEDFPU)#define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG) +#define _TIF_31BIT (1<<TIF_31BIT)#endif /* __KERNEL__ */