Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/kern/subr_pool.c,v
retrieving revision 1.87.2.7
retrieving revision 1.88
diff -u -p -r1.87.2.7 -r1.88
--- src/sys/kern/subr_pool.c	2005/12/11 10:29:12	1.87.2.7
+++ src/sys/kern/subr_pool.c	2003/11/13 02:44:01	1.88
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_pool.c,v 1.87.2.7 2005/12/11 10:29:12 christos Exp $	*/
+/*	$NetBSD: subr_pool.c,v 1.88 2003/11/13 02:44:01 chs Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1999, 2000 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.87.2.7 2005/12/11 10:29:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.88 2003/11/13 02:44:01 chs Exp $");
 
 #include "opt_pool.h"
 #include "opt_poollog.h"
@@ -70,26 +70,16 @@ __KERNEL_RCSID(0, "$NetBSD: subr_pool.c,
  */
 
 /* List of all pools */
-LIST_HEAD(,pool) pool_head = LIST_HEAD_INITIALIZER(pool_head);
+TAILQ_HEAD(,pool) pool_head = TAILQ_HEAD_INITIALIZER(pool_head);
 
 /* Private pool for page header structures */
-#define	PHPOOL_MAX	8
-static struct pool phpool[PHPOOL_MAX];
-#define	PHPOOL_FREELIST_NELEM(idx)	(((idx) == 0) ? 0 : (1 << (idx)))
+static struct pool phpool;
 
 #ifdef POOL_SUBPAGE
 /* Pool of subpages for use by normal pools. */
 static struct pool psppool;
 #endif
 
-static void *pool_page_alloc_meta(struct pool *, int);
-static void pool_page_free_meta(struct pool *, void *);
-
-/* allocator for pool metadata */
-static struct pool_allocator pool_allocator_meta = {
-	pool_page_alloc_meta, pool_page_free_meta
-};
-
 /* # of seconds to retain page after last use */
 int pool_inactive_time = 10;
 
@@ -99,39 +89,17 @@ static struct pool	*drainpp;
 /* This spin lock protects both pool_head and drainpp. */
 struct simplelock pool_head_slock = SIMPLELOCK_INITIALIZER;
 
-typedef uint8_t pool_item_freelist_t;
-
 struct pool_item_header {
 	/* Page headers */
 	LIST_ENTRY(pool_item_header)
 				ph_pagelist;	/* pool page list */
+	TAILQ_HEAD(,pool_item)	ph_itemlist;	/* chunk list for this page */
 	SPLAY_ENTRY(pool_item_header)
 				ph_node;	/* Off-page page headers */
+	unsigned int		ph_nmissing;	/* # of chunks in use */
 	caddr_t			ph_page;	/* this page's address */
 	struct timeval		ph_time;	/* last referenced */
-	union {
-		/* !PR_NOTOUCH */
-		struct {
-			LIST_HEAD(, pool_item)
-				phu_itemlist;	/* chunk list for this page */
-		} phu_normal;
-		/* PR_NOTOUCH */
-		struct {
-			uint16_t
-				phu_off;	/* start offset in page */
-			pool_item_freelist_t
-				phu_firstfree;	/* first free item */
-			/*
-			 * XXX it might be better to use
-			 * a simple bitmap and ffs(3)
-			 */
-		} phu_notouch;
-	} ph_u;
-	uint16_t		ph_nmissing;	/* # of chunks in use */
 };
