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.30.2.6
retrieving revision 1.31
diff -u -p -r1.30.2.6 -r1.31
--- src/sys/kern/subr_pool.c	2001/02/11 19:16:48	1.30.2.6
+++ src/sys/kern/subr_pool.c	2000/02/14 19:28:19	1.31
@@ -1,7 +1,7 @@
-/*	$NetBSD: subr_pool.c,v 1.30.2.6 2001/02/11 19:16:48 bouyer Exp $	*/
+/*	$NetBSD: subr_pool.c,v 1.31 2000/02/14 19:28:19 thorpej Exp $	*/
 
 /*-
- * Copyright (c) 1997, 1999, 2000 The NetBSD Foundation, Inc.
+ * Copyright (c) 1997, 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
@@ -51,6 +51,9 @@
 #include <sys/pool.h>
 #include <sys/syslog.h>
 
+#include <vm/vm.h>
+#include <vm/vm_kern.h>
+
 #include <uvm/uvm.h>
 
 /*
@@ -94,63 +97,28 @@ struct pool_item_header {
 struct pool_item {
 #ifdef DIAGNOSTIC
 	int pi_magic;
-#endif
 #define	PI_MAGIC 0xdeadbeef
+#endif
 	/* Other entries use only this list entry */
 	TAILQ_ENTRY(pool_item)	pi_list;
 };
 
+
 #define	PR_HASH_INDEX(pp,addr) \
 	(((u_long)(addr) >> (pp)->pr_pageshift) & (PR_HASHTABSIZE - 1))
 
-/*
- * Pool cache management.
- *
- * Pool caches provide a way for constructed objects to be cached by the
- * pool subsystem.  This can lead to performance improvements by avoiding
- * needless object construction/destruction; it is deferred until absolutely
- * necessary.
- *
- * Caches are grouped into cache groups.  Each cache group references
- * up to 16 constructed objects.  When a cache allocates an object
- * from the pool, it calls the object's constructor and places it into
- * a cache group.  When a cache group frees an object back to the pool,
- * it first calls the object's destructor.  This allows the object to
- * persist in constructed form while freed to the cache.
- *
- * Multiple caches may exist for each pool.  This allows a single
- * object type to have multiple constructed forms.  The pool references
- * each cache, so that when a pool is drained by the pagedaemon, it can
- * drain each individual cache as well.  Each time a cache is drained,
- * the most idle cache group is freed to the pool in its entirety.
- *
- * Pool caches are layed on top of pools.  By layering them, we can avoid
- * the complexity of cache management for pools which would not benefit
- * from it.
- */
-
-/* The cache group pool. */
-static struct pool pcgpool;
-
-/* The pool cache group. */
-#define	PCG_NOBJECTS		16
-struct pool_cache_group {
-	TAILQ_ENTRY(pool_cache_group)
-		pcg_list;	/* link in the pool cache's group list */
-	u_int	pcg_avail;	/* # available objects */
-				/* pointers to the objects */
-	void	*pcg_objects[PCG_NOBJECTS];
-};
 
-static void	pool_cache_reclaim(struct pool_cache *);
 
-static int	pool_catchup(struct pool *);
-static int	pool_prime_page(struct pool *, caddr_t, int);
-static void	*pool_page_alloc(unsigned long, int, int);
-static void	pool_page_free(void *, unsigned long, int);
+static struct pool_item_header
+		*pr_find_pagehead __P((struct pool *, caddr_t));
+static void	pr_rmpage __P((struct pool *, struct pool_item_header *));
+static int	pool_catchup __P((struct pool *));
+static void	pool_prime_page __P((struct pool *, caddr_t));
+static void	*pool_page_alloc __P((unsigned long, int, int));
+static void	pool_page_free __P((void *, unsigned long, int));
 
