 @@ -1,14 +1,14 @@
-/*	$NetBSD: init_main.c,v 1.524 2020/04/30 03:28:18 riastradh Exp $	*/
+/*	$NetBSD: init_main.c,v 1.525 2020/05/11 21:38:54 riastradh Exp $	*/
 /*-
  * Copyright (c) 2008, 2009, 2019 The NetBSD Foundation, Inc.
  * 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.
 @@ -87,27 +87,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS 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.
+ *
  *	@(#)init_main.c	8.16 (Berkeley) 5/14/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.524 2020/04/30 03:28:18 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.525 2020/05/11 21:38:54 riastradh Exp $");
 #include "opt_ddb.h"
 #include "opt_inet.h"
 #include "opt_ipsec.h"
 #include "opt_modular.h"
 #include "opt_ntp.h"
 #include "opt_pipe.h"
 #include "opt_syscall_debug.h"
 #include "opt_sysv.h"
 #include "opt_fileassoc.h"
 #include "opt_ktrace.h"
 #include "opt_pax.h"
 #include "opt_compat_netbsd.h"
 @@ -385,26 +385,28 @@ main(void)
 	size_t splash_size = (&_binary_splash_image_end -
 	    &_binary_splash_image_start) * sizeof(void *);
 	splash_setimage(&_binary_splash_image_start, splash_size);
 #endif
 	/* Initialize sockets. */
 	soinit();
 	/*
 	 * The following things must be done before autoconfiguration.
 	 */
 	rnd_init();		/* initialize entropy pool */
 	cprng_init();		/* initialize cryptographic PRNG */
 	/* Initialize process and pgrp structures. */
 	procinit();
 	lwpinit();
 	/* Must be called after lwpinit (lwpinit_specificdata) */
 	psref_init();
 	/* Initialize signal-related data structures. */
 	signal_init();
 	/* Initialize resource management. */
 	resource_init();
 @@ -519,28 +521,26 @@ main(void)
 	soinit1();
 	/*
 	 * Initialize the bufq strategy sub-system and any built-in
 	 * strategy modules - they may be needed by some devices during
 	 * auto-configuration
 	 */
 	bufq_init();
 	module_init_class(MODULE_CLASS_BUFQ);
 	/* Configure the system hardware.  This will enable interrupts. */
 	configure();
 	cprng_init();		/* initialize cryptographic PRNG */
 	/* Once all CPUs are detected, initialize the per-CPU cprng_fast.  */
 	cprng_fast_init();
 	ssp_init();
 	ubc_init();		/* must be after autoconfig */
 	mm_init();
 	configure2();
 	ipi_sysinit();

 @@ -1,14 +1,14 @@
-/*	$NetBSD: subr_cprng.c,v 1.38 2020/05/11 17:27:48 riastradh Exp $	*/
+/*	$NetBSD: subr_cprng.c,v 1.39 2020/05/11 21:38:54 riastradh Exp $	*/
 /*-
  * Copyright (c) 2019 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Taylor R. Campbell.
+ *
  * 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.
 @@ -42,27 +42,27 @@
  *	3. /dev/random
+ *
  *	This code serves the first two categories without having extra
  *	logic for /dev/random.
+ *
  *	kern_cprng - available at IPL_VM or lower
  *	user_cprng - available only at IPL_NONE in thread context
+ *
  *	The name kern_cprng is for hysterical raisins.  The name
  *	user_cprng serves only to contrast with kern_cprng.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_cprng.c,v 1.38 2020/05/11 17:27:48 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_cprng.c,v 1.39 2020/05/11 21:38:54 riastradh Exp $");
 #include <sys/types.h>
 #include <sys/cprng.h>
 #include <sys/cpu.h>
 #include <sys/entropy.h>
 #include <sys/errno.h>
 #include <sys/evcnt.h>
 #include <sys/intr.h>
 #include <sys/kmem.h>
 #include <sys/percpu.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 @@ -207,26 +207,27 @@ cprng_strong_create(const char *name, in
 void
 cprng_strong_destroy(struct cprng_strong *cprng)
+{
 	percpu_free(cprng->cs_percpu, sizeof(struct cprng_cpu));
 	kmem_free(cprng, sizeof(*cprng));
+}
 static void
 cprng_init_cpu(void *ptr, void *cookie, struct cpu_info *ci)
+{
 	struct cprng_cpu *cc = ptr;
 	const char *name = cookie;
 	const char *cpuname;
 	uint8_t zero[NIST_HASH_DRBG_SEEDLEN_BYTES] = {0};
 	char namebuf[64];	/* XXX size? */
 	/*
 	 * Format the name as, e.g., kern/8 if we're on cpu8.  This
 	 * doesn't get displayed anywhere; it just ensures that if
 	 * there were a bug causing us to use the same otherwise secure
 	 * seed on multiple CPUs, we would still get independent output
 	 * from the NIST Hash_DRBG.
 	 */
 	snprintf(namebuf, sizeof namebuf, "%s/%u", name, cpu_index(ci));
 	/*
 @@ -236,30 +237,32 @@ cprng_init_cpu(void *ptr, void *cookie,
 	 */
 	cc->cc_drbg = kmem_zalloc(sizeof(*cc->cc_drbg), KM_SLEEP);
 	cc->cc_evcnt = kmem_alloc(sizeof(*cc->cc_evcnt), KM_SLEEP);
 	/*
 	 * Initialize the DRBG with no seed.  We do this in order to
 	 * defer reading from the entropy pool as long as possible.
 	 */
 	if (__predict_false(nist_hash_drbg_instantiate(cc->cc_drbg,
 		    zero, sizeof zero, NULL, 0, namebuf, strlen(namebuf))))
 		panic("nist_hash_drbg_instantiate");
 	/* Attach the event counters.  */
 	/* XXX ci_cpuname may not be initialized early enough.  */
 	cpuname = ci->ci_cpuname[0] == '\0' ? "cpu0" : ci->ci_cpuname;
 	evcnt_attach_dynamic(&cc->cc_evcnt->intr, EVCNT_TYPE_MISC, NULL,
-	    ci->ci_cpuname, "cprng_strong intr");
+	    cpuname, "cprng_strong intr");
 	evcnt_attach_dynamic(&cc->cc_evcnt->reseed, EVCNT_TYPE_MISC, NULL,
-	    ci->ci_cpuname, "cprng_strong reseed");
+	    cpuname, "cprng_strong reseed");
 	/* Set the epoch uninitialized so we reseed on first use.  */
 	cc->cc_epoch = 0;
+}
 static void
 cprng_fini_cpu(void *ptr, void *cookie, struct cpu_info *ci)
+{
 	struct cprng_cpu *cc = ptr;
 	evcnt_detach(&cc->cc_evcnt->reseed);
 	evcnt_detach(&cc->cc_evcnt->intr);
 	if (__predict_false(nist_hash_drbg_destroy(cc->cc_drbg)))