2006-01-08 02:01:31 -07:00
|
|
|
/*
|
2005-04-16 16:20:36 -06:00
|
|
|
* Copyright (C) 2000, 2001 Jeff Dike (jdike@karaya.com)
|
|
|
|
* Licensed under the GPL
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "linux/kernel.h"
|
|
|
|
#include "asm/errno.h"
|
|
|
|
#include "linux/sched.h"
|
|
|
|
#include "linux/mm.h"
|
|
|
|
#include "linux/spinlock.h"
|
|
|
|
#include "linux/config.h"
|
|
|
|
#include "linux/init.h"
|
|
|
|
#include "linux/ptrace.h"
|
|
|
|
#include "asm/semaphore.h"
|
|
|
|
#include "asm/pgtable.h"
|
|
|
|
#include "asm/pgalloc.h"
|
|
|
|
#include "asm/tlbflush.h"
|
|
|
|
#include "asm/a.out.h"
|
|
|
|
#include "asm/current.h"
|
|
|
|
#include "asm/irq.h"
|
2005-09-22 22:44:16 -06:00
|
|
|
#include "sysdep/sigcontext.h"
|
2005-04-16 16:20:36 -06:00
|
|
|
#include "user_util.h"
|
|
|
|
#include "kern_util.h"
|
|
|
|
#include "kern.h"
|
|
|
|
#include "chan_kern.h"
|
|
|
|
#include "mconsole_kern.h"
|
|
|
|
#include "mem.h"
|
|
|
|
#include "mem_kern.h"
|
2006-01-08 02:01:32 -07:00
|
|
|
#include "sysdep/sigcontext.h"
|
|
|
|
#include "sysdep/ptrace.h"
|
|
|
|
#include "os.h"
|
2005-09-30 12:58:59 -06:00
|
|
|
#ifdef CONFIG_MODE_SKAS
|
|
|
|
#include "skas.h"
|
|
|
|
#endif
|
2006-01-08 02:01:31 -07:00
|
|
|
#include "os.h"
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2005-09-03 16:57:26 -06:00
|
|
|
/* Note this is constrained to return 0, -EFAULT, -EACCESS, -ENOMEM by segv(). */
|
2006-07-10 05:45:13 -06:00
|
|
|
int handle_page_fault(unsigned long address, unsigned long ip,
|
2005-04-16 16:20:36 -06:00
|
|
|
int is_write, int is_user, int *code_out)
|
|
|
|
{
|
|
|
|
struct mm_struct *mm = current->mm;
|
|
|
|
struct vm_area_struct *vma;
|
|
|
|
pgd_t *pgd;
|
|
|
|
pud_t *pud;
|
|
|
|
pmd_t *pmd;
|
|
|
|
pte_t *pte;
|
|
|
|
int err = -EFAULT;
|
|
|
|
|
|
|
|
*code_out = SEGV_MAPERR;
|
2005-09-22 22:44:20 -06:00
|
|
|
|
|
|
|
/* If the fault was during atomic operation, don't take the fault, just
|
|
|
|
* fail. */
|
|
|
|
if (in_atomic())
|
|
|
|
goto out_nosemaphore;
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
down_read(&mm->mmap_sem);
|
|
|
|
vma = find_vma(mm, address);
|
2006-07-10 05:45:13 -06:00
|
|
|
if(!vma)
|
2005-04-16 16:20:36 -06:00
|
|
|
goto out;
|
2006-07-10 05:45:13 -06:00
|
|
|
else if(vma->vm_start <= address)
|
2005-04-16 16:20:36 -06:00
|
|
|
goto good_area;
|
2006-07-10 05:45:13 -06:00
|
|
|
else if(!(vma->vm_flags & VM_GROWSDOWN))
|
2005-04-16 16:20:36 -06:00
|
|
|
goto out;
|
2005-05-06 22:30:55 -06:00
|
|
|
else if(is_user && !ARCH_IS_STACKGROW(address))
|
2005-04-16 16:20:36 -06:00
|
|
|
goto out;
|
2006-07-10 05:45:13 -06:00
|
|
|
else if(expand_stack(vma, address))
|
2005-04-16 16:20:36 -06:00
|
|
|
goto out;
|
|
|
|
|
2005-09-03 16:57:26 -06:00
|
|
|
good_area:
|
2005-04-16 16:20:36 -06:00
|
|
|
*code_out = SEGV_ACCERR;
|
2006-07-10 05:45:13 -06:00
|
|
|
if(is_write && !(vma->vm_flags & VM_WRITE))
|
2005-04-16 16:20:36 -06:00
|
|
|
goto out;
|
2005-05-20 14:59:08 -06:00
|
|
|
|
2005-09-10 11:44:57 -06:00
|
|
|
/* Don't require VM_READ|VM_EXEC for write faults! */
|
|
|
|
if(!is_write && !(vma->vm_flags & (VM_READ | VM_EXEC)))
|
2005-05-20 14:59:08 -06:00
|
|
|
goto out;
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
do {
|
2005-09-03 16:57:26 -06:00
|
|
|
survive:
|
2005-04-16 16:20:36 -06:00
|
|
|
switch (handle_mm_fault(mm, vma, address, is_write)){
|
|
|
|
case VM_FAULT_MINOR:
|
|
|
|
current->min_flt++;
|
|
|
|
break;
|
|
|
|
case VM_FAULT_MAJOR:
|
|
|
|
current->maj_flt++;
|
|
|
|
break;
|
|
|
|
case VM_FAULT_SIGBUS:
|
|
|
|
err = -EACCES;
|
|
|
|
goto out;
|
|
|
|
case VM_FAULT_OOM:
|
|
|
|
err = -ENOMEM;
|
|
|
|
goto out_of_memory;
|
|
|
|
default:
|
|
|
|
BUG();
|
|
|
|
}
|
2005-09-03 16:57:26 -06:00
|
|
|
pgd = pgd_offset(mm, address);
|
|
|
|
pud = pud_offset(pgd, address);
|
|
|
|
pmd = pmd_offset(pud, address);
|
|
|
|
pte = pte_offset_kernel(pmd, address);
|
2005-04-16 16:20:36 -06:00
|
|
|
} while(!pte_present(*pte));
|
|
|
|
err = 0;
|
[PATCH] uml: remove bogus WARN_ON, triggerable harmlessly on a page fault race
The below warning was added in place of pte_mkyoung(); if (is_write)
pte_mkdirty();
In fact, if the PTE is not marked young/dirty, our dirty/accessed bit
emulation would cause the TLB permission not to be changed, and so we'd loop,
and given we don't support preemption yet, we'd busy-hang here.
However, I've seen this warning trigger without crashes during a loop of
concurrent kernel builds, at random times (i.e. like a race condition), and I
realized that two concurrent faults on the same page, one on read and one on
write, can trigger it. The read fault gets serviced and the PTE gets marked
writable but clean (it's possible on a shared-writable mapping), while the
generic code sees the PTE was already installed and returns without action. In
this case, we'll see another fault and service it normally.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Acked-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-11-13 17:07:04 -07:00
|
|
|
/* The below warning was added in place of
|
|
|
|
* pte_mkyoung(); if (is_write) pte_mkdirty();
|
|
|
|
* If it's triggered, we'd see normally a hang here (a clean pte is
|
|
|
|
* marked read-only to emulate the dirty bit).
|
|
|
|
* However, the generic code can mark a PTE writable but clean on a
|
|
|
|
* concurrent read fault, triggering this harmlessly. So comment it out.
|
|
|
|
*/
|
|
|
|
#if 0
|
2005-09-10 11:44:58 -06:00
|
|
|
WARN_ON(!pte_young(*pte) || (is_write && !pte_dirty(*pte)));
|
[PATCH] uml: remove bogus WARN_ON, triggerable harmlessly on a page fault race
The below warning was added in place of pte_mkyoung(); if (is_write)
pte_mkdirty();
In fact, if the PTE is not marked young/dirty, our dirty/accessed bit
emulation would cause the TLB permission not to be changed, and so we'd loop,
and given we don't support preemption yet, we'd busy-hang here.
However, I've seen this warning trigger without crashes during a loop of
concurrent kernel builds, at random times (i.e. like a race condition), and I
realized that two concurrent faults on the same page, one on read and one on
write, can trigger it. The read fault gets serviced and the PTE gets marked
writable but clean (it's possible on a shared-writable mapping), while the
generic code sees the PTE was already installed and returns without action. In
this case, we'll see another fault and service it normally.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Acked-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-11-13 17:07:04 -07:00
|
|
|
#endif
|
2005-09-03 16:57:26 -06:00
|
|
|
flush_tlb_page(vma, address);
|
|
|
|
out:
|
2005-04-16 16:20:36 -06:00
|
|
|
up_read(&mm->mmap_sem);
|
2005-09-22 22:44:20 -06:00
|
|
|
out_nosemaphore:
|
2005-04-16 16:20:36 -06:00
|
|
|
return(err);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We ran out of memory, or some other thing happened to us that made
|
|
|
|
* us unable to handle the page fault gracefully.
|
|
|
|
*/
|
|
|
|
out_of_memory:
|
|
|
|
if (current->pid == 1) {
|
|
|
|
up_read(&mm->mmap_sem);
|
|
|
|
yield();
|
|
|
|
down_read(&mm->mmap_sem);
|
|
|
|
goto survive;
|
|
|
|
}
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2006-01-08 02:01:32 -07:00
|
|
|
void segv_handler(int sig, union uml_pt_regs *regs)
|
|
|
|
{
|
|
|
|
struct faultinfo * fi = UPT_FAULTINFO(regs);
|
|
|
|
|
|
|
|
if(UPT_IS_USER(regs) && !SEGV_IS_FIXABLE(fi)){
|
|
|
|
bad_segv(*fi, UPT_IP(regs));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
segv(*fi, UPT_IP(regs), UPT_IS_USER(regs), regs);
|
|
|
|
}
|
|
|
|
|
2006-01-08 02:01:31 -07:00
|
|
|
struct kern_handlers handlinfo_kern = {
|
|
|
|
.relay_signal = relay_signal,
|
|
|
|
.winch = winch,
|
|
|
|
.bus_handler = relay_signal,
|
|
|
|
.page_fault = segv_handler,
|
|
|
|
.sigio_handler = sigio_handler,
|
|
|
|
.timer_handler = timer_handler
|
|
|
|
};
|
[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>
2005-05-05 17:15:31 -06:00
|
|
|
/*
|
|
|
|
* We give a *copy* of the faultinfo in the regs to segv.
|
|
|
|
* This must be done, since nesting SEGVs could overwrite
|
|
|
|
* the info in the regs. A pointer to the info then would
|
|
|
|
* give us bad data!
|
|
|
|
*/
|
|
|
|
unsigned long segv(struct faultinfo fi, unsigned long ip, int is_user, void *sc)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
|
|
|
struct siginfo si;
|
|
|
|
void *catcher;
|
|
|
|
int err;
|
[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>
2005-05-05 17:15:31 -06:00
|
|
|
int is_write = FAULT_WRITE(fi);
|
|
|
|
unsigned long address = FAULT_ADDRESS(fi);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
if(!is_user && (address >= start_vm) && (address < end_vm)){
|
|
|
|
flush_tlb_kernel_vm();
|
|
|
|
return(0);
|
|
|
|
}
|
|
|
|
else if(current->mm == NULL)
|
|
|
|
panic("Segfault with no mm");
|
2005-09-22 22:44:16 -06:00
|
|
|
|
2005-09-30 12:58:59 -06:00
|
|
|
if (SEGV_IS_FIXABLE(&fi) || SEGV_MAYBE_FIXABLE(&fi))
|
2005-09-22 22:44:16 -06:00
|
|
|
err = handle_page_fault(address, ip, is_write, is_user, &si.si_code);
|
|
|
|
else {
|
|
|
|
err = -EFAULT;
|
|
|
|
/* A thread accessed NULL, we get a fault, but CR2 is invalid.
|
|
|
|
* This code is used in __do_copy_from_user() of TT mode. */
|
|
|
|
address = 0;
|
|
|
|
}
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
catcher = current->thread.fault_catcher;
|
|
|
|
if(!err)
|
|
|
|
return(0);
|
|
|
|
else if(catcher != NULL){
|
|
|
|
current->thread.fault_addr = (void *) address;
|
|
|
|
do_longjmp(catcher, 1);
|
2006-07-10 05:45:13 -06:00
|
|
|
}
|
2005-04-16 16:20:36 -06:00
|
|
|
else if(current->thread.fault_addr != NULL)
|
|
|
|
panic("fault_addr set but no fault catcher");
|
[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>
2005-05-05 17:15:31 -06:00
|
|
|
else if(!is_user && arch_fixup(ip, sc))
|
2005-04-16 16:20:36 -06:00
|
|
|
return(0);
|
|
|
|
|
2006-07-10 05:45:13 -06:00
|
|
|
if(!is_user)
|
|
|
|
panic("Kernel mode fault at addr 0x%lx, ip 0x%lx",
|
2005-04-16 16:20:36 -06:00
|
|
|
address, ip);
|
|
|
|
|
2005-09-03 16:57:26 -06:00
|
|
|
if (err == -EACCES) {
|
2005-04-16 16:20:36 -06:00
|
|
|
si.si_signo = SIGBUS;
|
|
|
|
si.si_errno = 0;
|
|
|
|
si.si_code = BUS_ADRERR;
|
2006-03-31 03:30:15 -07:00
|
|
|
si.si_addr = (void __user *)address;
|
[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>
2005-05-05 17:15:31 -06:00
|
|
|
current->thread.arch.faultinfo = fi;
|
2005-04-16 16:20:36 -06:00
|
|
|
force_sig_info(SIGBUS, &si, current);
|
2005-09-03 16:57:26 -06:00
|
|
|
} else if (err == -ENOMEM) {
|
2005-04-16 16:20:36 -06:00
|
|
|
printk("VM: killing process %s\n", current->comm);
|
|
|
|
do_exit(SIGKILL);
|
2005-09-03 16:57:26 -06:00
|
|
|
} else {
|
|
|
|
BUG_ON(err != -EFAULT);
|
2005-04-16 16:20:36 -06:00
|
|
|
si.si_signo = SIGSEGV;
|
2006-03-31 03:30:15 -07:00
|
|
|
si.si_addr = (void __user *) address;
|
[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>
2005-05-05 17:15:31 -06:00
|
|
|
current->thread.arch.faultinfo = fi;
|
2005-04-16 16:20:36 -06:00
|
|
|
force_sig_info(SIGSEGV, &si, current);
|
|
|
|
}
|
|
|
|
return(0);
|
|
|
|
}
|
|
|
|
|
[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>
2005-05-05 17:15:31 -06:00
|
|
|
void bad_segv(struct faultinfo fi, unsigned long ip)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
|
|
|
struct siginfo si;
|
|
|
|
|
|
|
|
si.si_signo = SIGSEGV;
|
|
|
|
si.si_code = SEGV_ACCERR;
|
2006-03-31 03:30:15 -07:00
|
|
|
si.si_addr = (void __user *) FAULT_ADDRESS(fi);
|
|
|
|
current->thread.arch.faultinfo = fi;
|
2005-04-16 16:20:36 -06:00
|
|
|
force_sig_info(SIGSEGV, &si, current);
|
|
|
|
}
|
|
|
|
|
|
|
|
void relay_signal(int sig, union uml_pt_regs *regs)
|
|
|
|
{
|
|
|
|
if(arch_handle_signal(sig, regs)) return;
|
|
|
|
if(!UPT_IS_USER(regs))
|
|
|
|
panic("Kernel mode signal %d", sig);
|
[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>
2005-05-05 17:15:31 -06:00
|
|
|
current->thread.arch.faultinfo = *UPT_FAULTINFO(regs);
|
2005-04-16 16:20:36 -06:00
|
|
|
force_sig(sig, current);
|
|
|
|
}
|
|
|
|
|
|
|
|
void bus_handler(int sig, union uml_pt_regs *regs)
|
|
|
|
{
|
|
|
|
if(current->thread.fault_catcher != NULL)
|
|
|
|
do_longjmp(current->thread.fault_catcher, 1);
|
|
|
|
else relay_signal(sig, regs);
|
|
|
|
}
|
|
|
|
|
|
|
|
void winch(int sig, union uml_pt_regs *regs)
|
|
|
|
{
|
|
|
|
do_IRQ(WINCH_IRQ, regs);
|
|
|
|
}
|
|
|
|
|
|
|
|
void trap_init(void)
|
|
|
|
{
|
|
|
|
}
|