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

Ensure that the page's new field for object-synchronized flags is always

Browse Source 
initialized to zero.

Call vm_page_sleep_if_busy() instead of duplicating its implementation in
vm_page_grab().
This commit is contained in:
Alan Cox 2006-08-11 17:18:58 +00:00
parent b21860b5d0
commit 25017df472
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/vm/device_pager.c
View File

@ -296,6 +296,7 @@ dev_pager_getfake(paddr)
m = uma_zalloc(fakepg_zone, M_WAITOK);
m->flags = PG_BUSY | PG_FICTITIOUS;
m->oflags = 0;
m->valid = VM_PAGE_BITS_ALL;
m->dirty = 0;
m->busy = 0;

9
sys/vm/vm_page.c
View File

@ -932,6 +932,7 @@ loop:
if (req & (VM_ALLOC_NOBUSY | VM_ALLOC_NOOBJ))
flags &= ~PG_BUSY;
m->flags = flags;
m->oflags = 0;
if (req & VM_ALLOC_WIRED) {
atomic_add_int(&cnt.v_wire_count, 1);
m->wire_count = 1;
@ -1478,16 +1479,12 @@ vm_page_grab(vm_object_t object, vm_pindex_t pindex, int allocflags)
VM_OBJECT_LOCK_ASSERT(object, MA_OWNED);
retrylookup:
if ((m = vm_page_lookup(object, pindex)) != NULL) {
vm_page_lock_queues();
if (m->busy || (m->flags & PG_BUSY)) {
vm_page_flag_set(m, PG_REFERENCED);
vm_page_unlock_queues();
m->oflags |= VPO_WANTED;
msleep(m, VM_OBJECT_MTX(m->object), PVM, "pgrbwt", 0);
if (vm_page_sleep_if_busy(m, TRUE, "pgrbwt")) {
if ((allocflags & VM_ALLOC_RETRY) == 0)
return (NULL);
goto retrylookup;
} else {
vm_page_lock_queues();
if (allocflags & VM_ALLOC_WIRED)
vm_page_wire(m);
if ((allocflags & VM_ALLOC_NOBUSY) == 0)