svn commit: r251359 - head/sys/vm
Alan Cox
alc at FreeBSD.org
Tue Jun 4 02:28:47 UTC 2013
Author: alc
Date: Tue Jun 4 02:28:47 2013
New Revision: 251359
URL: http://svnweb.freebsd.org/changeset/base/251359
Log:
Relax the object locking in vm_pageout_map_deactivate_pages() and
vm_pageout_object_deactivate_pages(). A read lock suffices.
Sponsored by: EMC / Isilon Storage Division
Modified:
head/sys/vm/vm_pageout.c
Modified: head/sys/vm/vm_pageout.c
==============================================================================
--- head/sys/vm/vm_pageout.c Tue Jun 4 02:25:25 2013 (r251358)
+++ head/sys/vm/vm_pageout.c Tue Jun 4 02:28:47 2013 (r251359)
@@ -714,13 +714,13 @@ vm_pageout_object_deactivate_pages(pmap_
vm_page_t p;
int actcount, remove_mode;
- VM_OBJECT_ASSERT_WLOCKED(first_object);
+ VM_OBJECT_ASSERT_LOCKED(first_object);
if ((first_object->flags & OBJ_FICTITIOUS) != 0)
return;
for (object = first_object;; object = backing_object) {
if (pmap_resident_count(pmap) <= desired)
goto unlock_return;
- VM_OBJECT_ASSERT_WLOCKED(object);
+ VM_OBJECT_ASSERT_LOCKED(object);
if ((object->flags & OBJ_UNMANAGED) != 0 ||
object->paging_in_progress != 0)
goto unlock_return;
@@ -776,13 +776,13 @@ vm_pageout_object_deactivate_pages(pmap_
}
if ((backing_object = object->backing_object) == NULL)
goto unlock_return;
- VM_OBJECT_WLOCK(backing_object);
+ VM_OBJECT_RLOCK(backing_object);
if (object != first_object)
- VM_OBJECT_WUNLOCK(object);
+ VM_OBJECT_RUNLOCK(object);
}
unlock_return:
if (object != first_object)
- VM_OBJECT_WUNLOCK(object);
+ VM_OBJECT_RUNLOCK(object);
}
/*
@@ -812,15 +812,15 @@ vm_pageout_map_deactivate_pages(map, des
while (tmpe != &map->header) {
if ((tmpe->eflags & MAP_ENTRY_IS_SUB_MAP) == 0) {
obj = tmpe->object.vm_object;
- if (obj != NULL && VM_OBJECT_TRYWLOCK(obj)) {
+ if (obj != NULL && VM_OBJECT_TRYRLOCK(obj)) {
if (obj->shadow_count <= 1 &&
(bigobj == NULL ||
bigobj->resident_page_count < obj->resident_page_count)) {
if (bigobj != NULL)
- VM_OBJECT_WUNLOCK(bigobj);
+ VM_OBJECT_RUNLOCK(bigobj);
bigobj = obj;
} else
- VM_OBJECT_WUNLOCK(obj);
+ VM_OBJECT_RUNLOCK(obj);
}
}
if (tmpe->wired_count > 0)
@@ -830,7 +830,7 @@ vm_pageout_map_deactivate_pages(map, des
if (bigobj != NULL) {
vm_pageout_object_deactivate_pages(map->pmap, bigobj, desired);
- VM_OBJECT_WUNLOCK(bigobj);
+ VM_OBJECT_RUNLOCK(bigobj);
}
/*
* Next, hunt around for other pages to deactivate. We actually
@@ -843,9 +843,9 @@ vm_pageout_map_deactivate_pages(map, des
if ((tmpe->eflags & MAP_ENTRY_IS_SUB_MAP) == 0) {
obj = tmpe->object.vm_object;
if (obj != NULL) {
- VM_OBJECT_WLOCK(obj);
+ VM_OBJECT_RLOCK(obj);
vm_pageout_object_deactivate_pages(map->pmap, obj, desired);
- VM_OBJECT_WUNLOCK(obj);
+ VM_OBJECT_RUNLOCK(obj);
}
}
tmpe = tmpe->next;
More information about the svn-src-head
mailing list