 @@ -1,14 +1,14 @@
-#	$NetBSD: mi,v 1.2372 2021/01/21 15:53:15 thorpej Exp $
+#	$NetBSD: mi,v 1.2373 2021/01/24 17:29:11 thorpej Exp $
+#
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.comp				comp-sys-root
 ./usr/bin/addr2line				comp-debug-bin		binutils
 ./usr/bin/ar					comp-util-bin		binutils
 ./usr/bin/as					comp-util-bin		binutils
 ./usr/bin/asa					comp-fortran-bin
 ./usr/bin/atf-compile				comp-obsolete		obsolete
 ./usr/bin/c++					comp-cxx-bin		gcccmds
 ./usr/bin/c++filt				comp-cxx-bin		binutils
 ./usr/bin/c11					comp-c-bin
 ./usr/bin/c89					comp-c-bin
 ./usr/bin/c99					comp-c-bin
 @@ -11640,26 +11640,28 @@
 ./usr/share/man/cat9/kfilter_unregister.0	comp-sys-catman		.cat
 ./usr/share/man/cat9/killproc.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/klua_lock.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/klua_mod_register.0	comp-sys-catman		.cat
 ./usr/share/man/cat9/kmem.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/kmem_alloc.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/kmem_asprintf.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/kmem_free.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/kmem_intr_alloc.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/kmem_intr_free.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/kmem_intr_zalloc.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/kmem_strdupsize.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/kmem_strfree.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/kmem_tmpbuf_alloc.0	comp-sys-catman		.cat
 ./usr/share/man/cat9/kmem_tmpbuf_free.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/kmem_zalloc.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/knote.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/kpause.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/kpgsignal.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/kpreempt.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/kpreempt_disable.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/kpreempt_disabled.0	comp-sys-catman		.cat
 ./usr/share/man/cat9/kpreempt_enable.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/kprintf.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/kpsignal.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/kthread.0			comp-sys-catman		.cat
 ./usr/share/man/cat9/kthread_create.0		comp-sys-catman		.cat
 ./usr/share/man/cat9/kthread_create1.0		comp-obsolete		obsolete
 @@ -19805,26 +19807,28 @@
 ./usr/share/man/html9/kfilter_unregister.html	comp-sys-htmlman	html
 ./usr/share/man/html9/killproc.html		comp-sys-htmlman	html
 ./usr/share/man/html9/klua_lock.html		comp-sys-htmlman	html
 ./usr/share/man/html9/klua_mod_register.html	comp-sys-htmlman	html
 ./usr/share/man/html9/kmem.html			comp-sys-htmlman	html
 ./usr/share/man/html9/kmem_alloc.html		comp-sys-htmlman	html
 ./usr/share/man/html9/kmem_asprintf.html	comp-sys-htmlman	html
 ./usr/share/man/html9/kmem_free.html		comp-sys-htmlman	html
 ./usr/share/man/html9/kmem_intr_alloc.html	comp-sys-htmlman	html
 ./usr/share/man/html9/kmem_intr_free.html	comp-sys-htmlman	html
 ./usr/share/man/html9/kmem_intr_zalloc.html	comp-sys-htmlman	html
 ./usr/share/man/html9/kmem_strdupsize.html	comp-sys-htmlman	html
 ./usr/share/man/html9/kmem_strfree.html		comp-sys-htmlman	html
 ./usr/share/man/html9/kmem_tmpbuf_alloc.html	comp-sys-htmlman	html
 ./usr/share/man/html9/kmem_tmpbuf_free.html	comp-sys-htmlman	html
 ./usr/share/man/html9/kmem_zalloc.html		comp-sys-htmlman	html
 ./usr/share/man/html9/knote.html		comp-sys-htmlman	html
 ./usr/share/man/html9/kpause.html		comp-sys-htmlman	html
 ./usr/share/man/html9/kpgsignal.html		comp-sys-htmlman	html
 ./usr/share/man/html9/kpreempt.html		comp-sys-htmlman	html
 ./usr/share/man/html9/kpreempt_disable.html	comp-sys-htmlman	html
 ./usr/share/man/html9/kpreempt_disabled.html	comp-sys-htmlman	html
 ./usr/share/man/html9/kpreempt_enable.html	comp-sys-htmlman	html
 ./usr/share/man/html9/kprintf.html		comp-sys-htmlman	html
 ./usr/share/man/html9/kpsignal.html		comp-sys-htmlman	html
 ./usr/share/man/html9/kthread.html		comp-sys-htmlman	html
 ./usr/share/man/html9/kthread_create.html	comp-sys-htmlman	html
 ./usr/share/man/html9/kthread_destroy.html	comp-obsolete		obsolete
 @@ -28122,26 +28126,28 @@
 ./usr/share/man/man9/kfilter_unregister.9	comp-sys-man		.man
 ./usr/share/man/man9/killproc.9			comp-sys-man		.man
 ./usr/share/man/man9/klua_lock.9		comp-sys-man		.man
 ./usr/share/man/man9/klua_mod_register.9	comp-sys-man		.man
 ./usr/share/man/man9/kmem.9			comp-sys-man		.man
 ./usr/share/man/man9/kmem_alloc.9		comp-sys-man		.man
 ./usr/share/man/man9/kmem_asprintf.9		comp-sys-man		.man
 ./usr/share/man/man9/kmem_free.9		comp-sys-man		.man
 ./usr/share/man/man9/kmem_intr_alloc.9		comp-sys-man		.man
 ./usr/share/man/man9/kmem_intr_free.9		comp-sys-man		.man
 ./usr/share/man/man9/kmem_intr_zalloc.9		comp-sys-man		.man
 ./usr/share/man/man9/kmem_strdupsize.9		comp-sys-man		.man
 ./usr/share/man/man9/kmem_strfree.9		comp-sys-man		.man
 ./usr/share/man/man9/kmem_tmpbuf_alloc.9	comp-sys-man		.man
 ./usr/share/man/man9/kmem_tmpbuf_free.9		comp-sys-man		.man
 ./usr/share/man/man9/kmem_zalloc.9		comp-sys-man		.man
 ./usr/share/man/man9/knote.9			comp-sys-man		.man
 ./usr/share/man/man9/kpause.9			comp-sys-man		.man
 ./usr/share/man/man9/kpgsignal.9		comp-sys-man		.man
 ./usr/share/man/man9/kpreempt.9			comp-sys-man		.man
 ./usr/share/man/man9/kpreempt_disable.9		comp-sys-man		.man
 ./usr/share/man/man9/kpreempt_disabled.9	comp-sys-man		.man
 ./usr/share/man/man9/kpreempt_enable.9		comp-sys-man		.man
 ./usr/share/man/man9/kprintf.9			comp-sys-man		.man
 ./usr/share/man/man9/kpsignal.9			comp-sys-man		.man
 ./usr/share/man/man9/kthread.9			comp-sys-man		.man
 ./usr/share/man/man9/kthread_create.9		comp-sys-man		.man
 ./usr/share/man/man9/kthread_create1.9		comp-obsolete		obsolete

 @@ -1,14 +1,14 @@
