[PATCH] uml: S390 preparation, abstract host page fault data
This patch removes the arch-specific fault/trap-infos from thread and skas-regs. It adds a new struct faultinfo, that is arch-specific defined in sysdep/faultinfo.h. The structure is inserted in thread.arch and thread.regs.skas and thread.regs.tt Now, segv and other trap-handlers can copy the contents from regs.X.faultinfo to thread.arch.faultinfo with one simple assignment. Also, the number of macros necessary is reduced to FAULT_ADDRESS(struct faultinfo) extracts the faulting address from faultinfo FAULT_WRITE(struct faultinfo) extracts the "is_write" flag SEGV_IS_FIXABLE(struct faultinfo) is true for the fixable segvs, i.e. (TRAP == 14) on i386 UPT_FAULTINFO(regs) result is (struct faultinfo *) to the faultinfo in regs->skas.faultinfo GET_FAULTINFO_FROM_SC(struct faultinfo, struct sigcontext *) copies the relevant parts of the sigcontext to struct faultinfo. On SIGSEGV, call user_signal() instead of handle_segv(), if the architecture provides the information needed in PTRACE_FAULTINFO, or if PTRACE_FAULTINFO is missing, because segv-stub will provide the info. The benefit of the change is, that in case of a non-fixable SIGSEGV, we can give user processes a SIGSEGV, instead of possibly looping on pagefault handling. Since handle_segv() sikked arch_fixup() implicitly by passing ip==0 to segv(), I changed segv() to call arch_fixup() only, if !is_user. Signed-off-by:Bodo Stroesser <bstroesser@fujitsu-siemens.com> Signed-off-by:
Jeff Dike <jdike@addtoit.com> Signed-off-by:
Andrew Morton <akpm@osdl.org> Signed-off-by:
Linus Torvalds <torvalds@osdl.org>
Showing
- arch/um/include/kern_util.h 4 additions, 3 deletionsarch/um/include/kern_util.h
- arch/um/include/sysdep-i386/faultinfo.h 29 additions, 0 deletionsarch/um/include/sysdep-i386/faultinfo.h
- arch/um/include/sysdep-i386/ptrace.h 5 additions, 18 deletionsarch/um/include/sysdep-i386/ptrace.h
- arch/um/include/sysdep-i386/sigcontext.h 7 additions, 12 deletionsarch/um/include/sysdep-i386/sigcontext.h
- arch/um/include/sysdep-i386/skas_ptrace.h 22 additions, 0 deletionsarch/um/include/sysdep-i386/skas_ptrace.h
- arch/um/include/sysdep-ia64/skas_ptrace.h 22 additions, 0 deletionsarch/um/include/sysdep-ia64/skas_ptrace.h
- arch/um/include/sysdep-ppc/skas_ptrace.h 22 additions, 0 deletionsarch/um/include/sysdep-ppc/skas_ptrace.h
- arch/um/include/sysdep-x86_64/faultinfo.h 29 additions, 0 deletionsarch/um/include/sysdep-x86_64/faultinfo.h
- arch/um/include/sysdep-x86_64/ptrace.h 5 additions, 11 deletionsarch/um/include/sysdep-x86_64/ptrace.h
- arch/um/include/sysdep-x86_64/sigcontext.h 8 additions, 7 deletionsarch/um/include/sysdep-x86_64/sigcontext.h
- arch/um/include/sysdep-x86_64/skas_ptrace.h 22 additions, 0 deletionsarch/um/include/sysdep-x86_64/skas_ptrace.h
- arch/um/kernel/ptrace.c 9 additions, 7 deletionsarch/um/kernel/ptrace.c
- arch/um/kernel/skas/include/skas.h 2 additions, 1 deletionarch/um/kernel/skas/include/skas.h
- arch/um/kernel/skas/process.c 18 additions, 8 deletionsarch/um/kernel/skas/process.c
- arch/um/kernel/skas/trap_user.c 16 additions, 8 deletionsarch/um/kernel/skas/trap_user.c
- arch/um/kernel/trap_kern.c 16 additions, 9 deletionsarch/um/kernel/trap_kern.c
- arch/um/kernel/trap_user.c 6 additions, 7 deletionsarch/um/kernel/trap_user.c
- arch/um/kernel/tt/tracer.c 3 additions, 1 deletionarch/um/kernel/tt/tracer.c
- arch/um/kernel/tt/trap_user.c 6 additions, 0 deletionsarch/um/kernel/tt/trap_user.c
- arch/um/sys-i386/signal.c 6 additions, 11 deletionsarch/um/sys-i386/signal.c
Loading
Please register or sign in to comment