svn commit: r194562 - head/sys/vm

[Alan Cox]

Author: alc
Date: Sun Jun 21 00:21:33 2009
New Revision: 194562
URL: http://svn.freebsd.org/changeset/base/194562

Log:
  Strive for greater consistency among the places that implement real,
  fictious, and contiguous page allocation.  Eliminate unnecessary
  reinitialization of a page's fields.

Modified:
  head/sys/vm/device_pager.c
  head/sys/vm/vm_page.c
  head/sys/vm/vm_phys.c

Modified: head/sys/vm/device_pager.c
==============================================================================
--- head/sys/vm/device_pager.c	Sat Jun 20 23:38:21 2009	(r194561)
+++ head/sys/vm/device_pager.c	Sun Jun 21 00:21:33 2009	(r194562)
@@ -307,6 +307,7 @@ dev_pager_getfake(paddr)
 
 	m->flags = PG_FICTITIOUS;
 	m->oflags = VPO_BUSY;
+	/* Fictitious pages don't use "act_count". */
 	m->valid = VM_PAGE_BITS_ALL;
 	m->dirty = 0;
 	m->busy = 0;

Modified: head/sys/vm/vm_page.c
==============================================================================
--- head/sys/vm/vm_page.c	Sat Jun 20 23:38:21 2009	(r194561)
+++ head/sys/vm/vm_page.c	Sun Jun 21 00:21:33 2009	(r194562)
@@ -1108,10 +1108,13 @@ vm_page_alloc(vm_object_t object, vm_pin
 	 *  At this point we had better have found a good page.
 	 */
 
-	KASSERT(
-	    m != NULL,
-	    ("vm_page_alloc(): missing page on free queue")
-	);
+	KASSERT(m != NULL, ("vm_page_alloc: missing page"));
+	KASSERT(m->queue == PQ_NONE, ("vm_page_alloc: page %p has unexpected queue %d",
+	    m, m->queue));
+	KASSERT(m->wire_count == 0, ("vm_page_alloc: page %p is wired", m));
+	KASSERT(m->hold_count == 0, ("vm_page_alloc: page %p is held", m));
+	KASSERT(m->busy == 0, ("vm_page_alloc: page %p is busy", m));
+	KASSERT(m->dirty == 0, ("vm_page_alloc: page %p is dirty", m));
 	if ((m->flags & PG_CACHED) != 0) {
 		KASSERT(m->valid != 0,
 		    ("vm_page_alloc: cached page %p is invalid", m));
@@ -1150,12 +1153,8 @@ vm_page_alloc(vm_object_t object, vm_pin
 	if (req & VM_ALLOC_WIRED) {
 		atomic_add_int(&cnt.v_wire_count, 1);
 		m->wire_count = 1;
-	} else
-		m->wire_count = 0;
-	m->hold_count = 0;
+	}
 	m->act_count = 0;
-	m->busy = 0;
-	KASSERT(m->dirty == 0, ("vm_page_alloc: free/cache page %p was dirty", m));
 	mtx_unlock(&vm_page_queue_free_mtx);
 
 	if ((req & VM_ALLOC_NOOBJ) == 0)

Modified: head/sys/vm/vm_phys.c
==============================================================================
--- head/sys/vm/vm_phys.c	Sat Jun 20 23:38:21 2009	(r194561)
+++ head/sys/vm/vm_phys.c	Sun Jun 21 00:21:33 2009	(r194562)
@@ -689,6 +689,14 @@ done:
 		KASSERT(m->queue == PQ_NONE,
 		    ("vm_phys_alloc_contig: page %p has unexpected queue %d",
 		    m, m->queue));
+		KASSERT(m->wire_count == 0,
+		    ("vm_phys_alloc_contig: page %p is wired", m));
+		KASSERT(m->hold_count == 0,
+		    ("vm_phys_alloc_contig: page %p is held", m));
+		KASSERT(m->busy == 0,
+		    ("vm_phys_alloc_contig: page %p is busy", m));
+		KASSERT(m->dirty == 0,
+		    ("vm_phys_alloc_contig: page %p is dirty", m));
 		m_object = m->object;
 		if ((m->flags & PG_CACHED) != 0) {
 			m->valid = 0;
@@ -705,10 +713,7 @@ done:
 		/* Don't clear the PG_ZERO flag; we'll need it later. */
 		m->flags = PG_UNMANAGED | (m->flags & PG_ZERO);
 		m->oflags = 0;
-		KASSERT(m->dirty == 0,
-		    ("vm_phys_alloc_contig: page %p was dirty", m));
-		m->wire_count = 0;
-		m->busy = 0;
+		/* Unmanaged pages don't use "act_count". */
 		if (m_object != NULL &&
 		    m_object->type == OBJT_VNODE &&
 		    m_object->cache == NULL) {