Sun May 31 23:34:34 2020 UTC ()

Switch from kmem_intr_alloc(sz, KM_NOSLEEP) to kmem_alloc(sz, KM_SLEEP).

Clearly document these functions are *not* for DDB session, but for
permanent data storage when initializing DDB.


(rin)

diff -r1.3 -r1.4 src/sys/ddb/db_kernel.c

--- src/sys/ddb/db_kernel.c 2020/05/31 09:42:46	1.3
+++ src/sys/ddb/db_kernel.c 2020/05/31 23:34:34	1.4

 @@ -1,14 +1,14 @@
-/*	$NetBSD: db_kernel.c,v 1.3 2020/05/31 09:42:46 rin Exp $	*/
+/*	$NetBSD: db_kernel.c,v 1.4 2020/05/31 23:34:34 rin Exp $	*/
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * 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.
 @@ -20,47 +20,52 @@
  * ``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: db_kernel.c,v 1.3 2020/05/31 09:42:46 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_kernel.c,v 1.4 2020/05/31 23:34:34 rin Exp $");
 #include <sys/param.h>
 #include <sys/kmem.h>
 #include <ddb/ddb.h>
 /*
  * XXX
- * DDB can be running in the interrupt context, e.g., when activated from
+ * These routines are *not* intended for a DDB session:
  * console. Therefore, we use kmem_intr_alloc(9) and friends here to avoid
- * assertion failure.
+ * - It disturbes on-going debugged kernel datastructures.
+ *
  * - DDB can be running in the interrupt context, e.g., when activated from
  *   console. This results in assertion failures in the allocator.
+ *
  * Use these only for permanent data storage when initializing DDB.
  */
 void *
 db_alloc(size_t sz)
+{
-	return kmem_intr_alloc(sz, KM_NOSLEEP);
+	return kmem_alloc(sz, KM_SLEEP);
+}
 void *
 db_zalloc(size_t sz)
+{
-	return kmem_intr_zalloc(sz, KM_NOSLEEP);
+	return kmem_zalloc(sz, KM_SLEEP);
+}
 void
 db_free(void *p, size_t sz)
+{
-	kmem_intr_free(p, sz);
+	kmem_free(p, sz);
+}