upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Lock the vm_object when performing vm_object_pip_subtract().

Browse source 
- Assert that the vm_object lock is held in vm_object_pip_subtract().
This commit is contained in:
Alan Cox 2003-04-19 22:11:41 +00:00
parent 0d420ad3e6
commit 0fa05eae77
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sys/kern/vfs_bio.c
View file

@ -3106,6 +3106,8 @@ bufdone(struct buf *bp)
KASSERT(bp->b_offset != NOOFFSET,
("biodone: no buffer offset"));
if (obj != NULL)
VM_OBJECT_LOCK(obj);
#if defined(VFS_BIO_DEBUG)
if (obj->paging_in_progress < bp->b_npages) {
printf("biodone: paging in progress(%d) < bp->b_npages(%d)\n",
@ -3194,7 +3196,6 @@ bufdone(struct buf *bp)
}
vm_page_unlock_queues();
if (obj != NULL) {
VM_OBJECT_LOCK(obj);
vm_object_pip_wakeupn(obj, 0);
VM_OBJECT_UNLOCK(obj);
}

4
sys/vm/swap_pager.c
View file

@ -1693,7 +1693,9 @@ swp_pager_force_pagein(struct swblock *swap, int idx)
vm_object_pip_add(object, 1);
m = vm_page_grab(object, pindex + idx, VM_ALLOC_NORMAL|VM_ALLOC_RETRY);
if (m->valid == VM_PAGE_BITS_ALL) {
VM_OBJECT_LOCK(object);
vm_object_pip_subtract(object, 1);
VM_OBJECT_UNLOCK(object);
vm_page_lock_queues();
vm_page_activate(m);
vm_page_dirty(m);
@ -1706,7 +1708,9 @@ swp_pager_force_pagein(struct swblock *swap, int idx)
if (swap_pager_getpages(object, &m, 1, 0) !=
VM_PAGER_OK)
panic("swap_pager_force_pagein: read from swap failed");/*XXX*/
VM_OBJECT_LOCK(object);
vm_object_pip_subtract(object, 1);
VM_OBJECT_UNLOCK(object);
vm_page_lock_queues();
vm_page_dirty(m);

1
sys/vm/vm_object.c
View file

@ -277,6 +277,7 @@ void
vm_object_pip_subtract(vm_object_t object, short i)
{
GIANT_REQUIRED;
VM_OBJECT_LOCK_ASSERT(object, MA_OWNED);
object->paging_in_progress -= i;
}