summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/kern/kern_subr.c2
-rw-r--r--sys/kern/uipc_jumbo.c1
-rw-r--r--sys/kern/uipc_syscalls.c1
-rw-r--r--sys/kern/vfs_bio.c2
-rw-r--r--sys/sparc64/sparc64/pmap.c1
-rw-r--r--sys/vm/vm_contig.c2
-rw-r--r--sys/vm/vm_glue.c2
-rw-r--r--sys/vm/vm_object.c3
-rw-r--r--sys/vm/vm_page.c19
-rw-r--r--sys/vm/vm_pageout.c2
10 files changed, 5 insertions, 30 deletions
diff --git a/sys/kern/kern_subr.c b/sys/kern/kern_subr.c
index cf09244..1d55b44 100644
--- a/sys/kern/kern_subr.c
+++ b/sys/kern/kern_subr.c
@@ -97,7 +97,6 @@ vm_pgmoveco(vm_map_t mapa, vm_object_t srcobj, vm_offset_t kaddr,
do
vm_page_lock_queues();
while (vm_page_sleep_if_busy(user_pg, 1, "vm_pgmoveco"));
- vm_page_busy(user_pg);
pmap_remove_all(user_pg);
vm_page_free(user_pg);
} else
@@ -114,7 +113,6 @@ vm_pgmoveco(vm_map_t mapa, vm_object_t srcobj, vm_offset_t kaddr,
panic("vm_pgmoveco: renaming busy page");
}
kpindex = kern_pg->pindex;
- vm_page_busy(kern_pg);
vm_page_rename(kern_pg, uobject, upindex);
vm_page_flag_clear(kern_pg, PG_BUSY);
kern_pg->valid = VM_PAGE_BITS_ALL;
diff --git a/sys/kern/uipc_jumbo.c b/sys/kern/uipc_jumbo.c
index 36fcfe2..f0aba95 100644
--- a/sys/kern/uipc_jumbo.c
+++ b/sys/kern/uipc_jumbo.c
@@ -232,7 +232,6 @@ jumbo_pg_free(vm_offset_t addr)
*/
} else {
vm_page_lock_queues();
- vm_page_busy(pg); /* vm_page_free wants pages to be busy*/
vm_page_free(pg);
vm_page_unlock_queues();
}
diff --git a/sys/kern/uipc_syscalls.c b/sys/kern/uipc_syscalls.c
index 99dc557..dc196a9 100644
--- a/sys/kern/uipc_syscalls.c
+++ b/sys/kern/uipc_syscalls.c
@@ -1970,7 +1970,6 @@ retry_lookup:
if (pg->wire_count == 0 && pg->valid == 0 &&
pg->busy == 0 && !(pg->flags & PG_BUSY) &&
pg->hold_count == 0) {
- vm_page_busy(pg);
vm_page_free(pg);
}
vm_page_unlock_queues();
diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c
index 37a6492..b452ab6 100644
--- a/sys/kern/vfs_bio.c
+++ b/sys/kern/vfs_bio.c
@@ -1595,7 +1595,6 @@ vfs_vmio_release(struct buf *bp)
*/
if ((bp->b_flags & B_ASYNC) == 0 && !m->valid &&
m->hold_count == 0) {
- vm_page_busy(m);
pmap_remove_all(m);
vm_page_free(m);
} else if (bp->b_flags & B_DIRECT) {
@@ -3687,7 +3686,6 @@ vm_hold_free_pages(struct buf *bp, vm_offset_t from, vm_offset_t to)
bp->b_pages[index] = NULL;
pmap_qremove(pg, 1);
vm_page_lock_queues();
- vm_page_busy(p);
vm_page_unwire(p, 0);
vm_page_free(p);
vm_page_unlock_queues();
diff --git a/sys/sparc64/sparc64/pmap.c b/sys/sparc64/sparc64/pmap.c
index f76a45c1..c07d5d2 100644
--- a/sys/sparc64/sparc64/pmap.c
+++ b/sys/sparc64/sparc64/pmap.c
@@ -1087,7 +1087,6 @@ pmap_release(pmap_t pm)
vm_page_lock_queues();
if (vm_page_sleep_if_busy(m, FALSE, "pmaprl"))
continue;
- vm_page_busy(m);
KASSERT(m->hold_count == 0,
("pmap_release: freeing held tsb page"));
m->md.pmap = NULL;
diff --git a/sys/vm/vm_contig.c b/sys/vm/vm_contig.c
index 5ebf1bc..952d26d 100644
--- a/sys/vm/vm_contig.c
+++ b/sys/vm/vm_contig.c
@@ -256,7 +256,6 @@ again1:
start++;
goto again0;
}
- vm_page_busy(m);
vm_page_free(m);
VM_OBJECT_UNLOCK(object);
}
@@ -459,7 +458,6 @@ cleanup_freed:
object = m->object;
if (!VM_OBJECT_TRYLOCK(object))
goto retry;
- vm_page_busy(m);
vm_page_free(m);
VM_OBJECT_UNLOCK(object);
}
diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c
index 47d4c96..1673f2b 100644
--- a/sys/vm/vm_glue.c
+++ b/sys/vm/vm_glue.c
@@ -296,7 +296,6 @@ vm_proc_dispose(struct proc *p)
panic("vm_proc_dispose: incorrect number of pages in upobj");
vm_page_lock_queues();
while ((m = TAILQ_FIRST(&upobj->memq)) != NULL) {
- vm_page_busy(m);
vm_page_unwire(m, 0);
vm_page_free(m);
}
@@ -496,7 +495,6 @@ vm_thread_dispose(struct thread *td)
if (m == NULL)
panic("vm_thread_dispose: kstack already missing?");
vm_page_lock_queues();
- vm_page_busy(m);
vm_page_unwire(m, 0);
vm_page_free(m);
vm_page_unlock_queues();
diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c
index e697790..ebb3c03 100644
--- a/sys/vm/vm_object.c
+++ b/sys/vm/vm_object.c
@@ -621,11 +621,9 @@ vm_object_terminate(vm_object_t object)
("vm_object_terminate: freeing busy page %p "
"p->busy = %d, p->flags %x\n", p, p->busy, p->flags));
if (p->wire_count == 0) {
- vm_page_busy(p);
vm_page_free(p);
cnt.v_pfree++;
} else {
- vm_page_busy(p);
vm_page_remove(p);
}
}
@@ -1803,7 +1801,6 @@ again:
if (p->valid & p->dirty)
continue;
}
- vm_page_busy(p);
pmap_remove_all(p);
vm_page_free(p);
}
diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c
index 5001c78..3b880c9 100644
--- a/sys/vm/vm_page.c
+++ b/sys/vm/vm_page.c
@@ -609,21 +609,15 @@ vm_page_remove(vm_page_t m)
vm_page_t root;
mtx_assert(&vm_page_queue_mtx, MA_OWNED);
- if (m->object == NULL)
+ if ((object = m->object) == NULL)
return;
- VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
- if ((m->flags & PG_BUSY) == 0) {
- panic("vm_page_remove: page not busy");
+ VM_OBJECT_LOCK_ASSERT(object, MA_OWNED);
+ if (m->flags & PG_BUSY) {
+ vm_page_flag_clear(m, PG_BUSY);
+ vm_page_flash(m);
}
/*
- * Basically destroy the page.
- */
- vm_page_wakeup(m);
-
- object = m->object;
-
- /*
* Now remove from the object's list of backed pages.
*/
if (m != object->root)
@@ -810,7 +804,6 @@ loop:
}
m_object = m->object;
VM_OBJECT_LOCK_ASSERT(m_object, MA_OWNED);
- vm_page_busy(m);
vm_page_free(m);
vm_page_unlock_queues();
if (m_object != object)
@@ -1298,7 +1291,6 @@ vm_page_try_to_free(vm_page_t m)
pmap_remove_all(m);
if (m->dirty)
return (0);
- vm_page_busy(m);
vm_page_free(m);
return (1);
}
@@ -1667,7 +1659,6 @@ vm_page_cowfault(vm_page_t m)
pindex = m->pindex;
retry_alloc:
- vm_page_busy(m);
vm_page_remove(m);
mnew = vm_page_alloc(object, pindex, VM_ALLOC_NORMAL);
if (mnew == NULL) {
diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c
index 3d21c1f..cfb9eab 100644
--- a/sys/vm/vm_pageout.c
+++ b/sys/vm/vm_pageout.c
@@ -823,7 +823,6 @@ rescan0:
/*
* Invalid pages can be easily freed
*/
- vm_page_busy(m);
pmap_remove_all(m);
vm_page_free(m);
cnt.v_dfree++;
@@ -1107,7 +1106,6 @@ unlock_and_continue:
cache_rover = (m->pc + PQ_PRIME2) & PQ_L2_MASK;
object = m->object;
VM_OBJECT_LOCK_ASSERT(object, MA_OWNED);
- vm_page_busy(m);
vm_page_free(m);
VM_OBJECT_UNLOCK(object);
cnt.v_dfree++;
OpenPOWER on IntegriCloud