-/*	$NetBSD: subr_kmem.c,v 1.80 2020/05/14 17:01:34 maxv Exp $	*/
+/*	$NetBSD: subr_kmem.c,v 1.81 2021/01/24 17:29:11 thorpej Exp $	*/
 /*
  * Copyright (c) 2009-2020 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran and Maxime Villard.
+ *
  * 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.
 @@ -68,27 +68,27 @@
+ *
  * This option is enabled on DIAGNOSTIC.
+ *
  *  |CHUNK|CHUNK|CHUNK|CHUNK|CHUNK|CHUNK|CHUNK|CHUNK|CHUNK| |
  *  +-----+-----+-----+-----+-----+-----+-----+-----+-----+-+
  *  |     |     |     |     |     |     |     |     |/////|U|
  *  |     |     |     |     |     |     |     |     |/HSZ/|U|
  *  |     |     |     |     |     |     |     |     |/////|U|
  *  +-----+-----+-----+-----+-----+-----+-----+-----+-----+-+
  *  | Buffer usable by the caller (requested size)  |Size |Unused
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_kmem.c,v 1.80 2020/05/14 17:01:34 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_kmem.c,v 1.81 2021/01/24 17:29:11 thorpej Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_kmem.h"
 #endif
 #include <sys/param.h>
 #include <sys/callback.h>
 #include <sys/kmem.h>
 #include <sys/pool.h>
 #include <sys/debug.h>
 #include <sys/lockdebug.h>
 #include <sys/cpu.h>
 #include <sys/asan.h>
 @@ -466,26 +466,49 @@ kmem_strndup(const char *str, size_t max
 	return ptr;
+}
 void
 kmem_strfree(char *str)
+{
 	if (str == NULL)
 		return;
 	kmem_free(str, strlen(str) + 1);
+}
 /*
  * Utility routine to maybe-allocate a temporary buffer if the size
  * is larger than we're willing to put on the stack.
  */
 void *
 kmem_tmpbuf_alloc(size_t size, void *stackbuf, size_t stackbufsize,
     km_flag_t flags)