-static void pool_print1(struct pool *, const char *,
-	void (*)(const char *, ...));
+static void pool_print1 __P((struct pool *, const char *,
+	void (*)(const char *, ...)));
 
 /*
  * Pool log entry. An array of these is allocated in pool_create().
@@ -172,8 +140,21 @@ struct pool_log {
 int pool_logsize = POOL_LOGSIZE;
 
 #ifdef DIAGNOSTIC
-static __inline void
-pr_log(struct pool *pp, void *v, int action, const char *file, long line)
+static void	pr_log __P((struct pool *, void *, int, const char *, long));
+static void	pr_printlog __P((struct pool *, struct pool_item *,
+		    void (*)(const char *, ...)));
+static void	pr_enter __P((struct pool *, const char *, long));
+static void	pr_leave __P((struct pool *));
+static void	pr_enter_check __P((struct pool *,
+		    void (*)(const char *, ...)));
+
+static __inline__ void
+pr_log(pp, v, action, file, line)
+	struct pool	*pp;
+	void		*v;
+	int		action;
+	const char	*file;
+	long		line;
 {
 	int n = pp->pr_curlogentry;
 	struct pool_log *pl;
@@ -196,8 +177,10 @@ pr_log(struct pool *pp, void *v, int act
 }
 
 static void
-pr_printlog(struct pool *pp, struct pool_item *pi,
-    void (*pr)(const char *, ...))
+pr_printlog(pp, pi, pr)
+	struct pool *pp;
+	struct pool_item *pi;
+	void (*pr) __P((const char *, ...));
 {
 	int i = pp->pr_logsize;
 	int n = pp->pr_curlogentry;
@@ -225,11 +208,14 @@ pr_printlog(struct pool *pp, struct pool
 	}
 }
 
-static __inline void
-pr_enter(struct pool *pp, const char *file, long line)
+static __inline__ void
+pr_enter(pp, file, line)
+	struct pool *pp;
+	const char *file;
+	long line;
 {
 
-	if (__predict_false(pp->pr_entered_file != NULL)) {
+	if (pp->pr_entered_file != NULL) {
 		printf("pool %s: reentrancy at file %s line %ld\n",
 		    pp->pr_wchan, file, line);
 		printf("         previous entry at file %s line %ld\n",
@@ -241,11 +227,12 @@ pr_enter(struct pool *pp, const char *fi
 	pp->pr_entered_line = line;
 }
 
-static __inline void
-pr_leave(struct pool *pp)
+static __inline__ void
+pr_leave(pp)
+	struct pool *pp;
 {
 
-	if (__predict_false(pp->pr_entered_file == NULL)) {
+	if (pp->pr_entered_file == NULL) {
 		printf("pool %s not entered?\n", pp->pr_wchan);
 		panic("pr_leave");
 	}
@@ -254,8 +241,10 @@ pr_leave(struct pool *pp)
 	pp->pr_entered_line = 0;
 }
 
-static __inline void
-pr_enter_check(struct pool *pp, void (*pr)(const char *, ...))
+static __inline__ void
+pr_enter_check(pp, pr)
+	struct pool *pp;
+	void (*pr) __P((const char *, ...));
 {
 
 	if (pp->pr_entered_file != NULL)
@@ -273,8 +262,10 @@ pr_enter_check(struct pool *pp, void (*p
 /*
  * Return the pool page header based on page address.
  */
