diff options
| author | alc <alc@FreeBSD.org> | 2006-08-11 17:18:58 +0000 |
|---|---|---|
| committer | alc <alc@FreeBSD.org> | 2006-08-11 17:18:58 +0000 |
| commit | b787cad1e08d4ef8d2fdcf4563a74659527e0c38 (patch) | |
| tree | e470cc32e0db72f622091ef888bdb6b54dbbfdbb | |
| parent | 0db8ebe1fbf093844168d1fe4ea8a4538d6fb2e1 (diff) | |
| download | FreeBSD-src-b787cad1e08d4ef8d2fdcf4563a74659527e0c38.zip FreeBSD-src-b787cad1e08d4ef8d2fdcf4563a74659527e0c38.tar.gz | |
Ensure that the page's new field for object-synchronized flags is always
initialized to zero.
Call vm_page_sleep_if_busy() instead of duplicating its implementation in
vm_page_grab().
| -rw-r--r-- | sys/vm/device_pager.c | 1 | ||||
| -rw-r--r-- | sys/vm/vm_page.c | 9 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c index 376badd..77f31a1 100644 --- a/sys/vm/device_pager.c +++ b/sys/vm/device_pager.c @@ -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; diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 8fd1538..8e4bf6f 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -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) |
