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

Undo part of the scalability commit. Many of the changes

Browse Source 
in vm_fault had some performance enhancements not ready
for prime time.  This commit backs out some of the changes.
This commit is contained in:
John Dyson 1996-07-28 01:14:01 +00:00
parent 94a04fd972
commit f230c45cbe
1 changed files with 15 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
sys/vm/vm_fault.c
View File

@ -66,7 +66,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
* $Id: vm_fault.c,v 1.53 1996/07/02 02:07:59 dyson Exp $
* $Id: vm_fault.c,v 1.54 1996/07/27 03:23:52 dyson Exp $
*/
/*
@ -293,7 +293,8 @@ RetryFault:;
m->flags |= PG_BUSY;
if (((m->valid & VM_PAGE_BITS_ALL) != VM_PAGE_BITS_ALL) &&
if (m->valid &&
((m->valid & VM_PAGE_BITS_ALL) != VM_PAGE_BITS_ALL) &&
m->object != kernel_object && m->object != kmem_object) {
goto readrest;
}
@ -395,18 +396,20 @@ RetryFault:;
reqpage) : VM_PAGER_FAIL;
if (rv == VM_PAGER_OK) {
/*
* Found the page. Leave it busy while we play
* with it.
*/
/*
* Relookup in case pager changed page. Pager
* is responsible for disposition of old page
* if moved.
*/
if ((m->object != object) || (m->pindex != pindex) ||
(m->flags & PG_TABLED) == 0) {
m = vm_page_lookup(object, pindex);
if( !m) {
UNLOCK_AND_DEALLOCATE;
goto RetryFault;
}
m = vm_page_lookup(object, pindex);
if( !m) {
UNLOCK_AND_DEALLOCATE;
goto RetryFault;
}
hardfault++;
@ -478,26 +481,9 @@ RetryFault:;
}
first_m = NULL;
if ((m->flags & PG_ZERO) == 0) {
if (vm_page_zero_count) {
vm_page_protect(m, VM_PROT_NONE);
PAGE_WAKEUP(m);
vm_page_free(m);
m = vm_page_alloc(object, pindex, VM_ALLOC_ZERO);
if (!m)
panic("vm_fault: missing zero page");
/*
* This should not be true, but just in case...
*/
if ((m->flags & PG_ZERO) == 0) {
vm_page_zero_fill(m);
cnt.v_zfod++;
}
} else {
vm_page_zero_fill(m);
cnt.v_zfod++;
}
}
if ((m->flags & PG_ZERO) == 0)
vm_page_zero_fill(m);
cnt.v_zfod++;
break;
} else {
if (object != first_object) {