c578455a3e
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>
48 lines
1.7 KiB
C
48 lines
1.7 KiB
C
/*
|
|
* Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
|
|
* Licensed under the GPL
|
|
*/
|
|
|
|
#ifndef __SKAS_H
|
|
#define __SKAS_H
|
|
|
|
#include "sysdep/ptrace.h"
|
|
|
|
extern int userspace_pid[];
|
|
|
|
extern void switch_threads(void *me, void *next);
|
|
extern void thread_wait(void *sw, void *fb);
|
|
extern void new_thread(void *stack, void **switch_buf_ptr, void **fork_buf_ptr,
|
|
void (*handler)(int));
|
|
extern int start_idle_thread(void *stack, void *switch_buf_ptr,
|
|
void **fork_buf_ptr);
|
|
extern int user_thread(unsigned long stack, int flags);
|
|
extern void userspace(union uml_pt_regs *regs);
|
|
extern void new_thread_proc(void *stack, void (*handler)(int sig));
|
|
extern void remove_sigstack(void);
|
|
extern void new_thread_handler(int sig);
|
|
extern void handle_syscall(union uml_pt_regs *regs);
|
|
extern void map(int fd, unsigned long virt, unsigned long len, int r, int w,
|
|
int x, int phys_fd, unsigned long long offset);
|
|
extern int unmap(int fd, void *addr, unsigned long len);
|
|
extern int protect(int fd, unsigned long addr, unsigned long len,
|
|
int r, int w, int x);
|
|
extern void user_signal(int sig, union uml_pt_regs *regs, int pid);
|
|
extern int new_mm(int from);
|
|
extern void start_userspace(int cpu);
|
|
extern void get_skas_faultinfo(int pid, struct faultinfo * fi);
|
|
extern long execute_syscall_skas(void *r);
|
|
|
|
#endif
|
|
|
|
/*
|
|
* Overrides for Emacs so that we follow Linus's tabbing style.
|
|
* Emacs will notice this stuff at the end of the file and automatically
|
|
* adjust the settings for this buffer only. This must remain at the end
|
|
* of the file.
|
|
* ---------------------------------------------------------------------------
|
|
* Local variables:
|
|
* c-file-style: "linux"
|
|
* End:
|
|
*/
|