Author: alc
Date: Thu May 20 16:21:19 2010
New Revision: 208352
URL: http://svn.freebsd.org/changeset/base/208352
Log:
MFC r207306
Change vm_object_madvise() so that it checks whether the page is invalid
or unmanaged before acquiring the page queues lock. Neither of these
tests require that lock. Moreover, a better way of testing if the page
is unmanaged is to test the type of vm object. This avoids a pointless
vm_page_lookup().
Modified:
stable/8/sys/vm/vm_object.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
stable/8/sys/geom/sched/ (props changed)
Modified: stable/8/sys/vm/vm_object.c
==============================================================================
--- stable/8/sys/vm/vm_object.c Thu May 20 15:45:04 2010 (r208351)
+++ stable/8/sys/vm/vm_object.c Thu May 20 16:21:19 2010 (r208352)
@@ -1162,7 +1162,8 @@ shadowlookup:
(tobject->flags & OBJ_ONEMAPPING) == 0) {
goto unlock_tobject;
}
- }
+ } else if (tobject->type == OBJT_PHYS)
+ goto unlock_tobject;
m = vm_page_lookup(tobject, tpindex);
if (m == NULL && advise == MADV_WILLNEED) {
/*
@@ -1189,18 +1190,13 @@ shadowlookup:
VM_OBJECT_UNLOCK(tobject);
tobject = backing_object;
goto shadowlookup;
- }
+ } else if (m->valid != VM_PAGE_BITS_ALL)
+ goto unlock_tobject;
/*
- * If the page is busy or not in a normal active state,
- * we skip it. If the page is not managed there are no
- * page queues to mess with. Things can break if we mess
- * with pages in any of the below states.
+ * If the page is not in a normal state, skip it.
*/
vm_page_lock_queues();
- if (m->hold_count ||
- m->wire_count ||
- (m->flags & PG_UNMANAGED) ||
- m->valid != VM_PAGE_BITS_ALL) {
+ if (m->hold_count != 0 || m->wire_count != 0) {
vm_page_unlock_queues();
goto unlock_tobject;
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
