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

- Lock the vm_object when performing vm_object_pip_wakeupn().

Browse Source 
- Assert that the vm_object lock is held in vm_object_pip_wakeupn().
 - Add a new macro VM_OBJECT_LOCK_ASSERT().
This commit is contained in:
Alan Cox 2003-04-19 21:15:44 +00:00
parent ea08145b76
commit 0d420ad3e6
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/kern/vfs_bio.c
View File

@ -3193,8 +3193,11 @@ bufdone(struct buf *bp)
iosize -= resid;
}
vm_page_unlock_queues();
if (obj)
if (obj != NULL) {
VM_OBJECT_LOCK(obj);
vm_object_pip_wakeupn(obj, 0);
VM_OBJECT_UNLOCK(obj);
}
}
/*
@ -3231,6 +3234,7 @@ vfs_unbusy_pages(struct buf * bp)
vm_object_t obj;
obj = bp->b_object;
VM_OBJECT_LOCK(obj);
vm_page_lock_queues();
for (i = 0; i < bp->b_npages; i++) {
vm_page_t m = bp->b_pages[i];
@ -3249,6 +3253,7 @@ vfs_unbusy_pages(struct buf * bp)
}
vm_page_unlock_queues();
vm_object_pip_wakeupn(obj, 0);
VM_OBJECT_UNLOCK(obj);
}
}

5
sys/vm/swap_pager.c
View File

@ -1613,8 +1613,11 @@ swp_pager_async_iodone(bp)
* adjust pip. NOTE: the original parent may still have its own
* pip refs on the object.
*/
if (object)
if (object != NULL) {
VM_OBJECT_LOCK(object);
vm_object_pip_wakeupn(object, bp->b_npages);
VM_OBJECT_UNLOCK(object);
}
/*
* release the physical I/O buffer

1
sys/vm/vm_object.c
View File

@ -296,6 +296,7 @@ void
vm_object_pip_wakeupn(vm_object_t object, short i)
{
GIANT_REQUIRED;
VM_OBJECT_LOCK_ASSERT(object, MA_OWNED);
if (i)
object->paging_in_progress -= i;
if ((object->flags & OBJ_PIPWNT) && object->paging_in_progress == 0) {

2
sys/vm/vm_object.h
View File

@ -171,6 +171,8 @@ extern vm_object_t kernel_object; /* the single kernel object */
extern vm_object_t kmem_object;
#define VM_OBJECT_LOCK(object) mtx_lock(&(object)->mtx)
#define VM_OBJECT_LOCK_ASSERT(object, type) \
mtx_assert(&(object)->mtx, (type))
#define VM_OBJECT_UNLOCK(object) mtx_unlock(&(object)->mtx)
#define vm_object_lock(object) \