+{
 	if (size <= stackbufsize) {
 		return stackbuf;
+	}
 	return kmem_alloc(size, flags);
+}
 void
 kmem_tmpbuf_free(void *buf, size_t size, void *stackbuf)
+{
 	if (buf != stackbuf) {
 		kmem_free(buf, size);
+	}
+}
 /* --------------------------- DEBUG / DIAGNOSTIC --------------------------- */
 #if defined(KMEM_SIZE)
 static void
 kmem_size_set(void *p, size_t sz)
+{
 	memcpy((size_t *)((uintptr_t)p + sz), &sz, sizeof(size_t));
+}
 static void
 kmem_size_check(void *p, size_t sz)
+{
 	size_t hsz;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: kmem.h,v 1.11 2018/01/09 01:53:55 christos Exp $	*/
+/*	$NetBSD: kmem.h,v 1.12 2021/01/24 17:29:11 thorpej Exp $	*/
 /*-
  * Copyright (c)2006 YAMAMOTO Takashi,
  * All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -41,20 +41,23 @@ void *	kmem_zalloc(size_t, km_flag_t);
 void	kmem_free(void *, size_t);
 void *	kmem_intr_alloc(size_t, km_flag_t);
 void *	kmem_intr_zalloc(size_t, km_flag_t);
 void	kmem_intr_free(void *, size_t);
 char *	kmem_asprintf(const char *, ...) __printflike(1, 2);
 char *	kmem_strdupsize(const char *, size_t *, km_flag_t);
 #define kmem_strdup(s, f)	kmem_strdupsize((s), NULL, (f))
 char *	kmem_strndup(const char *, size_t, km_flag_t);
 void	kmem_strfree(char *);
 void *	kmem_tmpbuf_alloc(size_t, void *, size_t, km_flag_t);
 void	kmem_tmpbuf_free(void *, size_t, void *);
 /*
  * km_flag_t values:
  */
 #define	KM_SLEEP	0x00000001	/* can sleep */
 #define	KM_NOSLEEP	0x00000002	/* don't sleep */
 #endif /* !_SYS_KMEM_H_ */

 @@ -1,14 +1,14 @@
-#       $NetBSD: Makefile,v 1.454 2021/01/21 15:53:16 thorpej Exp $
+#       $NetBSD: Makefile,v 1.455 2021/01/24 17:29:11 thorpej Exp $
 #	Makefile for section 9 (kernel function and variable) manual pages.
 MAN=	accept_filter.9 accf_data.9 accf_http.9 \
 	altq.9 arp.9 audio.9 autoconf.9 \
 	bcdtobin.9 bcmp.9 bcopy.9 bintime_add.9 bluetooth.9 boothowto.9 bpf.9 \
 	buffercache.9 bufferio.9 bufq.9 bus_dma.9 bus_space.9 byteorder.9 \
 	bzero.9 \
 	callback.9 callout.9 cardbus.9 clock.9 cnmagic.9 condvar.9 config.9 \
 	cons.9 copy.9 coredump_write.9 \
 	cpu_configure.9 cpu_coredump.9 cpu_dumpconf.9 \
 	cpu_lwp_fork.9 \
 	cpu_idle.9 cpu_initclocks.9 cpu_need_resched.9 \
 @@ -446,27 +446,29 @@ MLINKS+=kcpuset.9 kcpuset_create.9 \
 	kcpuset.9 kcpuset_match.9 \
 	kcpuset.9 kcpuset_merge.9 \
 	kcpuset.9 kcpuset_export_32.9 \
 	kcpuset.9 kcpuset_atomic_set.9 \
 	kcpuset.9 kcpuset_atomic_clear.9
 MLINKS+=kmem.9 kmem_alloc.9 \
 	kmem.9 kmem_free.9 \
 	kmem.9 kmem_zalloc.9 \
 	kmem.9 kmem_intr_alloc.9 \
 	kmem.9 kmem_intr_free.9 \
 	kmem.9 kmem_intr_zalloc.9 \
 	kmem.9 kmem_asprintf.9 \
 	kmem.9 kmem_strdupsize.9 \
-	kmem.9 kmem_strfree.9
+	kmem.9 kmem_strfree.9 \
 	kmem.9 kmem_tmpbuf_alloc.9 \
 	kmem.9 kmem_tmpbuf_free.9
 MAN+=	kpreempt.9
 MLINKS+=kpreempt.9 kpreempt_disable.9 \
 	kpreempt.9 kpreempt_disabled.9 \
 	kpreempt.9 kpreempt_enable.9
 MLINKS+=proc_find.9 pgrp_find.9
 MLINKS+=kprintf.9 printf.9 kprintf.9 printf_nolog.9 \
 	kprintf.9 snprintf.9 kprintf.9 vprintf.9 \
 	kprintf.9 vsnprintf.9 kprintf.9 uprintf.9 kprintf.9 ttyprintf.9 \
 	kprintf.9 tprintf.9 kprintf.9 tprintf_open.9 kprintf.9 tprintf_close.9 \
 	kprintf.9 aprint_normal.9 kprintf.9 aprint_naive.9 \
 	kprintf.9 aprint_verbose.9 kprintf.9 aprint_debug.9 \
 	kprintf.9 aprint_error.9 \
 	kprintf.9 aprint_normal_dev.9 kprintf.9 aprint_naive_dev.9 \

 @@ -1,41 +1,41 @@
-.\"	$NetBSD: kmem.9,v 1.26 2020/06/19 07:25:20 wiz Exp $
+.\"	$NetBSD: kmem.9,v 1.27 2021/01/24 17:29:11 thorpej Exp $
 .\"
 .\" Copyright (c)2006 YAMAMOTO Takashi,
 .\" All rights reserved.
 .\"
 .\" 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.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 AUTHOR 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.
 .\"
 .\" ------------------------------------------------------------
-.Dd June 19, 2020
+.Dd January 24, 2021
 .Dt KMEM 9
 .Os
 .\" ------------------------------------------------------------
 .Sh NAME
 .Nm kmem
 .Nd kernel wired memory allocator
 .\" ------------------------------------------------------------
 .Sh SYNOPSIS
 .In sys/kmem.h
 .\" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 .Ft void *
 .Fn kmem_alloc \
 "size_t size" "km_flag_t kmflags"
 @@ -63,26 +63,33 @@
 .Ft char *
 .Fn kmem_strdupsize \
 "const char *str" "size_t *size" "km_flag_t kmflags"
 .Ft char *
 .Fn kmem_strdup \
 "const char *str" "km_flag_t kmflags"
 .Ft char *
 .Fn kmem_strndup \
 "const char *str" "size_t manxlen" "km_flag_t kmflags"
 .Ft void
 .Fn kmem_strfree \
 "char *str"
 .\" ------------------------------------------------------------
 .Ft void *
 .Fn kmem_tmpbuf_alloc \
 "size_t size" "void *stackbuf" "size_t stackbufsize" "km_flag_t kmflags"
 .Ft void
 .Fn kmem_tmpbuf_free \
 "void *p" "size_t size" "void *stsackbuf"
 .\" ------------------------------------------------------------
 .Pp
 .Cd "options KMEM_SIZE"
 .Sh DESCRIPTION
 .Fn kmem_alloc
 allocates kernel wired memory.
 It takes the following arguments.
 .Bl -tag -width kmflags
 .It Fa size
 Specify the size of allocation in bytes.
 .It Fa kmflags
 Either of the following:
 .Bl -tag -width KM_NOSLEEP
 .It Dv KM_SLEEP
 @@ -205,26 +212,43 @@ characters from the string
 .Fa str
 always NUL terminating the copied string.
 .Pp
 The
 .Fn kmem_strfree
 function can be used to free a
 .Dv NUL
 terminated string computing the length of the string using
 .Xr strlen 3
 and adding one for the
 .Dv NUL
 and then using
 .Fn kmem_free .
 .Pp
 The
 .Fn kmem_tmpbuf_alloc
 function is a utility function for allocating memory for temporary
 use, where allocation on the stack is desirable, but only up to a
 certain size.
 If the requested size fits within the specified stack buffer, the
 stack buffer is returned.
 Otherwise, memory is allocated with
 .Fn kmem_alloc .
 The
 .Fn kmem_tmpbuf_free
 function compares the result of a previous call to
 .Fn kmem_tmpbuf_alloc
 and frees the memory using
 .Fn kmem_free
 if it is not the specified stack buffer.
 .\" ------------------------------------------------------------
 .Sh NOTES
 Making
 .Dv KM_SLEEP
 allocations while holding mutexes or reader/writer locks is discouraged, as the
 caller can sleep for an unbounded amount of time in order to satisfy the
 allocation.
 This can in turn block other threads that wish to acquire locks held by the
 caller.
 It should be noted that
 .Fn kmem_free
 may also block.
 .Pp