diff options
author | alc <alc@FreeBSD.org> | 2006-08-03 23:56:11 +0000 |
---|---|---|
committer | alc <alc@FreeBSD.org> | 2006-08-03 23:56:11 +0000 |
commit | cbc0dafbb208890d3f87d3708214d2da7160fbc0 (patch) | |
tree | 72d495cef45b746e3ac61ac295e7373ef7730fe8 /sys/vm/vm_page.c | |
parent | aac2334c62b88a10820be86f7cbd57f3edd542fb (diff) | |
download | FreeBSD-src-cbc0dafbb208890d3f87d3708214d2da7160fbc0.zip FreeBSD-src-cbc0dafbb208890d3f87d3708214d2da7160fbc0.tar.gz |
When sleeping on a busy page, use the lock from the containing object
rather than the global page queues lock.
Diffstat (limited to 'sys/vm/vm_page.c')
-rw-r--r-- | sys/vm/vm_page.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index af77ada..5905ee1 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -495,12 +495,13 @@ vm_page_free_zero(vm_page_t m) int vm_page_sleep_if_busy(vm_page_t m, int also_m_busy, const char *msg) { - vm_object_t object; mtx_assert(&vm_page_queue_mtx, MA_OWNED); VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED); if ((m->flags & PG_BUSY) || (also_m_busy && m->busy)) { vm_page_flag_set(m, PG_WANTED | PG_REFERENCED); + vm_page_unlock_queues(); + /* * It's possible that while we sleep, the page will get * unbusied and freed. If we are holding the object @@ -508,10 +509,7 @@ vm_page_sleep_if_busy(vm_page_t m, int also_m_busy, const char *msg) * such that even if m->object changes, we can re-lock * it. */ - object = m->object; - VM_OBJECT_UNLOCK(object); - msleep(m, &vm_page_queue_mtx, PDROP | PVM, msg, 0); - VM_OBJECT_LOCK(object); + msleep(m, VM_OBJECT_MTX(m->object), PVM, msg, 0); return (TRUE); } return (FALSE); @@ -1482,9 +1480,8 @@ retrylookup: vm_page_lock_queues(); if (m->busy || (m->flags & PG_BUSY)) { vm_page_flag_set(m, PG_WANTED | PG_REFERENCED); - VM_OBJECT_UNLOCK(object); - msleep(m, &vm_page_queue_mtx, PDROP | PVM, "pgrbwt", 0); - VM_OBJECT_LOCK(object); + vm_page_unlock_queues(); + msleep(m, VM_OBJECT_MTX(m->object), PVM, "pgrbwt", 0); if ((allocflags & VM_ALLOC_RETRY) == 0) return (NULL); goto retrylookup; |