-static __inline struct pool_item_header *
-pr_find_pagehead(struct pool *pp, caddr_t page)
+static __inline__ struct pool_item_header *
+pr_find_pagehead(pp, page)
+	struct pool *pp;
+	caddr_t page;
 {
 	struct pool_item_header *ph;
 
@@ -293,8 +284,10 @@ pr_find_pagehead(struct pool *pp, caddr_
 /*
  * Remove a page from the pool.
  */
-static __inline void
-pr_rmpage(struct pool *pp, struct pool_item_header *ph)
+static __inline__ void
+pr_rmpage(pp, ph)
+	struct pool *pp;
+	struct pool_item_header *ph;
 {
 
 	/*
@@ -347,11 +340,16 @@ pr_rmpage(struct pool *pp, struct pool_i
  * Allocate and initialize a pool.
  */
 struct pool *
-pool_create(size_t size, u_int align, u_int ioff, int nitems,
-    const char *wchan, size_t pagesz,
-    void *(*alloc)(unsigned long, int, int),
-    void (*release)(void *, unsigned long, int),
-    int mtype)
+pool_create(size, align, ioff, nitems, wchan, pagesz, alloc, release, mtype)
+	size_t	size;
+	u_int	align;
+	u_int	ioff;
+	int	nitems;
+	const char *wchan;
+	size_t	pagesz;
+	void	*(*alloc) __P((unsigned long, int, int));
+	void	(*release) __P((void *, unsigned long, int));
+	int	mtype;
 {
 	struct pool *pp;
 	int flags;
@@ -381,11 +379,17 @@ pool_create(size_t size, u_int align, u_
  * static pools that must be initialized before malloc() is available.
  */
 void
-pool_init(struct pool *pp, size_t size, u_int align, u_int ioff, int flags,
-    const char *wchan, size_t pagesz,
-    void *(*alloc)(unsigned long, int, int),
-    void (*release)(void *, unsigned long, int),
-    int mtype)
+pool_init(pp, size, align, ioff, flags, wchan, pagesz, alloc, release, mtype)
+	struct pool	*pp;
+	size_t		size;
+	u_int		align;
+	u_int		ioff;
+	int		flags;
+	const char	*wchan;
+	size_t		pagesz;
+	void		*(*alloc) __P((unsigned long, int, int));
+	void		(*release) __P((void *, unsigned long, int));
+	int		mtype;
 {
 	int off, slack, i;
 
@@ -400,7 +404,7 @@ pool_init(struct pool *pp, size_t size, 
 	/*
 	 * Check arguments and construct default values.
 	 */
-	if (!powerof2(pagesz))
+	if (!powerof2(pagesz) || pagesz > PAGE_SIZE)
 		panic("pool_init: page size invalid (%lx)\n", (u_long)pagesz);
 
 	if (alloc == NULL && release == NULL) {
@@ -421,16 +425,10 @@ pool_init(struct pool *pp, size_t size, 
 	if (size < sizeof(struct pool_item))
 		size = sizeof(struct pool_item);
 
-	size = ALIGN(size);
-	if (size > pagesz)
-		panic("pool_init: pool item size (%lu) too large",
-		      (u_long)size);
-
 	/*
 	 * Initialize the pool structure.
 	 */
 	TAILQ_INIT(&pp->pr_pagelist);
-	TAILQ_INIT(&pp->pr_cachelist);
 	pp->pr_curpage = NULL;
 	pp->pr_npages = 0;
 	pp->pr_minitems = 0;
@@ -438,7 +436,7 @@ pool_init(struct pool *pp, size_t size, 
 	pp->pr_maxpages = UINT_MAX;
 	pp->pr_roflags = flags;
 	pp->pr_flags = 0;
-	pp->pr_size = size;
+	pp->pr_size = ALIGN(size);
 	pp->pr_align = align;
 	pp->pr_wchan = wchan;
 	pp->pr_mtype = mtype;
@@ -486,7 +484,6 @@ pool_init(struct pool *pp, size_t size, 
 	 */
 	pp->pr_itemoffset = ioff = ioff % align;
 	pp->pr_itemsperpage = (off - ((align - ioff) % align)) / pp->pr_size;
-	KASSERT(pp->pr_itemsperpage != 0);
 
 	/*
 	 * Use the slack between the chunks and the page header
@@ -519,15 +516,12 @@ pool_init(struct pool *pp, size_t size, 
 	simple_lock_init(&pp->pr_slock);
 
 	/*
-	 * Initialize private page header pool and cache magazine pool if we
-	 * haven't done so yet.
+	 * Initialize private page header pool if we haven't done so yet.
 	 * XXX LOCKING.
 	 */
 	if (phpool.pr_size == 0) {
 		pool_init(&phpool, sizeof(struct pool_item_header), 0, 0,
-		    0, "phpool", 0, 0, 0, 0);
-		pool_init(&pcgpool, sizeof(struct pool_cache_group), 0, 0,
-		    0, "pcgpool", 0, 0, 0, 0);
+			  0, "phpool", 0, 0, 0, 0);
 	}
 
 	/* Insert into the list of all pools. */
@@ -540,14 +534,10 @@ pool_init(struct pool *pp, size_t size, 
  * De-commision a pool resource.
  */
 void
-pool_destroy(struct pool *pp)
+pool_destroy(pp)
+	struct pool *pp;
 {
 	struct pool_item_header *ph;
-	struct pool_cache *pc;
-
-	/* 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) {
@@ -581,22 +571,24 @@ pool_destroy(struct pool *pp)
  * Grab an item from the pool; must be called at appropriate spl level
  */
 void *
-_pool_get(struct pool *pp, int flags, const char *file, long line)
+_pool_get(pp, flags, file, line)
+	struct pool *pp;
+	int flags;
+	const char *file;
+	long line;
 {
 	void *v;
 	struct pool_item *pi;
 	struct pool_item_header *ph;
 
 #ifdef DIAGNOSTIC
-	if (__predict_false((pp->pr_roflags & PR_STATIC) &&
-			    (flags & PR_MALLOCOK))) {
+	if ((pp->pr_roflags & PR_STATIC) && (flags & PR_MALLOCOK)) {
 		pr_printlog(pp, NULL, printf);
 		panic("pool_get: static");
 	}
 #endif
 
-	if (__predict_false(curproc == NULL && doing_shutdown == 0 &&
-			    (flags & PR_WAITOK) != 0))
+	if (curproc == NULL && (flags & PR_WAITOK) != 0)
 		panic("pool_get: must have NOWAIT");
 
 	simple_lock(&pp->pr_slock);
@@ -609,13 +601,13 @@ _pool_get(struct pool *pp, int flags, co
 	 * the pool.
 	 */
 #ifdef DIAGNOSTIC
-	if (__predict_false(pp->pr_nout > pp->pr_hardlimit)) {
+	if (pp->pr_nout > pp->pr_hardlimit) {
 		pr_leave(pp);
 		simple_unlock(&pp->pr_slock);
 		panic("pool_get: %s: crossed hard limit", pp->pr_wchan);
 	}
 #endif
-	if (__predict_false(pp->pr_nout == pp->pr_hardlimit)) {
+	if (pp->pr_nout == pp->pr_hardlimit) {
 		if ((flags & PR_WAITOK) && !(flags & PR_LIMITFAIL)) {
 			/*
 			 * XXX: A warning isn't logged in this case.  Should
@@ -623,7 +615,9 @@ _pool_get(struct pool *pp, int flags, co
 			 */
 			pp->pr_flags |= PR_WANTED;
 			pr_leave(pp);
-			ltsleep(pp, PSWP, pp->pr_wchan, 0, &pp->pr_slock);
+			simple_unlock(&pp->pr_slock);
+			tsleep((caddr_t)pp, PSWP, pp->pr_wchan, 0);
+			simple_lock(&pp->pr_slock);
 			pr_enter(pp, file, line);
 			goto startover;
 		}
@@ -708,36 +702,28 @@ _pool_get(struct pool *pp, int flags, co
 			 */
 			pp->pr_flags |= PR_WANTED;
 			pr_leave(pp);
-			ltsleep(pp, PSWP, pp->pr_wchan, 0, &pp->pr_slock);
+			simple_unlock(&pp->pr_slock);
+			tsleep((caddr_t)pp, PSWP, pp->pr_wchan, 0);
+			simple_lock(&pp->pr_slock);
 			pr_enter(pp, file, line);
 			goto startover;
 		}
 
 		/* We have more memory; add it to the pool */
-		if (pool_prime_page(pp, v, flags & PR_WAITOK) != 0) {
-			/*
-			 * Probably, we don't allowed to wait and
-			 * couldn't allocate a page header.
-			 */
-			(*pp->pr_free)(v, pp->pr_pagesz, pp->pr_mtype);
-			pp->pr_nfail++;
-			pr_leave(pp);
-			simple_unlock(&pp->pr_slock);
-			return (NULL);
-		}
 		pp->pr_npagealloc++;
+		pool_prime_page(pp, v);
 
 		/* Start the allocation process over. */
 		goto startover;
 	}
 
-	if (__predict_false((v = pi = TAILQ_FIRST(&ph->ph_itemlist)) == NULL)) {
+	if ((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)) {
+	if (pp->pr_nitems == 0) {
 		pr_leave(pp);
 		simple_unlock(&pp->pr_slock);
 		printf("pool_get: %s: items on itemlist, nitems %u\n",
@@ -748,7 +734,7 @@ _pool_get(struct pool *pp, int flags, co
 	pr_log(pp, v, PRLOG_GET, file, line);
 
 #ifdef DIAGNOSTIC
-	if (__predict_false(pi->pi_magic != PI_MAGIC)) {
+	if (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",
@@ -764,7 +750,7 @@ _pool_get(struct pool *pp, int flags, co
 	pp->pr_nout++;
 	if (ph->ph_nmissing == 0) {
 #ifdef DIAGNOSTIC
-		if (__predict_false(pp->pr_nidle == 0))
+		if (pp->pr_nidle == 0)
 			panic("pool_get: nidle inconsistent");
 #endif
 		pp->pr_nidle--;
@@ -772,7 +758,7 @@ _pool_get(struct pool *pp, int flags, co
 	ph->ph_nmissing++;
 	if (TAILQ_FIRST(&ph->ph_itemlist) == NULL) {
 #ifdef DIAGNOSTIC
-		if (__predict_false(ph->ph_nmissing != pp->pr_itemsperpage)) {
+		if (ph->ph_nmissing != pp->pr_itemsperpage) {
 			pr_leave(pp);
 			simple_unlock(&pp->pr_slock);
 			panic("pool_get: %s: nmissing inconsistent",
@@ -820,10 +806,14 @@ _pool_get(struct pool *pp, int flags, co
 }
 
 /*
- * Internal version of pool_put().  Pool is already locked/entered.
+ * Return resource to the pool; must be called at appropriate spl level
  */
-static void
-pool_do_put(struct pool *pp, void *v, const char *file, long line)
+void
+_pool_put(pp, v, file, line)
+	struct pool *pp;
+	void *v;
+	const char *file;
+	long line;
 {
 	struct pool_item *pi = v;
 	struct pool_item_header *ph;
@@ -832,8 +822,11 @@ pool_do_put(struct pool *pp, void *v, co
 
 	page = (caddr_t)((u_long)v & pp->pr_pagemask);
 
+	simple_lock(&pp->pr_slock);
+	pr_enter(pp, file, line);
+
 #ifdef DIAGNOSTIC
-	if (__predict_false(pp->pr_nout == 0)) {
+	if (pp->pr_nout == 0) {
 		printf("pool %s: putting with none out\n",
 		    pp->pr_wchan);
 		panic("pool_put");
@@ -842,7 +835,7 @@ pool_do_put(struct pool *pp, void *v, co
 
 	pr_log(pp, v, PRLOG_PUT, file, line);
 
-	if (__predict_false((ph = pr_find_pagehead(pp, page)) == NULL)) {
+	if ((ph = pr_find_pagehead(pp, page)) == NULL) {
 		pr_printlog(pp, NULL, printf);
 		panic("pool_put: %s: page header missing", pp->pr_wchan);
 	}
@@ -858,18 +851,9 @@ pool_do_put(struct pool *pp, void *v, co
 	 * Return to item list.
 	 */
 #ifdef DIAGNOSTIC
+	/* XXX Should fill the item. */
 	pi->pi_magic = PI_MAGIC;
 #endif
-#ifdef DEBUG
-	{
-		int i, *ip = v;
-
-		for (i = 0; i < pp->pr_size / sizeof(int); i++) {
-			*ip++ = PI_MAGIC;
-		}
-	}
-#endif
-
 	TAILQ_INSERT_HEAD(&ph->ph_itemlist, pi, pi_list);
 	ph->ph_nmissing--;
 	pp->pr_nput++;
@@ -884,6 +868,8 @@ pool_do_put(struct pool *pp, void *v, co
 		pp->pr_flags &= ~PR_WANTED;
 		if (ph->ph_nmissing == 0)
 			pp->pr_nidle++;
+		pr_leave(pp);
+		simple_unlock(&pp->pr_slock);
 		wakeup((caddr_t)pp);
 		return;
 	}
@@ -947,35 +933,26 @@ pool_do_put(struct pool *pp, void *v, co
 		TAILQ_INSERT_HEAD(&pp->pr_pagelist, ph, ph_pagelist);
 		pp->pr_curpage = ph;
 	}
-}
-
-/*
- * Return resource to the pool; must be called at appropriate spl level
- */
-void
-_pool_put(struct pool *pp, void *v, const char *file, long line)
-{
-
-	simple_lock(&pp->pr_slock);
-	pr_enter(pp, file, line);
-
-	pool_do_put(pp, v, file, line);
 
 	pr_leave(pp);
 	simple_unlock(&pp->pr_slock);
+
 }
 
 /*
  * Add N items to the pool.
  */
 int
-pool_prime(struct pool *pp, int n, caddr_t storage)
+pool_prime(pp, n, storage)
+	struct pool *pp;
+	int n;
+	caddr_t storage;
 {
 	caddr_t cp;
-	int error, newnitems, newpages;
+	int newnitems, newpages;
 
 #ifdef DIAGNOSTIC
-	if (__predict_false(storage && !(pp->pr_roflags & PR_STATIC)))
+	if (storage && !(pp->pr_roflags & PR_STATIC))
 		panic("pool_prime: static");
 	/* !storage && static caught below */
 #endif
@@ -1002,14 +979,8 @@ pool_prime(struct pool *pp, int n, caddr
 			return (ENOMEM);
 		}
 
-		if ((error = pool_prime_page(pp, cp, PR_NOWAIT)) != 0) {
-			if ((pp->pr_roflags & PR_STATIC) == 0)
-				(*pp->pr_free)(cp, pp->pr_pagesz,
-				    pp->pr_mtype);
-			simple_unlock(&pp->pr_slock);
-			return (error);
-		}
 		pp->pr_npagealloc++;
+		pool_prime_page(pp, cp);
 		pp->pr_minpages++;
 	}
 
@@ -1027,8 +998,10 @@ pool_prime(struct pool *pp, int n, caddr
  *
  * Note, we must be called with the pool descriptor LOCKED.
  */
-static int
-pool_prime_page(struct pool *pp, caddr_t storage, int flags)
+static void
+pool_prime_page(pp, storage)
+	struct pool *pp;
+	caddr_t storage;
 {
 	struct pool_item *pi;
 	struct pool_item_header *ph;
@@ -1037,17 +1010,12 @@ pool_prime_page(struct pool *pp, caddr_t
 	unsigned int ioff = pp->pr_itemoffset;
 	int s, n;
 
-	if (((u_long)cp & (pp->pr_pagesz - 1)) != 0)
-		panic("pool_prime_page: %s: unaligned page", pp->pr_wchan);
-
 	if ((pp->pr_roflags & PR_PHINPAGE) != 0) {
 		ph = (struct pool_item_header *)(cp + pp->pr_phoffset);
 	} else {
 		s = splhigh();
-		ph = pool_get(&phpool, flags);
+		ph = pool_get(&phpool, PR_URGENT);
 		splx(s);
-		if (ph == NULL)
-			return (ENOMEM);
 		LIST_INSERT_HEAD(&pp->pr_hashtab[PR_HASH_INDEX(pp, cp)],
 				 ph, ph_hashlist);
 	}
@@ -1101,8 +1069,6 @@ pool_prime_page(struct pool *pp, caddr_t
 
 	if (++pp->pr_npages > pp->pr_hiwat)
 		pp->pr_hiwat = pp->pr_npages;
-
-	return (0);
 }
 
 /*
@@ -1118,7 +1084,8 @@ pool_prime_page(struct pool *pp, caddr_t
  * with it locked.
  */
 static int
-pool_catchup(struct pool *pp)
+pool_catchup(pp)
+	struct pool *pp;
 {
 	caddr_t cp;
 	int error = 0;
@@ -1145,22 +1112,21 @@ pool_catchup(struct pool *pp)
 		simple_unlock(&pp->pr_slock);
 		cp = (*pp->pr_alloc)(pp->pr_pagesz, 0, pp->pr_mtype);
 		simple_lock(&pp->pr_slock);
-		if (__predict_false(cp == NULL)) {
+		if (cp == NULL) {
 			error = ENOMEM;
 			break;
 		}
-		if ((error = pool_prime_page(pp, cp, PR_NOWAIT)) != 0) {
-			(*pp->pr_free)(cp, pp->pr_pagesz, pp->pr_mtype);
-			break;
-		}
 		pp->pr_npagealloc++;
+		pool_prime_page(pp, cp);
 	}
 
 	return (error);
 }
 
 void
-pool_setlowat(struct pool *pp, int n)
+pool_setlowat(pp, n)
+	pool_handle_t	pp;
+	int n;
 {
 	int error;
 
@@ -1172,8 +1138,7 @@ pool_setlowat(struct pool *pp, int n)
 		: roundup(n, pp->pr_itemsperpage) / pp->pr_itemsperpage;
 
 	/* Make sure we're caught up with the newly-set low water mark. */
-	if ((pp->pr_nitems < pp->pr_minitems) &&
-	    (error = pool_catchup(pp)) != 0) {
+	if ((error = pool_catchup(pp)) != 0) {
 		/*
 		 * XXX: Should we log a warning?  Should we set up a timeout
 		 * to try again in a second or so?  The latter could break
@@ -1185,7 +1150,9 @@ pool_setlowat(struct pool *pp, int n)
 }
 
 void
-pool_sethiwat(struct pool *pp, int n)
+pool_sethiwat(pp, n)
+	pool_handle_t	pp;
+	int n;
 {
 
 	simple_lock(&pp->pr_slock);
@@ -1198,7 +1165,11 @@ pool_sethiwat(struct pool *pp, int n)
 }
 
 void
-pool_sethardlimit(struct pool *pp, int n, const char *warnmess, int ratecap)
+pool_sethardlimit(pp, n, warnmess, ratecap)
+	pool_handle_t pp;
+	int n;
+	const char *warnmess;
+	int ratecap;
 {
 
 	simple_lock(&pp->pr_slock);
@@ -1224,7 +1195,10 @@ pool_sethardlimit(struct pool *pp, int n
  * Default page allocator.
  */
 static void *
-pool_page_alloc(unsigned long sz, int flags, int mtype)
+pool_page_alloc(sz, flags, mtype)
+	unsigned long sz;
+	int flags;
+	int mtype;
 {
 	boolean_t waitok = (flags & PR_WAITOK) ? TRUE : FALSE;
 
@@ -1232,7 +1206,10 @@ pool_page_alloc(unsigned long sz, int fl
 }
 
 static void
-pool_page_free(void *v, unsigned long sz, int mtype)
+pool_page_free(v, sz, mtype)
+	void *v;
+	unsigned long sz;
+	int mtype;
 {
 
 	uvm_km_free_poolpage((vaddr_t)v);
@@ -1243,7 +1220,10 @@ pool_page_free(void *v, unsigned long sz
  * never be accessed in interrupt context.
  */
 void *
-pool_page_alloc_nointr(unsigned long sz, int flags, int mtype)
+pool_page_alloc_nointr(sz, flags, mtype)
+	unsigned long sz;
+	int flags;
+	int mtype;
 {
 	boolean_t waitok = (flags & PR_WAITOK) ? TRUE : FALSE;
 
@@ -1252,7 +1232,10 @@ pool_page_alloc_nointr(unsigned long sz,
 }
 
 void
-pool_page_free_nointr(void *v, unsigned long sz, int mtype)
+pool_page_free_nointr(v, sz, mtype)
+	void *v;
+	unsigned long sz;
+	int mtype;
 {
 
 	uvm_km_free_poolpage1(kernel_map, (vaddr_t)v);
@@ -1263,10 +1246,12 @@ pool_page_free_nointr(void *v, unsigned 
  * Release all complete pages that have not been used recently.
  */
 void
-_pool_reclaim(struct pool *pp, const char *file, long line)
+_pool_reclaim(pp, file, line)
+	pool_handle_t pp;
+	const char *file;
+	long line;
 {
 	struct pool_item_header *ph, *phnext;
-	struct pool_cache *pc;
 	struct timeval curtime;
 	int s;
 
@@ -1277,13 +1262,6 @@ _pool_reclaim(struct pool *pp, const cha
 		return;
 	pr_enter(pp, file, line);
 
-	/*
-	 * Reclaim items from the pool's caches.
-	 */
-	for (pc = TAILQ_FIRST(&pp->pr_cachelist); pc != NULL;
-	     pc = TAILQ_NEXT(pc, pc_poollist))
-		pool_cache_reclaim(pc);
-
 	s = splclock();
 	curtime = mono_time;
 	splx(s);
@@ -1324,12 +1302,13 @@ _pool_reclaim(struct pool *pp, const cha
  * Note, we must never be called from an interrupt context.
  */
 void
-pool_drain(void *arg)
+pool_drain(arg)
+	void *arg;
 {
 	struct pool *pp;
 	int s;
 
-	s = splvm();
+	s = splimp();
 	simple_lock(&pool_head_slock);
 
 	if (drainpp == NULL && (drainpp = TAILQ_FIRST(&pool_head)) == NULL)
@@ -1350,11 +1329,13 @@ pool_drain(void *arg)
  * Diagnostic helpers.
  */
 void
-pool_print(struct pool *pp, const char *modif)
+pool_print(pp, modif)
+	struct pool *pp;
+	const char *modif;
 {
 	int s;
 
-	s = splvm();
+	s = splimp();
 	if (simple_lock_try(&pp->pr_slock) == 0) {
 		printf("pool %s is locked; try again later\n",
 		    pp->pr_wchan);
@@ -1367,7 +1348,10 @@ pool_print(struct pool *pp, const char *
 }
 
 void
-pool_printit(struct pool *pp, const char *modif, void (*pr)(const char *, ...))
+pool_printit(pp, modif, pr)
+	struct pool *pp;
+	const char *modif;
+	void (*pr) __P((const char *, ...));
 {
 	int didlock = 0;
 
@@ -1397,15 +1381,16 @@ pool_printit(struct pool *pp, const char
 }
 
 static void
-pool_print1(struct pool *pp, const char *modif, void (*pr)(const char *, ...))
+pool_print1(pp, modif, pr)
+	struct pool *pp;
+	const char *modif;
+	void (*pr) __P((const char *, ...));
 {
 	struct pool_item_header *ph;
-	struct pool_cache *pc;
-	struct pool_cache_group *pcg;
 #ifdef DIAGNOSTIC
 	struct pool_item *pi;
 #endif
-	int i, print_log = 0, print_pagelist = 0, print_cache = 0;
+	int print_log = 0, print_pagelist = 0;
 	char c;
 
 	while ((c = *modif++) != '\0') {
@@ -1413,8 +1398,6 @@ pool_print1(struct pool *pp, const char 
 			print_log = 1;
 		if (c == 'p')
 			print_pagelist = 1;
-		if (c == 'c')
-			print_cache = 1;
 		modif++;
 	}
 
@@ -1471,30 +1454,13 @@ pool_print1(struct pool *pp, const char 
 
  skip_log:
 
-	if (print_cache == 0)
-		goto skip_cache;
-
-	for (pc = TAILQ_FIRST(&pp->pr_cachelist); pc != NULL;
-	     pc = TAILQ_NEXT(pc, 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);
-		for (pcg = TAILQ_FIRST(&pc->pc_grouplist); pcg != NULL;
-		     pcg = TAILQ_NEXT(pcg, pcg_list)) {
-			(*pr)("\t\tgroup %p: avail %d\n", pcg, pcg->pcg_avail);
-			for (i = 0; i < PCG_NOBJECTS; i++)
-				(*pr)("\t\t\t%p\n", pcg->pcg_objects[i]);
-		}
-	}
-
- skip_cache:
-
 	pr_enter_check(pp, pr);
 }
 
 int
-pool_chk(struct pool *pp, const char *label)
+pool_chk(pp, label)
+	struct pool *pp;
+	char *label;
 {
 	struct pool_item_header *ph;
 	int r = 0;
@@ -1555,263 +1521,3 @@ out:
 	simple_unlock(&pp->pr_slock);
 	return (r);
 }
-
-/*
- * pool_cache_init:
- *
- *	Initialize a pool cache.
- *
- *	NOTE: If the pool must be protected from interrupts, we expect
- *	to be called at the appropriate interrupt priority level.
- */
-void
-pool_cache_init(struct pool_cache *pc, struct pool *pp,
-    int (*ctor)(void *, void *, int),
-    void (*dtor)(void *, void *),
-    void *arg)
-{
-
-	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;
-	pc->pc_dtor = dtor;
-	pc->pc_arg  = arg;
-
-	pc->pc_hits   = 0;
-	pc->pc_misses = 0;
-
-	pc->pc_ngroups = 0;
-
-	pc->pc_nitems = 0;
-
-	simple_lock(&pp->pr_slock);
-	TAILQ_INSERT_TAIL(&pp->pr_cachelist, pc, pc_poollist);
-	simple_unlock(&pp->pr_slock);
-}
-
-/*
- * pool_cache_destroy:
- *
- *	Destroy a pool cache.
- */
-void
-pool_cache_destroy(struct pool_cache *pc)
-{
-	struct pool *pp = pc->pc_pool;
-
-	/* First, invalidate the entire cache. */
-	pool_cache_invalidate(pc);
-
-	/* ...and remove it from the pool's cache list. */
-	simple_lock(&pp->pr_slock);
-	TAILQ_REMOVE(&pp->pr_cachelist, pc, pc_poollist);
-	simple_unlock(&pp->pr_slock);
-}
-
-static __inline void *
-pcg_get(struct pool_cache_group *pcg)
-{
-	void *object;
-	u_int idx;
-
-	KASSERT(pcg->pcg_avail <= PCG_NOBJECTS);
-	KASSERT(pcg->pcg_avail != 0);
-	idx = --pcg->pcg_avail;
-
-	KASSERT(pcg->pcg_objects[idx] != NULL);
-	object = pcg->pcg_objects[idx];
-	pcg->pcg_objects[idx] = NULL;
-
-	return (object);
-}
-
-static __inline void
-pcg_put(struct pool_cache_group *pcg, void *object)
-{
-	u_int idx;
-
-	KASSERT(pcg->pcg_avail < PCG_NOBJECTS);
-	idx = pcg->pcg_avail++;
-
-	KASSERT(pcg->pcg_objects[idx] == NULL);
-	pcg->pcg_objects[idx] = object;
-}
-
-/*
- * pool_cache_get:
- *
- *	Get an object from a pool cache.
- */
-void *
-pool_cache_get(struct pool_cache *pc, int flags)
-{
-	struct pool_cache_group *pcg;
-	void *object;
-
-	simple_lock(&pc->pc_slock);
-
-	if ((pcg = pc->pc_allocfrom) == NULL) {
-		for (pcg = TAILQ_FIRST(&pc->pc_grouplist); pcg != NULL;
-		     pcg = TAILQ_NEXT(pcg, pcg_list)) {
-			if (pcg->pcg_avail != 0) {
-				pc->pc_allocfrom = pcg;
-				goto have_group;
-			}
-		}
-
-		/*
-		 * No groups with any available objects.  Allocate
-		 * a new object, construct it, and return it to
-		 * the caller.  We will allocate a group, if necessary,
-		 * when the object is freed back to the cache.
-		 */
-		pc->pc_misses++;
-		simple_unlock(&pc->pc_slock);
-		object = pool_get(pc->pc_pool, flags);
-		if (object != NULL && pc->pc_ctor != NULL) {
-			if ((*pc->pc_ctor)(pc->pc_arg, object, flags) != 0) {
-				pool_put(pc->pc_pool, object);
-				return (NULL);
-			}
-		}
-		return (object);
-	}
-
- have_group:
-	pc->pc_hits++;
-	pc->pc_nitems--;
-	object = pcg_get(pcg);
-
-	if (pcg->pcg_avail == 0)
-		pc->pc_allocfrom = NULL;
-
-	simple_unlock(&pc->pc_slock);
-
-	return (object);
-}
-
-/*
- * pool_cache_put:
- *
- *	Put an object back to the pool cache.
- */
-void
-pool_cache_put(struct pool_cache *pc, void *object)
-{
-	struct pool_cache_group *pcg;
-
-	simple_lock(&pc->pc_slock);
-
-	if ((pcg = pc->pc_freeto) == NULL) {
-		for (pcg = TAILQ_FIRST(&pc->pc_grouplist); pcg != NULL;
-		     pcg = TAILQ_NEXT(pcg, pcg_list)) {
-			if (pcg->pcg_avail != PCG_NOBJECTS) {
-				pc->pc_freeto = pcg;
-				goto have_group;
-			}
-		}
-
-		/*
-		 * No empty groups to free the object to.  Attempt to
-		 * allocate one.
-		 */
-		simple_unlock(&pc->pc_slock);
-		pcg = pool_get(&pcgpool, PR_NOWAIT);
-		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;
-		}
-
-		/*
-		 * Unable to allocate a cache group; destruct the object
-		 * and free it back to the pool.
-		 */
-		if (pc->pc_dtor != NULL)
-			(*pc->pc_dtor)(pc->pc_arg, object);
-		pool_put(pc->pc_pool, object);
-		return;
-	}
-
- have_group:
-	pc->pc_nitems++;
-	pcg_put(pcg, object);
-
-	if (pcg->pcg_avail == PCG_NOBJECTS)
-		pc->pc_freeto = NULL;
-
-	simple_unlock(&pc->pc_slock);
-}
-
-/*
- * pool_cache_do_invalidate:
- *
- *	This internal function implements pool_cache_invalidate() and
- *	pool_cache_reclaim().
- */
-static void
-pool_cache_do_invalidate(struct pool_cache *pc, int free_groups,
-    void (*putit)(struct pool *, void *, const char *, long))
-{
-	struct pool_cache_group *pcg, *npcg;
-	void *object;
-
-	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);
-			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);
-			(*putit)(pc->pc_pool, object, __FILE__, __LINE__);
-		}
-		if (free_groups) {
-			pc->pc_ngroups--;
-			TAILQ_REMOVE(&pc->pc_grouplist, pcg, pcg_list);
-			if (pc->pc_freeto == pcg)
-				pc->pc_freeto = NULL;
-			pool_put(&pcgpool, pcg);
-		}
-	}
-}
-
-/*
- * pool_cache_invalidate:
- *
- *	Invalidate a pool cache (destruct and release all of the
- *	cached objects).
- */
-void
-pool_cache_invalidate(struct pool_cache *pc)
-{
-
-	simple_lock(&pc->pc_slock);
-	pool_cache_do_invalidate(pc, 0, _pool_put);
-	simple_unlock(&pc->pc_slock);
-}
-
-/*
- * pool_cache_reclaim:
- *
- *	Reclaim a pool cache for pool_reclaim().
- */
-static void
-pool_cache_reclaim(struct pool_cache *pc)
-{
-
-	simple_lock(&pc->pc_slock);
-	pool_cache_do_invalidate(pc, 1, pool_do_put);
-	simple_unlock(&pc->pc_slock);
-}