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.129
retrieving revision 1.129.12.2
diff -u -p -r1.129 -r1.129.12.2
--- src/sys/kern/subr_pool.c	2007/03/12 18:18:34	1.129
+++ src/sys/kern/subr_pool.c	2007/10/26 15:48:40	1.129.12.2
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_pool.c,v 1.129 2007/03/12 18:18:34 ad Exp $	*/
+/*	$NetBSD: subr_pool.c,v 1.129.12.2 2007/10/26 15:48:40 joerg Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1999, 2000, 2002 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.129 2007/03/12 18:18:34 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.129.12.2 2007/10/26 15:48:40 joerg Exp $");
 
 #include "opt_pool.h"
 #include "opt_poollog.h"
@@ -1166,13 +1166,6 @@ pool_do_put(struct pool *pp, void *v, st
 		panic("pool_put: %s: page header missing", pp->pr_wchan);
 	}
 
-#ifdef LOCKDEBUG
-	/*
-	 * Check if we're freeing a locked simple lock.
-	 */
-	simple_lock_freecheck(pi, (char *)pi + pp->pr_size);
-#endif
-
 	/*
 	 * Return to item list.
 	 */
@@ -1624,6 +1617,8 @@ pool_reclaim(struct pool *pp)
  * Drain pools, one at a time.
  *
  * Note, we must never be called from an interrupt context.
+ *
+ * XXX Pool can disappear while draining.
  */
 void
 pool_drain(void *arg)
@@ -2184,26 +2179,43 @@ pool_cache_destruct_object(struct pool_c
 	pool_put(pc->pc_pool, object);
 }
 
+/*
+ * pool_do_cache_invalidate_grouplist:
+ *
+ *	Invalidate a single grouplist and destruct all objects.
+ *	XXX This is too expensive.  We should swap the list then
+ *	unlock.
+ */
 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)
 {
-	struct pool_cache_group *pcg, *npcg;
+	struct pool_cache_group *pcg;
 	void *object;
 
-	for (pcg = LIST_FIRST(pcgsl); pcg != NULL; pcg = npcg) {
-		npcg = LIST_NEXT(pcg, pcg_list);
+	LOCK_ASSERT(simple_lock_held(&pc->pc_slock));
+	LOCK_ASSERT(simple_lock_held(&pc->pc_pool->pr_slock));
+
+	while ((pcg = LIST_FIRST(pcgsl)) != NULL) {
+		pc->pc_ngroups--;
+		LIST_REMOVE(pcg, pcg_list);
+		LIST_INSERT_HEAD(pcgdl, pcg, pcg_list);
+		pc->pc_nitems -= pcg->pcg_avail;
+		simple_unlock(&pc->pc_pool->pr_slock);
+		simple_unlock(&pc->pc_slock);
+
 		while (pcg->pcg_avail != 0) {
-			pc->pc_nitems--;
 			object = pcg_get(pcg, NULL);
 			if (pc->pc_dtor != NULL)
 				(*pc->pc_dtor)(pc->pc_arg, object);
+			simple_lock(&pc->pc_pool->pr_slock);
 			pool_do_put(pc->pc_pool, object, pq);
+			simple_unlock(&pc->pc_pool->pr_slock);
 		}
-		pc->pc_ngroups--;
-		LIST_REMOVE(pcg, pcg_list);
-		LIST_INSERT_HEAD(pcgdl, pcg, pcg_list);
+
+		simple_lock(&pc->pc_slock);
+		simple_lock(&pc->pc_pool->pr_slock);
 	}
 }
 
@@ -2341,8 +2353,6 @@ pool_allocator_alloc(struct pool *pp, in
 	struct pool_allocator *pa = pp->pr_alloc;
 	void *res;
 
-	LOCK_ASSERT(!simple_lock_held(&pp->pr_slock));
-
 	res = (*pa->pa_alloc)(pp, flags);
 	if (res == NULL && (flags & PR_WAITOK) == 0) {
 		/*
@@ -2363,8 +2373,6 @@ pool_allocator_free(struct pool *pp, voi
 {
 	struct pool_allocator *pa = pp->pr_alloc;
 
-	LOCK_ASSERT(!simple_lock_held(&pp->pr_slock));
-
 	(*pa->pa_free)(pp, v);
 }