 @@ -1,14 +1,14 @@
-/* $NetBSD: pmap.c,v 1.102 2012/01/14 17:42:52 reinoud Exp $ */
+/* $NetBSD: pmap.c,v 1.102.2.1 2012/03/07 23:23:50 riz Exp $ */
 /*-
  * Copyright (c) 2011 Reinoud Zandijk <reinoud@NetBSD.org>
  * All rights reserved.
+ *
  * 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
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,36 +17,37 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.102 2012/01/14 17:42:52 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.102.2.1 2012/03/07 23:23:50 riz Exp $");
 #include "opt_memsize.h"
 #include "opt_kmempages.h"
 #include "opt_misc.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/mutex.h>
 #include <sys/buf.h>
 #include <sys/kmem.h>
 #include <sys/malloc.h>
 #include <sys/pool.h>
 #include <machine/thunk.h>
 #include <machine/machdep.h>
 #include <machine/pcb.h>
 #include <uvm/uvm.h>
 struct pv_entry {
 	struct 		pv_entry *pv_next;
 	pmap_t		pv_pmap;
 	uintptr_t	pv_ppn;		/* physical page number */
 	uintptr_t	pv_lpn;		/* logical page number  */
 @@ -85,27 +86,26 @@ struct pmap * const	 kernel_pmap_ptr = &
 static pmap_t active_pmap = NULL;
 static char  mem_name[20] = "";
 static int   mem_fh;
 static int phys_npages = 0;
 static int pm_nentries = 0;
 static int pm_nl1 = 0;
 static int pm_l1_size = 0;
 static uint64_t pm_entries_size = 0;
 static struct pool pmap_pool;
 static struct pool pmap_l1_pool;
 static struct pool pmap_l2_pool;
 static struct pool pmap_pventry_pool;
 /* forwards */
 void		pmap_bootstrap(void);
 static void	pmap_page_activate(struct pv_entry *pv);
 static void	pmap_page_deactivate(struct pv_entry *pv);
 static void	pv_update(struct pv_entry *pv);
 static void	pmap_update_page(uintptr_t ppn);
 bool		pmap_fault(pmap_t pmap, vaddr_t va, vm_prot_t *atype);
 static struct 	pv_entry *pv_get(pmap_t pmap, uintptr_t ppn, uintptr_t lpn);
 static struct 	pv_entry *pv_alloc(void);
 static void	pv_free(struct pv_entry *pv);
 @@ -441,28 +441,26 @@ pmap_virtual_space(vaddr_t *vstartp, vad
 		*vstartp = kmem_kvm_cur_start;		/* min to map in */
 	if (vendp)
 		*vendp   = kmem_kvm_end - PAGE_SIZE;	/* max available */
+}
 static void
 pmap_deferred_init(void)
+{
 	/* XXX we COULD realloc our pv_table etc with malloc() but for what? */
 	/* create pmap pool */
 	pool_init(&pmap_pool, sizeof(struct pmap), 0, 0, 0,
 	    "pmappool", NULL, IPL_NONE);
 	pool_init(&pmap_l2_pool, PMAP_L2_SIZE, 0, 0, 0,
 	    "pmapl2pool", NULL, IPL_HIGH);
 	pool_init(&pmap_l1_pool, pm_l1_size, 0, 0, 0,
 	    "pmapl1pool", NULL, IPL_NONE);
 	pool_init(&pmap_pventry_pool, sizeof(struct pv_entry), 0, 0, 0,
 	    "pventry", NULL, IPL_HIGH);
+}
 pmap_t
 pmap_create(void)
+{
 	static int pmap_initialised = 0;
 	struct pmap *pmap;
 	if (!pmap_initialised) {
 @@ -519,27 +517,27 @@ pmap_destroy(pmap_t pmap)
 		l2tbl = pmap->pm_l1[l1];
 		if (!l2tbl)
 			continue;
 		for (l2 = 0; l2 < PMAP_L2_NENTRY; l2++) {
 			if (l2tbl->pm_l2[l2])
 				panic("pmap_destroy: pmap isn't empty");
+		}
+	}
 #endif
 	for (l1 = 0; l1 < pm_nl1; l1++) {
 		l2tbl = pmap->pm_l1[l1];
 		if (!l2tbl)
 			continue;
-		pool_put(&pmap_l2_pool, l2tbl);
+		kmem_free(l2tbl, PMAP_L2_SIZE);
+	}
 	pool_put(&pmap_l1_pool, pmap->pm_l1);
 	pool_put(&pmap_pool, pmap);
+}
 void
 pmap_reference(pmap_t pmap)
+{
 	thunk_printf_debug("pmap_reference %p\n", (void *) pmap);
 	pmap->pm_count++;
+}
 long
 @@ -613,28 +611,28 @@ pmap_set_pv(pmap_t pmap, uintptr_t lpn,
+{
 	struct pmap_l2 *l2tbl;
 	int l1 = lpn / PMAP_L2_NENTRY;
 	int l2 = lpn % PMAP_L2_NENTRY;
 #ifdef DIAGNOSTIC
 	if (lpn >= pm_nentries)
 		panic("peeing outside box : addr in page around %"PRIx64"\n",
 			(uint64_t) lpn*PAGE_SIZE);
 #endif
 	l2tbl = pmap->pm_l1[l1];
 	if (!l2tbl) {
-		l2tbl = pmap->pm_l1[l1] = pool_get(&pmap_l2_pool, PR_WAITOK);
+		l2tbl = pmap->pm_l1[l1] = kmem_zalloc(PMAP_L2_SIZE, KM_SLEEP);
-		memset(l2tbl, 0, PMAP_L2_SIZE);
+		/* should be zero filled */
+	}
 	l2tbl->pm_l2[l2] = pv;
+}
 static struct pv_entry *
 pmap_lookup_pv(pmap_t pmap, uintptr_t lpn)
+{
 	struct pmap_l2 *l2tbl;
 	int l1 = lpn / PMAP_L2_NENTRY;
 	int l2 = lpn % PMAP_L2_NENTRY;
 	if (lpn >= pm_nentries)
 		return NULL;