d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify the vm fault trap handling code a bit by using if-else instead of

Browse Source 
duplicating code in the then case and then using a goto to jump around
the else case.
This commit is contained in:
jhb 2001-05-11 23:50:08 +00:00
parent bba3cec519
commit c20ad9aee2
4 changed files with 49 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
sys/amd64/amd64/trap.c
View File

@ -743,16 +743,11 @@ trap_pfault(frame, usermode, eva)
* a growable stack region, or if the stack
* growth succeeded.
*/
if (!grow_stack (p, va)) {
if (!grow_stack (p, va))
rv = KERN_FAILURE;
PROC_LOCK(p);
--p->p_lock;
PROC_UNLOCK(p);
goto nogo;
}
/* Fault in the user page: */
rv = vm_fault(map, va, ftype,
else
/* Fault in the user page: */
rv = vm_fault(map, va, ftype,
(ftype & VM_PROT_WRITE) ? VM_FAULT_DIRTY
: VM_FAULT_NORMAL);
@ -864,16 +859,11 @@ trap_pfault(frame, usermode, eva)
* a growable stack region, or if the stack
* growth succeeded.
*/
if (!grow_stack (p, va)) {
if (!grow_stack (p, va))
rv = KERN_FAILURE;
PROC_LOCK(p);
--p->p_lock;
PROC_UNLOCK(p);
goto nogo;
}
/* Fault in the user page: */
rv = vm_fault(map, va, ftype,
else
/* Fault in the user page: */
rv = vm_fault(map, va, ftype,
(ftype & VM_PROT_WRITE) ? VM_FAULT_DIRTY
: VM_FAULT_NORMAL);
@ -1044,17 +1034,13 @@ int trapwrite(addr)
++p->p_lock;
PROC_UNLOCK(p);
if (!grow_stack (p, va)) {
PROC_LOCK(p);
--p->p_lock;
PROC_UNLOCK(p);
return (1);
}
/*
* fault the data page
*/
rv = vm_fault(&vm->vm_map, va, VM_PROT_WRITE, VM_FAULT_DIRTY);
if (!grow_stack (p, va))
rv = KERN_FAILURE;
else
/*
* fault the data page
*/
rv = vm_fault(&vm->vm_map, va, VM_PROT_WRITE, VM_FAULT_DIRTY);
PROC_LOCK(p);
--p->p_lock;

44
sys/i386/i386/trap.c
View File

@ -743,16 +743,11 @@ trap_pfault(frame, usermode, eva)
* a growable stack region, or if the stack
* growth succeeded.
*/
if (!grow_stack (p, va)) {
if (!grow_stack (p, va))
rv = KERN_FAILURE;
PROC_LOCK(p);
--p->p_lock;
PROC_UNLOCK(p);
goto nogo;
}
/* Fault in the user page: */
rv = vm_fault(map, va, ftype,
else
/* Fault in the user page: */
rv = vm_fault(map, va, ftype,
(ftype & VM_PROT_WRITE) ? VM_FAULT_DIRTY
: VM_FAULT_NORMAL);
@ -864,16 +859,11 @@ trap_pfault(frame, usermode, eva)
* a growable stack region, or if the stack
* growth succeeded.
*/
if (!grow_stack (p, va)) {
if (!grow_stack (p, va))
rv = KERN_FAILURE;
PROC_LOCK(p);
--p->p_lock;
PROC_UNLOCK(p);
goto nogo;
}
/* Fault in the user page: */
rv = vm_fault(map, va, ftype,
else
/* Fault in the user page: */
rv = vm_fault(map, va, ftype,
(ftype & VM_PROT_WRITE) ? VM_FAULT_DIRTY
: VM_FAULT_NORMAL);
@ -1044,17 +1034,13 @@ int trapwrite(addr)
++p->p_lock;
PROC_UNLOCK(p);
if (!grow_stack (p, va)) {
PROC_LOCK(p);
--p->p_lock;
PROC_UNLOCK(p);
return (1);
}
/*
* fault the data page
*/
rv = vm_fault(&vm->vm_map, va, VM_PROT_WRITE, VM_FAULT_DIRTY);
if (!grow_stack (p, va))
rv = KERN_FAILURE;
else
/*
* fault the data page
*/
rv = vm_fault(&vm->vm_map, va, VM_PROT_WRITE, VM_FAULT_DIRTY);
PROC_LOCK(p);
--p->p_lock;

15
sys/ia64/ia64/trap.c
View File

@ -396,17 +396,11 @@ trap(int vector, int imm, struct trapframe *framep)
* a growable stack region, or if the stack
* growth succeeded.
*/
if (!grow_stack (p, va)) {
if (!grow_stack (p, va))
rv = KERN_FAILURE;
PROC_LOCK(p);
--p->p_lock;
PROC_UNLOCK(p);
goto nogo;
}
/* Fault in the user page: */
rv = vm_fault(map, va, ftype,
else
/* Fault in the user page: */
rv = vm_fault(map, va, ftype,
(ftype & VM_PROT_WRITE)
? VM_FAULT_DIRTY
: VM_FAULT_NORMAL);
@ -422,7 +416,6 @@ trap(int vector, int imm, struct trapframe *framep)
rv = vm_fault(map, va, ftype, VM_FAULT_NORMAL);
}
nogo:;
/*
* If this was a stack access we keep track of the
* maximum accessed stack size. Also, if vm_fault

44
sys/kern/subr_trap.c
View File

@ -743,16 +743,11 @@ trap_pfault(frame, usermode, eva)
* a growable stack region, or if the stack
* growth succeeded.
*/
if (!grow_stack (p, va)) {
if (!grow_stack (p, va))
rv = KERN_FAILURE;
PROC_LOCK(p);
--p->p_lock;
PROC_UNLOCK(p);
goto nogo;
}
/* Fault in the user page: */
rv = vm_fault(map, va, ftype,
else
/* Fault in the user page: */
rv = vm_fault(map, va, ftype,
(ftype & VM_PROT_WRITE) ? VM_FAULT_DIRTY
: VM_FAULT_NORMAL);
@ -864,16 +859,11 @@ trap_pfault(frame, usermode, eva)
* a growable stack region, or if the stack
* growth succeeded.
*/
if (!grow_stack (p, va)) {
if (!grow_stack (p, va))
rv = KERN_FAILURE;
PROC_LOCK(p);
--p->p_lock;
PROC_UNLOCK(p);
goto nogo;
}
/* Fault in the user page: */
rv = vm_fault(map, va, ftype,
else
/* Fault in the user page: */
rv = vm_fault(map, va, ftype,
(ftype & VM_PROT_WRITE) ? VM_FAULT_DIRTY
: VM_FAULT_NORMAL);
@ -1044,17 +1034,13 @@ int trapwrite(addr)
++p->p_lock;
PROC_UNLOCK(p);
if (!grow_stack (p, va)) {
PROC_LOCK(p);
--p->p_lock;
PROC_UNLOCK(p);
return (1);
}
/*
* fault the data page
*/
rv = vm_fault(&vm->vm_map, va, VM_PROT_WRITE, VM_FAULT_DIRTY);
if (!grow_stack (p, va))
rv = KERN_FAILURE;
else
/*
* fault the data page
*/
rv = vm_fault(&vm->vm_map, va, VM_PROT_WRITE, VM_FAULT_DIRTY);
PROC_LOCK(p);
--p->p_lock;