 @@ -1,14 +1,14 @@
-/*	$NetBSD: uvm_pglist.c,v 1.53 2011/01/21 16:56:38 cegger Exp $	*/
+/*	$NetBSD: uvm_pglist.c,v 1.54 2011/01/21 19:27:09 matt Exp $	*/
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -25,27 +25,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * uvm_pglist.c: pglist functions
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_pglist.c,v 1.53 2011/01/21 16:56:38 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_pglist.c,v 1.54 2011/01/21 19:27:09 matt Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <uvm/uvm.h>
 #include <uvm/uvm_pdpolicy.h>
 #ifdef VM_PAGE_ALLOC_MEMORY_STATS
 #define	STAT_INCR(v)	(v)++
 #define	STAT_DECR(v)	do { \
 		if ((v) == 0) \
 @@ -195,27 +195,27 @@ uvm_pglistalloc_c_ps(struct vm_physseg *
 			panic("pgalloc contig: botch2");
 		if (vm_physseg_find(try + num - 1, &cidx) != ps - vm_physmem)
 			panic("pgalloc contig: botch3");
 		if (cidx != try - ps->start + num - 1)
 			panic("pgalloc contig: botch4");
 #endif
 		tryidx = try - ps->start;
 		end = tryidx + num;
 		/*
 		 * Found a suitable starting page.  See if the range is free.
 		 */
 #ifdef PGALLOC_VERBOSE
-		printf("%s: ps=%p try=%#x end=%#x skip=%#x, align=0x%"PRIxPADDR,
+		printf("%s: ps=%p try=%#x end=%#x skip=%#x, align=%#"PRIxPADDR,
 		    __func__, ps, tryidx, end, skip, alignment);
 #endif
 		/*
 		 * We start at the end and work backwards since if we find a
 		 * non-free page, it makes no sense to continue.
+		 *
 		 * But on the plus size we have "vetted" some number of free
 		 * pages.  If this iteration fails, we may be able to skip
 		 * testing most of those pages again in the next pass.
 		 */
 		for (idx = end - 1; idx >= tryidx + skip; idx--) {
 			if (VM_PAGE_IS_FREE(&pgs[idx]) == 0) {
 				ok = false;
 @@ -346,59 +346,66 @@ out:
 	uvm_kick_pdaemon();
 	mutex_spin_exit(&uvm_fpageqlock);
 	return (error);
+}
 static int
 uvm_pglistalloc_s_ps(struct vm_physseg *ps, int num, paddr_t low, paddr_t high,
     struct pglist *rlist)
+{
 	int todo, limit, try;
 	struct vm_page *pg;
 	bool second_pass;
 #ifdef DEBUG
 	int cidx = 0;	/* XXX: GCC */
 #endif
 #ifdef PGALLOC_VERBOSE
 	printf("pgalloc: simple %d pgs from psi %ld\n", num,
 	    (long)(ps - vm_physmem));
 #endif
 	KASSERT(mutex_owned(&uvm_fpageqlock));
 	KASSERT(ps->start <= ps->avail_start);
 	KASSERT(ps->start <= ps->avail_end);
 	KASSERT(ps->avail_start <= ps->end);
 	KASSERT(ps->avail_end <= ps->end);
 	low = atop(low);
 	high = atop(high);
 	todo = num;
 	try = max(low, ps->avail_start + ps->start_hint);
 	limit = min(high, ps->avail_end);
 	pg = &ps->pgs[try - ps->start];
 	second_pass = false;
 	for (;; try++, pg++) {
 		if (try >= limit) {
 			if (ps->start_hint == 0 || second_pass)
 				break;
 			second_pass = true;
 			try = max(low, ps->avail_start);
 			limit = min(high, ps->avail_start + ps->start_hint);
 			pg = &ps->pgs[try - ps->start];
 			continue;
+		}
 #ifdef DEBUG
 		if (vm_physseg_find(try, &cidx) != ps - vm_physmem)
-			panic("pgalloc simple: botch1");
+			int cidx = 0;
-		if (cidx != (try - ps->start))
+			const int bank = vm_physseg_find(try, &cidx);
-			panic("pgalloc simple: botch2");
+			KASSERTMSG(bank == ps - vm_physmem,
 			    ("vm_physseg_find(%#x) (%d) != ps %zd",
 			     try, bank, ps - vm_physmem));
 			KASSERTMSG(cidx == try - ps->start,
 			    ("vm_physseg_find(%#x): %#x != off %"PRIxPADDR,
 			     try, cidx, try - ps->start));
+		}
 #endif
 		if (VM_PAGE_IS_FREE(pg) == 0)
 			continue;
 		uvm_pglist_add(pg, rlist);
 		if (--todo == 0) {
 			break;
+		}
+	}
 	/*
 	 * The next time we need to search this segment,
 	 * start just after the pages we just allocated.