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

Acquire the page lock around vm_page_wire() in vm_page_grab().

Browse Source 
Assert that the page lock is held in vm_page_wire().
This commit is contained in:
alc 2010-05-03 17:55:32 +00:00
parent 0ec9744723
commit 33bb944de8
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/vm/vm_page.c
View File

@ -1544,6 +1544,7 @@ vm_page_wire(vm_page_t m)
* it is already off the queues).
*/
mtx_assert(&vm_page_queue_mtx, MA_OWNED);
vm_page_lock_assert(m, MA_OWNED);
if (m->flags & PG_FICTITIOUS)
return;
if (m->wire_count == 0) {
@ -1914,9 +1915,11 @@ vm_page_grab(vm_object_t object, vm_pindex_t pindex, int allocflags)
goto retrylookup;
} else {
if ((allocflags & VM_ALLOC_WIRED) != 0) {
vm_page_lock(m);
vm_page_lock_queues();
vm_page_wire(m);
vm_page_unlock_queues();
vm_page_unlock(m);
}
if ((allocflags & VM_ALLOC_NOBUSY) == 0)
vm_page_busy(m);