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
rcsdiff: /ftp/cvs/cvsroot/src/sys/kern/subr_pool.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.137
retrieving revision 1.137.2.2
diff -u -p -r1.137 -r1.137.2.2
--- src/sys/kern/subr_pool.c	2007/11/18 16:27:43	1.137
+++ src/sys/kern/subr_pool.c	2007/12/12 22:03:31	1.137.2.2
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_pool.c,v 1.137 2007/11/18 16:27:43 ad Exp $	*/
+/*	$NetBSD: subr_pool.c,v 1.137.2.2 2007/12/12 22:03:31 ad Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1999, 2000, 2002, 2007 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.137 2007/11/18 16:27:43 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.137.2.2 2007/12/12 22:03:31 ad Exp $");
 
 #include "opt_pool.h"
 #include "opt_poollog.h"
@@ -77,10 +77,6 @@ __KERNEL_RCSID(0, "$NetBSD: subr_pool.c,
 /* List of all pools */
 LIST_HEAD(,pool) pool_head = LIST_HEAD_INITIALIZER(pool_head);
 
-/* List of all caches. */
-LIST_HEAD(,pool_cache) pool_cache_head =
-    LIST_HEAD_INITIALIZER(pool_cache_head);
-
 /* Private pool for page header structures */
 #define	PHPOOL_MAX	8
 static struct pool phpool[PHPOOL_MAX];
@@ -185,6 +181,13 @@ static struct pool pcgpool;
 static struct pool cache_pool;
 static struct pool cache_cpu_pool;
 
+/* List of all caches. */
+LIST_HEAD(,pool_cache) pool_cache_head =
+    LIST_HEAD_INITIALIZER(pool_cache_head);
+
+int pool_cache_disable;
+
+
 static pool_cache_cpu_t *pool_cache_put_slow(pool_cache_cpu_t *, int *,
 					     void *, paddr_t);
 static pool_cache_cpu_t *pool_cache_get_slow(pool_cache_cpu_t *, int *,
@@ -802,7 +805,14 @@ pool_init(struct pool *pp, size_t size, 
 	pp->pr_entered_file = NULL;
 	pp->pr_entered_line = 0;
 
-	mutex_init(&pp->pr_lock, MUTEX_DEFAULT, ipl);
+	/*
+	 * XXXAD hack to prevent IP input processing from blocking.
+	 */
+	if (ipl == IPL_SOFTNET) {
+		mutex_init(&pp->pr_lock, MUTEX_DEFAULT, IPL_VM);
+	} else {
+		mutex_init(&pp->pr_lock, MUTEX_DEFAULT, ipl);
+	}
 	cv_init(&pp->pr_cv, wchan);
 	pp->pr_ipl = ipl;
 
@@ -2040,7 +2050,14 @@ pool_cache_bootstrap(pool_cache_t pc, si
 		palloc = &pool_allocator_nointr;
 	pool_init(pp, size, align, align_offset, flags, wchan, palloc, ipl);
 
-	mutex_init(&pc->pc_lock, MUTEX_DEFAULT, pp->pr_ipl);
+	/*
+	 * XXXAD hack to prevent IP input processing from blocking.
+	 */
+	if (ipl == IPL_SOFTNET) {
+		mutex_init(&pc->pc_lock, MUTEX_DEFAULT, IPL_VM);
+	} else {
+		mutex_init(&pc->pc_lock, MUTEX_DEFAULT, ipl);
+	}
 
 	if (ctor == NULL) {
 		ctor = (int (*)(void *, void *, int))nullop;
@@ -2576,7 +2593,11 @@ pool_cache_put_slow(pool_cache_cpu_t *cc
 	 * If we can't allocate a new group, just throw the
 	 * object away.
 	 */
-	pcg = pool_get(&pcgpool, PR_NOWAIT);
+	if (pool_cache_disable) {
+		pcg = NULL;
+	} else {
+		pcg = pool_get(&pcgpool, PR_NOWAIT);
+	}
 	if (pcg == NULL) {
 		pool_cache_destruct_object(pc, object);
 		return NULL;