-#define	ph_itemlist	ph_u.phu_normal.phu_itemlist
-#define	ph_off		ph_u.phu_notouch.phu_off
-#define	ph_firstfree	ph_u.phu_notouch.phu_firstfree
 
 struct pool_item {
 #ifdef DIAGNOSTIC
@@ -139,7 +107,7 @@ struct pool_item {
 #endif
 #define	PI_MAGIC 0xdeadbeefU
 	/* Other entries use only this list entry */
-	LIST_ENTRY(pool_item)	pi_list;
+	TAILQ_ENTRY(pool_item)	pi_list;
 };
 
 #define	POOL_NEEDS_CATCHUP(pp)						\
@@ -174,9 +142,7 @@ struct pool_item {
 /* The cache group pool. */
 static struct pool pcgpool;
 
-static void	pool_cache_reclaim(struct pool_cache *, struct pool_pagelist *,
-				   struct pool_cache_grouplist *);
-static void	pcg_grouplist_free(struct pool_cache_grouplist *);
+static void	pool_cache_reclaim(struct pool_cache *);
 
 static int	pool_catchup(struct pool *);
 static void	pool_prime_page(struct pool *, caddr_t,
@@ -186,7 +152,7 @@ static void	pool_update_curpage(struct p
 void		*pool_allocator_alloc(struct pool *, int);
 void		pool_allocator_free(struct pool *, void *);
 
-static void pool_print_pagelist(struct pool *, struct pool_pagelist *,
+static void pool_print_pagelist(struct pool_pagelist *,
 	void (*)(const char *, ...));
 static void pool_print1(struct pool *, const char *,
 	void (*)(const char *, ...));
@@ -313,50 +279,6 @@ pr_enter_check(struct pool *pp, void (*p
 #endif /* POOL_DIAGNOSTIC */
 
 static __inline int
-pr_item_notouch_index(const struct pool *pp, const struct pool_item_header *ph,
-    const void *v)
-{
-	const char *cp = v;
-	int idx;
-
-	KASSERT(pp->pr_roflags & PR_NOTOUCH);
-	idx = (cp - ph->ph_page - ph->ph_off) / pp->pr_size;
-	KASSERT(idx < pp->pr_itemsperpage);
-	return idx;
-}
-
-#define	PR_FREELIST_ALIGN(p) \
-	roundup((uintptr_t)(p), sizeof(pool_item_freelist_t))
-#define	PR_FREELIST(ph)	((pool_item_freelist_t *)PR_FREELIST_ALIGN((ph) + 1))
-#define	PR_INDEX_USED	((pool_item_freelist_t)-1)
-#define	PR_INDEX_EOL	((pool_item_freelist_t)-2)
-
-static __inline void
-pr_item_notouch_put(const struct pool *pp, struct pool_item_header *ph,
-    void *obj)
-{
-	int idx = pr_item_notouch_index(pp, ph, obj);
-	pool_item_freelist_t *freelist = PR_FREELIST(ph);
-
-	KASSERT(freelist[idx] == PR_INDEX_USED);
-	freelist[idx] = ph->ph_firstfree;
-	ph->ph_firstfree = idx;
-}
-
-static __inline void *
-pr_item_notouch_get(const struct pool *pp, struct pool_item_header *ph)
-{
-	int idx = ph->ph_firstfree;
-	pool_item_freelist_t *freelist = PR_FREELIST(ph);
-
-	KASSERT(freelist[idx] != PR_INDEX_USED);
-	ph->ph_firstfree = freelist[idx];
-	freelist[idx] = PR_INDEX_USED;
-
-	return ph->ph_page + ph->ph_off + idx * pp->pr_size;
-}
-
-static __inline int
 phtree_compare(struct pool_item_header *a, struct pool_item_header *b)
 {
 	if (a->ph_page < b->ph_page)
@@ -386,23 +308,6 @@ pr_find_pagehead(struct pool *pp, caddr_
 	return ph;
 }
 
-static void
-pr_pagelist_free(struct pool *pp, struct pool_pagelist *pq)
-{
-	struct pool_item_header *ph;
-	int s;
-
-	while ((ph = LIST_FIRST(pq)) != NULL) {
-		LIST_REMOVE(ph, ph_pagelist);
-		pool_allocator_free(pp, ph->ph_page);
-		if ((pp->pr_roflags & PR_PHINPAGE) == 0) {
-			s = splvm();
-			pool_put(pp->pr_phpool, ph);
-			splx(s);
-		}
-	}
-}
-
 /*
  * Remove a page from the pool.
  */
@@ -410,8 +315,7 @@ static __inline void
 pr_rmpage(struct pool *pp, struct pool_item_header *ph,
      struct pool_pagelist *pq)
 {
-
-	LOCK_ASSERT(simple_lock_held(&pp->pr_slock));
+	int s;
 
 	/*
 	 * If the page was idle, decrement the idle page count.
@@ -429,13 +333,20 @@ pr_rmpage(struct pool *pp, struct pool_i
 	pp->pr_nitems -= pp->pr_itemsperpage;
 
 	/*
-	 * Unlink the page from the pool and queue it for release.
+	 * Unlink a page from the pool and release it (or queue it for release).
 	 */
 	LIST_REMOVE(ph, ph_pagelist);
-	if ((pp->pr_roflags & PR_PHINPAGE) == 0)
-		SPLAY_REMOVE(phtree, &pp->pr_phtree, ph);
-	LIST_INSERT_HEAD(pq, ph, ph_pagelist);
-
+	if (pq) {
+		LIST_INSERT_HEAD(pq, ph, ph_pagelist);
+	} else {
+		pool_allocator_free(pp, ph->ph_page);
+		if ((pp->pr_roflags & PR_PHINPAGE) == 0) {
+			SPLAY_REMOVE(phtree, &pp->pr_phtree, ph);
+			s = splvm();
+			pool_put(&phpool, ph);
+			splx(s);
+		}
+	}
 	pp->pr_npages--;
 	pp->pr_npagefree++;
 
@@ -443,21 +354,6 @@ pr_rmpage(struct pool *pp, struct pool_i
 }
 
 /*
- * Initialize all the pools listed in the "pools" link set.
- */
-void
-link_pool_init(void)
-{
-	__link_set_decl(pools, struct link_pool_init);
-	struct link_pool_init * const *pi;
-
-	__link_set_foreach(pi, pools)
-		pool_init((*pi)->pp, (*pi)->size, (*pi)->align,
-		    (*pi)->align_offset, (*pi)->flags, (*pi)->wchan,
-		    (*pi)->palloc);
-}
-
-/*
  * Initialize the given pool resource structure.
  *
  * We export this routine to allow other kernel parts to declare
@@ -468,11 +364,6 @@ pool_init(struct pool *pp, size_t size, 
     const char *wchan, struct pool_allocator *palloc)
 {
 	int off, slack;
-	size_t trysize, phsize;
-	int s;
-
-	KASSERT((1UL << (CHAR_BIT * sizeof(pool_item_freelist_t))) - 2 >=
-	    PHPOOL_FREELIST_NELEM(PHPOOL_MAX - 1));
 
 #ifdef POOL_DIAGNOSTIC
 	/*
@@ -539,7 +430,7 @@ pool_init(struct pool *pp, size_t size, 
 	LIST_INIT(&pp->pr_emptypages);
 	LIST_INIT(&pp->pr_fullpages);
 	LIST_INIT(&pp->pr_partpages);
-	LIST_INIT(&pp->pr_cachelist);
+	TAILQ_INIT(&pp->pr_cachelist);
 	pp->pr_curpage = NULL;
 	pp->pr_npages = 0;
 	pp->pr_minitems = 0;
@@ -564,27 +455,16 @@ pool_init(struct pool *pp, size_t size, 
 
 	/*
 	 * Decide whether to put the page header off page to avoid
-	 * wasting too large a part of the page or too big item.
-	 * Off-page page headers go on a hash table, so we can match
-	 * a returned item with its header based on the page address.
-	 * We use 1/16 of the page size and about 8 times of the item
-	 * size as the threshold (XXX: tune)
-	 *
-	 * However, we'll put the header into the page if we can put
-	 * it without wasting any items.
-	 *
-	 * Silently enforce `0 <= ioff < align'.
+	 * wasting too large a part of the page. Off-page page headers
+	 * go on a hash table, so we can match a returned item
+	 * with its header based on the page address.
+	 * We use 1/16 of the page size as the threshold (XXX: tune)
 	 */
-	pp->pr_itemoffset = ioff %= align;
-	/* See the comment below about reserved bytes. */
-	trysize = palloc->pa_pagesz - ((align - ioff) % align);
-	phsize = ALIGN(sizeof(struct pool_item_header));
-	if ((pp->pr_roflags & PR_NOTOUCH) == 0 &&
-	    (pp->pr_size < MIN(palloc->pa_pagesz / 16, phsize << 3) ||
-	    trysize / pp->pr_size == (trysize - phsize) / pp->pr_size)) {
+	if (pp->pr_size < palloc->pa_pagesz/16) {
 		/* Use the end of the page for the page header */
 		pp->pr_roflags |= PR_PHINPAGE;
-		pp->pr_phoffset = off = palloc->pa_pagesz - phsize;
+		pp->pr_phoffset = off = palloc->pa_pagesz -
+		    ALIGN(sizeof(struct pool_item_header));
 	} else {
 		/* The page header will be taken from our page header pool */
 		pp->pr_phoffset = 0;
@@ -596,33 +476,12 @@ pool_init(struct pool *pp, size_t size, 
 	 * Alignment is to take place at `ioff' within the item. This means
 	 * we must reserve up to `align - 1' bytes on the page to allow
 	 * appropriate positioning of each item.
+	 *
+	 * Silently enforce `0 <= ioff < align'.
 	 */
+	pp->pr_itemoffset = ioff = ioff % align;
 	pp->pr_itemsperpage = (off - ((align - ioff) % align)) / pp->pr_size;
 	KASSERT(pp->pr_itemsperpage != 0);
-	if ((pp->pr_roflags & PR_NOTOUCH)) {
-		int idx;
-
-		for (idx = 0; pp->pr_itemsperpage > PHPOOL_FREELIST_NELEM(idx);
-		    idx++) {
-			/* nothing */
-		}
-		if (idx >= PHPOOL_MAX) {
-			/*
-			 * if you see this panic, consider to tweak
-			 * PHPOOL_MAX and PHPOOL_FREELIST_NELEM.
-			 */
-			panic("%s: too large itemsperpage(%d) for PR_NOTOUCH",
-			    pp->pr_wchan, pp->pr_itemsperpage);
-		}
-		pp->pr_phpool = &phpool[idx];
-	} else if ((pp->pr_roflags & PR_PHINPAGE) == 0) {
-		pp->pr_phpool = &phpool[0];
-	}
-#if defined(DIAGNOSTIC)
-	else {
-		pp->pr_phpool = NULL;
-	}
-#endif
 
 	/*
 	 * Use the slack between the chunks and the page header
@@ -661,43 +520,29 @@ pool_init(struct pool *pp, size_t size, 
 	 * haven't done so yet.
 	 * XXX LOCKING.
 	 */
-	if (phpool[0].pr_size == 0) {
-		int idx;
-		for (idx = 0; idx < PHPOOL_MAX; idx++) {
-			static char phpool_names[PHPOOL_MAX][6+1+6+1];
-			int nelem;
-			size_t sz;
-
-			nelem = PHPOOL_FREELIST_NELEM(idx);
-			snprintf(phpool_names[idx], sizeof(phpool_names[idx]),
-			    "phpool-%d", nelem);
-			sz = sizeof(struct pool_item_header);
-			if (nelem) {
-				sz = PR_FREELIST_ALIGN(sz)
-				    + nelem * sizeof(pool_item_freelist_t);
-			}
-			pool_init(&phpool[idx], sz, 0, 0, 0,
-			    phpool_names[idx], &pool_allocator_meta);
-		}
+	if (phpool.pr_size == 0) {
 #ifdef POOL_SUBPAGE
+		pool_init(&phpool, sizeof(struct pool_item_header), 0, 0, 0,
+		    "phpool", &pool_allocator_kmem);
 		pool_init(&psppool, POOL_SUBPAGE, POOL_SUBPAGE, 0,
-		    PR_RECURSIVE, "psppool", &pool_allocator_meta);
+		    PR_RECURSIVE, "psppool", &pool_allocator_kmem);
+#else
+		pool_init(&phpool, sizeof(struct pool_item_header), 0, 0,
+		    0, "phpool", NULL);
 #endif
 		pool_init(&pcgpool, sizeof(struct pool_cache_group), 0, 0,
-		    0, "pcgpool", &pool_allocator_meta);
+		    0, "pcgpool", NULL);
 	}
 
 	/* Insert into the list of all pools. */
 	simple_lock(&pool_head_slock);
-	LIST_INSERT_HEAD(&pool_head, pp, pr_poollist);
+	TAILQ_INSERT_TAIL(&pool_head, pp, pr_poollist);
 	simple_unlock(&pool_head_slock);
 
 	/* Insert this into the list of pools using this allocator. */
-	s = splvm();
 	simple_lock(&palloc->pa_slock);
 	TAILQ_INSERT_TAIL(&palloc->pa_list, pp, pr_alloc_list);
 	simple_unlock(&palloc->pa_slock);
-	splx(s);
 }
 
 /*
@@ -706,28 +551,17 @@ pool_init(struct pool *pp, size_t size, 
 void
 pool_destroy(struct pool *pp)
 {
-	struct pool_pagelist pq;
 	struct pool_item_header *ph;
-	int s;
-
-	/* Remove from global pool list */
-	simple_lock(&pool_head_slock);
-	LIST_REMOVE(pp, pr_poollist);
-	if (drainpp == pp)
-		drainpp = NULL;
-	simple_unlock(&pool_head_slock);
+	struct pool_cache *pc;
 
-	/* Remove this pool from its allocator's list of pools. */
-	s = splvm();
+	/* Locking order: pool_allocator -> pool */
 	simple_lock(&pp->pr_alloc->pa_slock);
 	TAILQ_REMOVE(&pp->pr_alloc->pa_list, pp, pr_alloc_list);
 	simple_unlock(&pp->pr_alloc->pa_slock);
-	splx(s);
 
-	s = splvm();
-	simple_lock(&pp->pr_slock);
-
-	KASSERT(LIST_EMPTY(&pp->pr_cachelist));
+	/* Destroy all caches for this pool. */
+	while ((pc = TAILQ_FIRST(&pp->pr_cachelist)) != NULL)
+		pool_cache_destroy(pc);
 
 #ifdef DIAGNOSTIC
 	if (pp->pr_nout != 0) {
@@ -737,18 +571,19 @@ pool_destroy(struct pool *pp)
 	}
 #endif
 
-	KASSERT(LIST_EMPTY(&pp->pr_fullpages));
-	KASSERT(LIST_EMPTY(&pp->pr_partpages));
-
 	/* Remove all pages */
-	LIST_INIT(&pq);
 	while ((ph = LIST_FIRST(&pp->pr_emptypages)) != NULL)
-		pr_rmpage(pp, ph, &pq);
-
-	simple_unlock(&pp->pr_slock);
-	splx(s);
+		pr_rmpage(pp, ph, NULL);
+	KASSERT(LIST_EMPTY(&pp->pr_fullpages));
+	KASSERT(LIST_EMPTY(&pp->pr_partpages));
 
-	pr_pagelist_free(pp, &pq);
+	/* Remove from global pool list */
+	simple_lock(&pool_head_slock);
+	TAILQ_REMOVE(&pool_head, pp, pr_poollist);
+	if (drainpp == pp) {
+		drainpp = NULL;
+	}
+	simple_unlock(&pool_head_slock);
 
 #ifdef POOL_DIAGNOSTIC
 	if ((pp->pr_roflags & PR_LOGGING) != 0)
@@ -781,7 +616,7 @@ pool_alloc_item_header(struct pool *pp, 
 		ph = (struct pool_item_header *) (storage + pp->pr_phoffset);
 	else {
 		s = splvm();
-		ph = pool_get(pp->pr_phpool, flags);
+		ph = pool_get(&phpool, flags);
 		splx(s);
 	}
 
@@ -803,19 +638,15 @@ pool_get(struct pool *pp, int flags)
 	void *v;
 
 #ifdef DIAGNOSTIC
-	if (__predict_false(pp->pr_itemsperpage == 0))
-		panic("pool_get: pool %p: pr_itemsperpage is zero, "
-		    "pool not initialized?", pp);
 	if (__predict_false(curlwp == NULL && doing_shutdown == 0 &&
 			    (flags & PR_WAITOK) != 0))
 		panic("pool_get: %s: must have NOWAIT", pp->pr_wchan);
 
-#endif /* DIAGNOSTIC */
 #ifdef LOCKDEBUG
 	if (flags & PR_WAITOK)
 		simple_lock_only_held(NULL, "pool_get(PR_WAITOK)");
-	SCHED_ASSERT_UNLOCKED();
 #endif
+#endif /* DIAGNOSTIC */
 
 	simple_lock(&pp->pr_slock);
 	pr_enter(pp, file, line);
@@ -902,14 +733,13 @@ pool_get(struct pool *pp, int flags)
 		v = pool_allocator_alloc(pp, flags);
 		if (__predict_true(v != NULL))
 			ph = pool_alloc_item_header(pp, v, flags);
+		simple_lock(&pp->pr_slock);
+		pr_enter(pp, file, line);
 
 		if (__predict_false(v == NULL || ph == NULL)) {
 			if (v != NULL)
 				pool_allocator_free(pp, v);
 
-			simple_lock(&pp->pr_slock);
-			pr_enter(pp, file, line);
-
 			/*
 			 * We were unable to allocate a page or item
 			 * header, but we released the lock during
@@ -941,61 +771,44 @@ pool_get(struct pool *pp, int flags)
 		}
 
 		/* We have more memory; add it to the pool */
-		simple_lock(&pp->pr_slock);
-		pr_enter(pp, file, line);
 		pool_prime_page(pp, v, ph);
 		pp->pr_npagealloc++;
 
 		/* Start the allocation process over. */
 		goto startover;
 	}
-	if (pp->pr_roflags & PR_NOTOUCH) {
-#ifdef DIAGNOSTIC
-		if (__predict_false(ph->ph_nmissing == pp->pr_itemsperpage)) {
-			pr_leave(pp);
-			simple_unlock(&pp->pr_slock);
-			panic("pool_get: %s: page empty", pp->pr_wchan);
-		}
-#endif
-		v = pr_item_notouch_get(pp, ph);
-#ifdef POOL_DIAGNOSTIC
-		pr_log(pp, v, PRLOG_GET, file, line);
-#endif
-	} else {
-		v = pi = LIST_FIRST(&ph->ph_itemlist);
-		if (__predict_false(v == NULL)) {
-			pr_leave(pp);
-			simple_unlock(&pp->pr_slock);
-			panic("pool_get: %s: page empty", pp->pr_wchan);
-		}
+	if (__predict_false((v = pi = TAILQ_FIRST(&ph->ph_itemlist)) == NULL)) {
+		pr_leave(pp);
+		simple_unlock(&pp->pr_slock);
+		panic("pool_get: %s: page empty", pp->pr_wchan);
+	}
 #ifdef DIAGNOSTIC
-		if (__predict_false(pp->pr_nitems == 0)) {
-			pr_leave(pp);
-			simple_unlock(&pp->pr_slock);
-			printf("pool_get: %s: items on itemlist, nitems %u\n",
-			    pp->pr_wchan, pp->pr_nitems);
-			panic("pool_get: nitems inconsistent");
-		}
+	if (__predict_false(pp->pr_nitems == 0)) {
+		pr_leave(pp);
+		simple_unlock(&pp->pr_slock);
+		printf("pool_get: %s: items on itemlist, nitems %u\n",
+		    pp->pr_wchan, pp->pr_nitems);
+		panic("pool_get: nitems inconsistent");
+	}
 #endif
 
 #ifdef POOL_DIAGNOSTIC
-		pr_log(pp, v, PRLOG_GET, file, line);
+	pr_log(pp, v, PRLOG_GET, file, line);
 #endif
 
 #ifdef DIAGNOSTIC
-		if (__predict_false(pi->pi_magic != PI_MAGIC)) {
-			pr_printlog(pp, pi, printf);
-			panic("pool_get(%s): free list modified: "
-			    "magic=%x; page %p; item addr %p\n",
-			    pp->pr_wchan, pi->pi_magic, ph->ph_page, pi);
-		}
+	if (__predict_false(pi->pi_magic != PI_MAGIC)) {
+		pr_printlog(pp, pi, printf);
+		panic("pool_get(%s): free list modified: magic=%x; page %p;"
+		       " item addr %p\n",
+			pp->pr_wchan, pi->pi_magic, ph->ph_page, pi);
+	}
 #endif
 
-		/*
-		 * Remove from item list.
-		 */
-		LIST_REMOVE(pi, pi_list);
-	}
+	/*
+	 * Remove from item list.
+	 */
+	TAILQ_REMOVE(&ph->ph_itemlist, pi, pi_list);
 	pp->pr_nitems--;
 	pp->pr_nout++;
 	if (ph->ph_nmissing == 0) {
@@ -1013,10 +826,9 @@ pool_get(struct pool *pp, int flags)
 		LIST_INSERT_HEAD(&pp->pr_partpages, ph, ph_pagelist);
 	}
 	ph->ph_nmissing++;
-	if (ph->ph_nmissing == pp->pr_itemsperpage) {
+	if (TAILQ_EMPTY(&ph->ph_itemlist)) {
 #ifdef DIAGNOSTIC
-		if (__predict_false((pp->pr_roflags & PR_NOTOUCH) == 0 &&
-		    !LIST_EMPTY(&ph->ph_itemlist))) {
+		if (__predict_false(ph->ph_nmissing != pp->pr_itemsperpage)) {
 			pr_leave(pp);
 			simple_unlock(&pp->pr_slock);
 			panic("pool_get: %s: nmissing inconsistent",
@@ -1055,7 +867,7 @@ pool_get(struct pool *pp, int flags)
  * Internal version of pool_put().  Pool is already locked/entered.
  */
 static void
-pool_do_put(struct pool *pp, void *v, struct pool_pagelist *pq)
+pool_do_put(struct pool *pp, void *v)
 {
 	struct pool_item *pi = v;
 	struct pool_item_header *ph;
@@ -1063,7 +875,6 @@ pool_do_put(struct pool *pp, void *v, st
 	int s;
 
 	LOCK_ASSERT(simple_lock_held(&pp->pr_slock));
-	SCHED_ASSERT_UNLOCKED();
 
 	page = (caddr_t)((u_long)v & pp->pr_alloc->pa_pagemask);
 
@@ -1090,24 +901,20 @@ pool_do_put(struct pool *pp, void *v, st
 	/*
 	 * Return to item list.
 	 */
-	if (pp->pr_roflags & PR_NOTOUCH) {
-		pr_item_notouch_put(pp, ph, v);
-	} else {
 #ifdef DIAGNOSTIC
-		pi->pi_magic = PI_MAGIC;
+	pi->pi_magic = PI_MAGIC;
 #endif
 #ifdef DEBUG
-		{
-			int i, *ip = v;
+	{
+		int i, *ip = v;
 
-			for (i = 0; i < pp->pr_size / sizeof(int); i++) {
-				*ip++ = PI_MAGIC;
-			}
+		for (i = 0; i < pp->pr_size / sizeof(int); i++) {
+			*ip++ = PI_MAGIC;
 		}
+	}
 #endif
 
-		LIST_INSERT_HEAD(&ph->ph_itemlist, pi, pi_list);
-	}
+	TAILQ_INSERT_HEAD(&ph->ph_itemlist, pi, pi_list);
 	KDASSERT(ph->ph_nmissing != 0);
 	ph->ph_nmissing--;
 	pp->pr_nput++;
@@ -1130,9 +937,7 @@ pool_do_put(struct pool *pp, void *v, st
 	 * If this page is now empty, do one of two things:
 	 *
 	 *	(1) If we have more pages than the page high water mark,
-	 *	    free the page back to the system.  ONLY CONSIDER
-	 *	    FREEING BACK A PAGE IF WE HAVE MORE THAN OUR MINIMUM PAGE
-	 *	    CLAIM.
+	 *	    free the page back to the system.
 	 *
 	 *	(2) Otherwise, move the page to the empty page list.
 	 *
@@ -1141,10 +946,9 @@ pool_do_put(struct pool *pp, void *v, st
 	 */
 	if (ph->ph_nmissing == 0) {
 		pp->pr_nidle++;
-		if (pp->pr_npages > pp->pr_minpages &&
-		    (pp->pr_npages > pp->pr_maxpages ||
-		     (pp->pr_alloc->pa_flags & PA_WANT) != 0)) {
-			pr_rmpage(pp, ph, pq);
+		if (pp->pr_npages > pp->pr_maxpages ||
+		    (pp->pr_alloc->pa_flags & PA_WANT) != 0) {
+			pr_rmpage(pp, ph, NULL);
 		} else {
 			LIST_REMOVE(ph, ph_pagelist);
 			LIST_INSERT_HEAD(&pp->pr_emptypages, ph, ph_pagelist);
@@ -1182,21 +986,16 @@ pool_do_put(struct pool *pp, void *v, st
 void
 _pool_put(struct pool *pp, void *v, const char *file, long line)
 {
-	struct pool_pagelist pq;
-
-	LIST_INIT(&pq);
 
 	simple_lock(&pp->pr_slock);
 	pr_enter(pp, file, line);
 
 	pr_log(pp, v, PRLOG_PUT, file, line);
 
-	pool_do_put(pp, v, &pq);
+	pool_do_put(pp, v);
 
 	pr_leave(pp);
 	simple_unlock(&pp->pr_slock);
-
-	pr_pagelist_free(pp, &pq);
 }
 #undef pool_put
 #endif /* POOL_DIAGNOSTIC */
@@ -1204,15 +1003,12 @@ _pool_put(struct pool *pp, void *v, cons
 void
 pool_put(struct pool *pp, void *v)
 {
-	struct pool_pagelist pq;
-
-	LIST_INIT(&pq);
 
 	simple_lock(&pp->pr_slock);
-	pool_do_put(pp, v, &pq);
-	simple_unlock(&pp->pr_slock);
 
-	pr_pagelist_free(pp, &pq);
+	pool_do_put(pp, v);
+
+	simple_unlock(&pp->pr_slock);
 }
 
 #ifdef POOL_DIAGNOSTIC
@@ -1238,15 +1034,14 @@ pool_prime(struct pool *pp, int n)
 		cp = pool_allocator_alloc(pp, PR_NOWAIT);
 		if (__predict_true(cp != NULL))
 			ph = pool_alloc_item_header(pp, cp, PR_NOWAIT);
+		simple_lock(&pp->pr_slock);
 
 		if (__predict_false(cp == NULL || ph == NULL)) {
 			if (cp != NULL)
 				pool_allocator_free(pp, cp);
-			simple_lock(&pp->pr_slock);
 			break;
 		}
 
-		simple_lock(&pp->pr_slock);
 		pool_prime_page(pp, cp, ph);
 		pp->pr_npagealloc++;
 		pp->pr_minpages++;
@@ -1272,9 +1067,6 @@ pool_prime_page(struct pool *pp, caddr_t
 	unsigned int align = pp->pr_align;
 	unsigned int ioff = pp->pr_itemoffset;
 	int n;
-	int s;
-
-	LOCK_ASSERT(simple_lock_held(&pp->pr_slock));
 
 #ifdef DIAGNOSTIC
 	if (((u_long)cp & (pp->pr_alloc->pa_pagesz - 1)) != 0)
@@ -1285,12 +1077,10 @@ pool_prime_page(struct pool *pp, caddr_t
 	 * Insert page header.
 	 */
 	LIST_INSERT_HEAD(&pp->pr_emptypages, ph, ph_pagelist);
-	LIST_INIT(&ph->ph_itemlist);
+	TAILQ_INIT(&ph->ph_itemlist);
 	ph->ph_page = storage;
 	ph->ph_nmissing = 0;
-	s = splclock();
-	ph->ph_time = mono_time;
-	splx(s);
+	memset(&ph->ph_time, 0, sizeof(ph->ph_time));
 	if ((pp->pr_roflags & PR_PHINPAGE) == 0)
 		SPLAY_INSERT(phtree, &pp->pr_phtree, ph);
 
@@ -1315,28 +1105,17 @@ pool_prime_page(struct pool *pp, caddr_t
 	n = pp->pr_itemsperpage;
 	pp->pr_nitems += n;
 
-	if (pp->pr_roflags & PR_NOTOUCH) {
-		pool_item_freelist_t *freelist = PR_FREELIST(ph);
-		int i;
-
-		ph->ph_off = cp - storage;
-		ph->ph_firstfree = 0;
-		for (i = 0; i < n - 1; i++)
-			freelist[i] = i + 1;
-		freelist[n - 1] = PR_INDEX_EOL;
-	} else {
-		while (n--) {
-			pi = (struct pool_item *)cp;
+	while (n--) {
+		pi = (struct pool_item *)cp;
 
-			KASSERT(((((vaddr_t)pi) + ioff) & (align - 1)) == 0);
+		KASSERT(((((vaddr_t)pi) + ioff) & (align - 1)) == 0);
 
-			/* Insert on page list */
-			LIST_INSERT_HEAD(&ph->ph_itemlist, pi, pi_list);
+		/* Insert on page list */
+		TAILQ_INSERT_TAIL(&ph->ph_itemlist, pi, pi_list);
 #ifdef DIAGNOSTIC
-			pi->pi_magic = PI_MAGIC;
+		pi->pi_magic = PI_MAGIC;
 #endif
-			cp = (caddr_t)(cp + pp->pr_size);
-		}
+		cp = (caddr_t)(cp + pp->pr_size);
 	}
 
 	/*
@@ -1376,14 +1155,13 @@ pool_catchup(struct pool *pp)
 		cp = pool_allocator_alloc(pp, PR_NOWAIT);
 		if (__predict_true(cp != NULL))
 			ph = pool_alloc_item_header(pp, cp, PR_NOWAIT);
+		simple_lock(&pp->pr_slock);
 		if (__predict_false(cp == NULL || ph == NULL)) {
 			if (cp != NULL)
 				pool_allocator_free(pp, cp);
 			error = ENOMEM;
-			simple_lock(&pp->pr_slock);
 			break;
 		}
-		simple_lock(&pp->pr_slock);
 		pool_prime_page(pp, cp, ph);
 		pp->pr_npagealloc++;
 	}
@@ -1472,9 +1250,9 @@ pool_reclaim(struct pool *pp)
 {
 	struct pool_item_header *ph, *phnext;
 	struct pool_cache *pc;
+	struct timeval curtime;
 	struct pool_pagelist pq;
-	struct pool_cache_grouplist pcgl;
-	struct timeval curtime, diff;
+	struct timeval diff;
 	int s;
 
 	if (pp->pr_drain_hook != NULL) {
@@ -1489,13 +1267,12 @@ pool_reclaim(struct pool *pp)
 	pr_enter(pp, file, line);
 
 	LIST_INIT(&pq);
-	LIST_INIT(&pcgl);
 
 	/*
 	 * Reclaim items from the pool's caches.
 	 */
-	LIST_FOREACH(pc, &pp->pr_cachelist, pc_poollist)
-		pool_cache_reclaim(pc, &pq, &pcgl);
+	TAILQ_FOREACH(pc, &pp->pr_cachelist, pc_poollist)
+		pool_cache_reclaim(pc);
 
 	s = splclock();
 	curtime = mono_time;
@@ -1526,11 +1303,21 @@ pool_reclaim(struct pool *pp)
 
 	pr_leave(pp);
 	simple_unlock(&pp->pr_slock);
-	if (LIST_EMPTY(&pq) && LIST_EMPTY(&pcgl))
-		return 0;
+	if (LIST_EMPTY(&pq))
+		return (0);
+
+	while ((ph = LIST_FIRST(&pq)) != NULL) {
+		LIST_REMOVE(ph, ph_pagelist);
+		pool_allocator_free(pp, ph->ph_page);
+		if (pp->pr_roflags & PR_PHINPAGE) {
+			continue;
+		}
+		SPLAY_REMOVE(phtree, &pp->pr_phtree, ph);
+		s = splvm();
+		pool_put(&phpool, ph);
+		splx(s);
+	}
 
-	pr_pagelist_free(pp, &pq);
-	pcg_grouplist_free(&pcgl);
 	return (1);
 }
 
@@ -1549,11 +1336,11 @@ pool_drain(void *arg)
 	s = splvm();
 	simple_lock(&pool_head_slock);
 	if (drainpp == NULL) {
-		drainpp = LIST_FIRST(&pool_head);
+		drainpp = TAILQ_FIRST(&pool_head);
 	}
 	if (drainpp) {
 		pp = drainpp;
-		drainpp = LIST_NEXT(pp, pr_poollist);
+		drainpp = TAILQ_NEXT(pp, pr_poollist);
 	}
 	simple_unlock(&pool_head_slock);
 	pool_reclaim(pp);
@@ -1581,24 +1368,9 @@ pool_print(struct pool *pp, const char *
 }
 
 void
-pool_printall(const char *modif, void (*pr)(const char *, ...))
-{
-	struct pool *pp;
-
-	if (simple_lock_try(&pool_head_slock) == 0) {
-		(*pr)("WARNING: pool_head_slock is locked\n");
-	} else {
-		simple_unlock(&pool_head_slock);
-	}
-
-	LIST_FOREACH(pp, &pool_head, pr_poollist) {
-		pool_printit(pp, modif, pr);
-	}
-}
-
-void
 pool_printit(struct pool *pp, const char *modif, void (*pr)(const char *, ...))
 {
+	int didlock = 0;
 
 	if (pp == NULL) {
 		(*pr)("Must specify a pool to print.\n");
@@ -1617,14 +1389,16 @@ pool_printit(struct pool *pp, const char
 	if (simple_lock_try(&pp->pr_slock) == 0)
 		(*pr)("WARNING: pool %s is locked\n", pp->pr_wchan);
 	else
-		simple_unlock(&pp->pr_slock);
+		didlock = 1;
 
 	pool_print1(pp, modif, pr);
+
+	if (didlock)
+		simple_unlock(&pp->pr_slock);
 }
 
 static void
-pool_print_pagelist(struct pool *pp, struct pool_pagelist *pl,
-    void (*pr)(const char *, ...))
+pool_print_pagelist(struct pool_pagelist *pl, void (*pr)(const char *, ...))
 {
 	struct pool_item_header *ph;
 #ifdef DIAGNOSTIC
@@ -1637,12 +1411,10 @@ pool_print_pagelist(struct pool *pp, str
 		    (u_long)ph->ph_time.tv_sec,
 		    (u_long)ph->ph_time.tv_usec);
 #ifdef DIAGNOSTIC
-		if (!(pp->pr_roflags & PR_NOTOUCH)) {
-			LIST_FOREACH(pi, &ph->ph_itemlist, pi_list) {
-				if (pi->pi_magic != PI_MAGIC) {
-					(*pr)("\t\t\titem %p, magic 0x%x\n",
-					    pi, pi->pi_magic);
-				}
+		TAILQ_FOREACH(pi, &ph->ph_itemlist, pi_list) {
+			if (pi->pi_magic != PI_MAGIC) {
+				(*pr)("\t\t\titem %p, magic 0x%x\n",
+				    pi, pi->pi_magic);
 			}
 		}
 #endif
@@ -1686,13 +1458,13 @@ pool_print1(struct pool *pp, const char 
 
 	if ((ph = LIST_FIRST(&pp->pr_emptypages)) != NULL)
 		(*pr)("\n\tempty page list:\n");
-	pool_print_pagelist(pp, &pp->pr_emptypages, pr);
+	pool_print_pagelist(&pp->pr_emptypages, pr);
 	if ((ph = LIST_FIRST(&pp->pr_fullpages)) != NULL)
 		(*pr)("\n\tfull page list:\n");
-	pool_print_pagelist(pp, &pp->pr_fullpages, pr);
+	pool_print_pagelist(&pp->pr_fullpages, pr);
 	if ((ph = LIST_FIRST(&pp->pr_partpages)) != NULL)
 		(*pr)("\n\tpartial-page list:\n");
-	pool_print_pagelist(pp, &pp->pr_partpages, pr);
+	pool_print_pagelist(&pp->pr_partpages, pr);
 
 	if (pp->pr_curpage == NULL)
 		(*pr)("\tno current page\n");
@@ -1713,39 +1485,27 @@ pool_print1(struct pool *pp, const char 
 	if (print_cache == 0)
 		goto skip_cache;
 
-#define PR_GROUPLIST(pcg)						\
-	(*pr)("\t\tgroup %p: avail %d\n", pcg, pcg->pcg_avail);		\
-	for (i = 0; i < PCG_NOBJECTS; i++) {				\
-		if (pcg->pcg_objects[i].pcgo_pa !=			\
-		    POOL_PADDR_INVALID) {				\
-			(*pr)("\t\t\t%p, 0x%llx\n",			\
-			    pcg->pcg_objects[i].pcgo_va,		\
-			    (unsigned long long)			\
-			    pcg->pcg_objects[i].pcgo_pa);		\
-		} else {						\
-			(*pr)("\t\t\t%p\n",				\
-			    pcg->pcg_objects[i].pcgo_va);		\
-		}							\
-	}
-
-	LIST_FOREACH(pc, &pp->pr_cachelist, pc_poollist) {
-		(*pr)("\tcache %p\n", pc);
+	TAILQ_FOREACH(pc, &pp->pr_cachelist, pc_poollist) {
+		(*pr)("\tcache %p: allocfrom %p freeto %p\n", pc,
+		    pc->pc_allocfrom, pc->pc_freeto);
 		(*pr)("\t    hits %lu misses %lu ngroups %lu nitems %lu\n",
 		    pc->pc_hits, pc->pc_misses, pc->pc_ngroups, pc->pc_nitems);
-		(*pr)("\t    full groups:\n");
-		LIST_FOREACH(pcg, &pc->pc_fullgroups, pcg_list) {
-			PR_GROUPLIST(pcg);
-		}
-		(*pr)("\t    partial groups:\n");
-		LIST_FOREACH(pcg, &pc->pc_partgroups, pcg_list) {
-			PR_GROUPLIST(pcg);
-		}
-		(*pr)("\t    empty groups:\n");
-		LIST_FOREACH(pcg, &pc->pc_emptygroups, pcg_list) {
-			PR_GROUPLIST(pcg);
+		TAILQ_FOREACH(pcg, &pc->pc_grouplist, pcg_list) {
+			(*pr)("\t\tgroup %p: avail %d\n", pcg, pcg->pcg_avail);
+			for (i = 0; i < PCG_NOBJECTS; i++) {
+				if (pcg->pcg_objects[i].pcgo_pa !=
+				    POOL_PADDR_INVALID) {
+					(*pr)("\t\t\t%p, 0x%llx\n",
+					    pcg->pcg_objects[i].pcgo_va,
+					    (unsigned long long)
+					    pcg->pcg_objects[i].pcgo_pa);
+				} else {
+					(*pr)("\t\t\t%p\n",
+					    pcg->pcg_objects[i].pcgo_va);
+				}
+			}
 		}
 	}
-#undef PR_GROUPLIST
 
  skip_cache:
 	pr_enter_check(pp, pr);
@@ -1770,12 +1530,9 @@ pool_chk_page(struct pool *pp, const cha
 		return 1;
 	}
 
-	if ((pp->pr_roflags & PR_NOTOUCH) != 0)
-		return 0;
-
-	for (pi = LIST_FIRST(&ph->ph_itemlist), n = 0;
+	for (pi = TAILQ_FIRST(&ph->ph_itemlist), n = 0;
 	     pi != NULL;
-	     pi = LIST_NEXT(pi,pi_list), n++) {
+	     pi = TAILQ_NEXT(pi,pi_list), n++) {
 
 #ifdef DIAGNOSTIC
 		if (pi->pi_magic != PI_MAGIC) {
@@ -1852,11 +1609,11 @@ pool_cache_init(struct pool_cache *pc, s
     void *arg)
 {
 
-	LIST_INIT(&pc->pc_emptygroups);
-	LIST_INIT(&pc->pc_fullgroups);
-	LIST_INIT(&pc->pc_partgroups);
+	TAILQ_INIT(&pc->pc_grouplist);
 	simple_lock_init(&pc->pc_slock);
 
+	pc->pc_allocfrom = NULL;
+	pc->pc_freeto = NULL;
 	pc->pc_pool = pp;
 
 	pc->pc_ctor = ctor;
@@ -1871,7 +1628,7 @@ pool_cache_init(struct pool_cache *pc, s
 	pc->pc_nitems = 0;
 
 	simple_lock(&pp->pr_slock);
-	LIST_INSERT_HEAD(&pp->pr_cachelist, pc, pc_poollist);
+	TAILQ_INSERT_TAIL(&pp->pr_cachelist, pc, pc_poollist);
 	simple_unlock(&pp->pr_slock);
 }
 
@@ -1890,7 +1647,7 @@ pool_cache_destroy(struct pool_cache *pc
 
 	/* ...and remove it from the pool's cache list. */
 	simple_lock(&pp->pr_slock);
-	LIST_REMOVE(pc, pc_poollist);
+	TAILQ_REMOVE(&pp->pr_cachelist, pc, pc_poollist);
 	simple_unlock(&pp->pr_slock);
 }
 
@@ -1926,20 +1683,6 @@ pcg_put(struct pool_cache_group *pcg, vo
 	pcg->pcg_objects[idx].pcgo_pa = pa;
 }
 
-static void
-pcg_grouplist_free(struct pool_cache_grouplist *pcgl)
-{
-	struct pool_cache_group *pcg;
-	int s;
-
-	s = splvm();
-	while ((pcg = LIST_FIRST(pcgl)) != NULL) {
-		LIST_REMOVE(pcg, pcg_list);
-		pool_put(&pcgpool, pcg);
-	}
-	splx(s);
-}
-
 /*
  * pool_cache_get{,_paddr}:
  *
@@ -1959,15 +1702,13 @@ pool_cache_get_paddr(struct pool_cache *
 
 	simple_lock(&pc->pc_slock);
 
-	pcg = LIST_FIRST(&pc->pc_partgroups);
-	if (pcg == NULL) {
-		pcg = LIST_FIRST(&pc->pc_fullgroups);
-		if (pcg != NULL) {
-			LIST_REMOVE(pcg, pcg_list);
-			LIST_INSERT_HEAD(&pc->pc_partgroups, pcg, pcg_list);
+	if ((pcg = pc->pc_allocfrom) == NULL) {
+		TAILQ_FOREACH(pcg, &pc->pc_grouplist, pcg_list) {
+			if (pcg->pcg_avail != 0) {
+				pc->pc_allocfrom = pcg;
+				goto have_group;
+			}
 		}
-	}
-	if (pcg == NULL) {
 
 		/*
 		 * No groups with any available objects.  Allocate
@@ -1994,14 +1735,14 @@ pool_cache_get_paddr(struct pool_cache *
 		return (object);
 	}
 
+ have_group:
 	pc->pc_hits++;
 	pc->pc_nitems--;
 	object = pcg_get(pcg, pap);
 
-	if (pcg->pcg_avail == 0) {
-		LIST_REMOVE(pcg, pcg_list);
-		LIST_INSERT_HEAD(&pc->pc_emptygroups, pcg, pcg_list);
-	}
+	if (pcg->pcg_avail == 0)
+		pc->pc_allocfrom = NULL;
+
 	simple_unlock(&pc->pc_slock);
 
 	return (object);
@@ -2021,15 +1762,13 @@ pool_cache_put_paddr(struct pool_cache *
 
 	simple_lock(&pc->pc_slock);
 
-	pcg = LIST_FIRST(&pc->pc_partgroups);
-	if (pcg == NULL) {
-		pcg = LIST_FIRST(&pc->pc_emptygroups);
-		if (pcg != NULL) {
-			LIST_REMOVE(pcg, pcg_list);
-			LIST_INSERT_HEAD(&pc->pc_partgroups, pcg, pcg_list);
+	if ((pcg = pc->pc_freeto) == NULL) {
+		TAILQ_FOREACH(pcg, &pc->pc_grouplist, pcg_list) {
+			if (pcg->pcg_avail != PCG_NOBJECTS) {
+				pc->pc_freeto = pcg;
+				goto have_group;
+			}
 		}
-	}
-	if (pcg == NULL) {
 
 		/*
 		 * No empty groups to free the object to.  Attempt to
@@ -2039,28 +1778,31 @@ pool_cache_put_paddr(struct pool_cache *
 		s = splvm();
 		pcg = pool_get(&pcgpool, PR_NOWAIT);
 		splx(s);
-		if (pcg == NULL) {
-
-			/*
-			 * Unable to allocate a cache group; destruct the object
-			 * and free it back to the pool.
-			 */
-			pool_cache_destruct_object(pc, object);
-			return;
+		if (pcg != NULL) {
+			memset(pcg, 0, sizeof(*pcg));
+			simple_lock(&pc->pc_slock);
+			pc->pc_ngroups++;
+			TAILQ_INSERT_TAIL(&pc->pc_grouplist, pcg, pcg_list);
+			if (pc->pc_freeto == NULL)
+				pc->pc_freeto = pcg;
+			goto have_group;
 		}
-		memset(pcg, 0, sizeof(*pcg));
-		simple_lock(&pc->pc_slock);
-		pc->pc_ngroups++;
-		LIST_INSERT_HEAD(&pc->pc_partgroups, pcg, pcg_list);
+
+		/*
+		 * Unable to allocate a cache group; destruct the object
+		 * and free it back to the pool.
+		 */
+		pool_cache_destruct_object(pc, object);
+		return;
 	}
 
+ have_group:
 	pc->pc_nitems++;
 	pcg_put(pcg, object, pa);
 
-	if (pcg->pcg_avail == PCG_NOBJECTS) {
-		LIST_REMOVE(pcg, pcg_list);
-		LIST_INSERT_HEAD(&pc->pc_fullgroups, pcg, pcg_list);
-	}
+	if (pcg->pcg_avail == PCG_NOBJECTS)
+		pc->pc_freeto = NULL;
+
 	simple_unlock(&pc->pc_slock);
 }
 
@@ -2079,45 +1821,44 @@ pool_cache_destruct_object(struct pool_c
 	pool_put(pc->pc_pool, object);
 }
 
+/*
+ * pool_cache_do_invalidate:
+ *
+ *	This internal function implements pool_cache_invalidate() and
+ *	pool_cache_reclaim().
+ */
 static void
-pool_do_cache_invalidate_grouplist(struct pool_cache_grouplist *pcgsl,
-    struct pool_cache *pc, struct pool_pagelist *pq,
-    struct pool_cache_grouplist *pcgdl)
+pool_cache_do_invalidate(struct pool_cache *pc, int free_groups,
+    void (*putit)(struct pool *, void *))
 {
 	struct pool_cache_group *pcg, *npcg;
 	void *object;
+	int s;
 
-	for (pcg = LIST_FIRST(pcgsl); pcg != NULL; pcg = npcg) {
-		npcg = LIST_NEXT(pcg, pcg_list);
+	for (pcg = TAILQ_FIRST(&pc->pc_grouplist); pcg != NULL;
+	     pcg = npcg) {
+		npcg = TAILQ_NEXT(pcg, pcg_list);
 		while (pcg->pcg_avail != 0) {
 			pc->pc_nitems--;
 			object = pcg_get(pcg, NULL);
+			if (pcg->pcg_avail == 0 && pc->pc_allocfrom == pcg)
+				pc->pc_allocfrom = NULL;
 			if (pc->pc_dtor != NULL)
 				(*pc->pc_dtor)(pc->pc_arg, object);
-			pool_do_put(pc->pc_pool, object, pq);
+			(*putit)(pc->pc_pool, object);
+		}
+		if (free_groups) {
+			pc->pc_ngroups--;
+			TAILQ_REMOVE(&pc->pc_grouplist, pcg, pcg_list);
+			if (pc->pc_freeto == pcg)
+				pc->pc_freeto = NULL;
+			s = splvm();
+			pool_put(&pcgpool, pcg);
+			splx(s);
 		}
-		pc->pc_ngroups--;
-		LIST_REMOVE(pcg, pcg_list);
-		LIST_INSERT_HEAD(pcgdl, pcg, pcg_list);
 	}
 }
 
-static void
-pool_do_cache_invalidate(struct pool_cache *pc, struct pool_pagelist *pq,
-    struct pool_cache_grouplist *pcgl)
-{
-
-	LOCK_ASSERT(simple_lock_held(&pc->pc_slock));
-	LOCK_ASSERT(simple_lock_held(&pc->pc_pool->pr_slock));
-
-	pool_do_cache_invalidate_grouplist(&pc->pc_fullgroups, pc, pq, pcgl);
-	pool_do_cache_invalidate_grouplist(&pc->pc_partgroups, pc, pq, pcgl);
-
-	KASSERT(LIST_EMPTY(&pc->pc_partgroups));
-	KASSERT(LIST_EMPTY(&pc->pc_fullgroups));
-	KASSERT(pc->pc_nitems == 0);
-}
-
 /*
  * pool_cache_invalidate:
  *
@@ -2127,22 +1868,10 @@ pool_do_cache_invalidate(struct pool_cac
 void
 pool_cache_invalidate(struct pool_cache *pc)
 {
-	struct pool_pagelist pq;
-	struct pool_cache_grouplist pcgl;
-
-	LIST_INIT(&pq);
-	LIST_INIT(&pcgl);
 
 	simple_lock(&pc->pc_slock);
-	simple_lock(&pc->pc_pool->pr_slock);
-
-	pool_do_cache_invalidate(pc, &pq, &pcgl);
-
-	simple_unlock(&pc->pc_pool->pr_slock);
+	pool_cache_do_invalidate(pc, 0, pool_put);
 	simple_unlock(&pc->pc_slock);
-
-	pr_pagelist_free(pc->pc_pool, &pq);
-	pcg_grouplist_free(&pcgl);
 }
 
 /*
@@ -2151,21 +1880,11 @@ pool_cache_invalidate(struct pool_cache 
  *	Reclaim a pool cache for pool_reclaim().
  */
 static void
-pool_cache_reclaim(struct pool_cache *pc, struct pool_pagelist *pq,
-    struct pool_cache_grouplist *pcgl)
+pool_cache_reclaim(struct pool_cache *pc)
 {
 
-	/*
-	 * We're locking in the wrong order (normally pool_cache -> pool,
-	 * but the pool is already locked when we get here), so we have
-	 * to use trylock.  If we can't lock the pool_cache, it's not really
-	 * a big deal here.
-	 */
-	if (simple_lock_try(&pc->pc_slock) == 0)
-		return;
-
-	pool_do_cache_invalidate(pc, pq, pcgl);
-
+	simple_lock(&pc->pc_slock);
+	pool_cache_do_invalidate(pc, 1, pool_do_put);
 	simple_unlock(&pc->pc_slock);
 }
 
@@ -2228,8 +1947,6 @@ pool_allocator_alloc(struct pool *org, i
 	int s, freed;
 	void *res;
 
-	LOCK_ASSERT(!simple_lock_held(&org->pr_slock));
-
 	do {
 		if ((res = (*pa->pa_alloc)(org, flags)) != NULL)
 			return (res);
@@ -2300,8 +2017,6 @@ pool_allocator_free(struct pool *pp, voi
 	struct pool_allocator *pa = pp->pr_alloc;
 	int s;
 
-	LOCK_ASSERT(!simple_lock_held(&pp->pr_slock));
-
 	(*pa->pa_free)(pp, v);
 
 	s = splvm();
@@ -2330,29 +2045,14 @@ pool_page_alloc(struct pool *pp, int fla
 {
 	boolean_t waitok = (flags & PR_WAITOK) ? TRUE : FALSE;
 
-	return ((void *) uvm_km_alloc_poolpage_cache(kmem_map, waitok));
+	return ((void *) uvm_km_alloc_poolpage(waitok));
 }
 
 void
 pool_page_free(struct pool *pp, void *v)
 {
 
-	uvm_km_free_poolpage_cache(kmem_map, (vaddr_t) v);
-}
-
-static void *
-pool_page_alloc_meta(struct pool *pp, int flags)
-{
-	boolean_t waitok = (flags & PR_WAITOK) ? TRUE : FALSE;
-
-	return ((void *) uvm_km_alloc_poolpage(kmem_map, waitok));
-}
-
-static void
-pool_page_free_meta(struct pool *pp, void *v)
-{
-
-	uvm_km_free_poolpage(kmem_map, (vaddr_t) v);
+	uvm_km_free_poolpage((vaddr_t) v);
 }
 
 #ifdef POOL_SUBPAGE
@@ -2360,21 +2060,15 @@ pool_page_free_meta(struct pool *pp, voi
 void *
 pool_subpage_alloc(struct pool *pp, int flags)
 {
-	void *v;
-	int s;
-	s = splvm();
-	v = pool_get(&psppool, flags);
-	splx(s);
-	return v;
+
+	return (pool_get(&psppool, flags));
 }
 
 void
 pool_subpage_free(struct pool *pp, void *v)
 {
-	int s;
-	s = splvm();
+
 	pool_put(&psppool, v);
-	splx(s);
 }
 
 /* We don't provide a real nointr allocator.  Maybe later. */
@@ -2397,13 +2091,14 @@ pool_page_alloc_nointr(struct pool *pp, 
 {
 	boolean_t waitok = (flags & PR_WAITOK) ? TRUE : FALSE;
 
-	return ((void *) uvm_km_alloc_poolpage_cache(kernel_map, waitok));
+	return ((void *) uvm_km_alloc_poolpage1(kernel_map,
+	    uvm.kernel_object, waitok));
 }
 
 void
 pool_page_free_nointr(struct pool *pp, void *v)
 {
 
-	uvm_km_free_poolpage_cache(kernel_map, (vaddr_t) v);
+	uvm_km_free_poolpage1(kernel_map, (vaddr_t) v);
 }
 #endif /* POOL_SUBPAGE */