 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_uidinfo.c,v 1.11 2019/03/01 03:03:19 christos Exp $	*/
+/*	$NetBSD: kern_uidinfo.c,v 1.12 2021/04/01 06:25:45 simonb Exp $	*/
 /*-
  * Copyright (c) 1982, 1986, 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  * (c) UNIX System Laboratories, Inc.
  * All or some portions of this file are derived from material licensed
  * to the University of California by American Telephone and Telegraph
  * Co. or Unix System Laboratories, Inc. and are reproduced herein with
  * the permission of UNIX System Laboratories, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -25,27 +25,27 @@
  * 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 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_uidinfo.c,v 1.11 2019/03/01 03:03:19 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_uidinfo.c,v 1.12 2021/04/01 06:25:45 simonb Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kmem.h>
 #include <sys/proc.h>
 #include <sys/atomic.h>
 #include <sys/uidinfo.h>
 #include <sys/sysctl.h>
 #include <sys/kauth.h>
 #include <sys/cpu.h>
 static SLIST_HEAD(uihashhead, uidinfo) *uihashtbl;
 static u_long 		uihash;
 @@ -122,45 +122,77 @@ sysctl_kern_uidinfo_setup(void)
 		       CTLFLAG_PERMANENT,
 		       CTLTYPE_QUAD, "semcnt",
 		       SYSCTL_DESCR("Number of semaphores used for the current user"),
 		       sysctl_kern_uidinfo_cnt, 0, NULL, 0,
 		       CTL_CREATE, CTL_EOL);
 	sysctl_createv(&kern_uidinfo_sysctllog, 0, &rnode, &cnode,
 		       CTLFLAG_PERMANENT,
 		       CTLTYPE_QUAD, "sbsize",
 		       SYSCTL_DESCR("Socket buffers used for the current user"),
 		       sysctl_kern_uidinfo_cnt, 0, NULL, 0,
 		       CTL_CREATE, CTL_EOL);
+}
 static int
 uid_stats(struct hashstat_sysctl *hs, bool fill)
+{
 	struct uidinfo *uip;
 	uint64_t chain;
 	strlcpy(hs->hash_name, "uihash", sizeof(hs->hash_name));
 	strlcpy(hs->hash_desc, "user info (uid->used proc) hash",
 	    sizeof(hs->hash_desc));
 	if (!fill)
 		return 0;
 	hs->hash_size = uihash + 1;
 	for (size_t i = 0; i < hs->hash_size; i++) {
 		chain = 0;
 		SLIST_FOREACH(uip, &uihashtbl[i], ui_hash) {
 			membar_datadep_consumer();
 			chain++;
+		}
 		if (chain > 0) {
 			hs->hash_used++;
 			hs->hash_items += chain;
 			if (chain > hs->hash_maxchain)
 				hs->hash_maxchain = chain;
+		}
+	}
 	return 0;
+}
 void
 uid_init(void)
+{
 	/*
 	 * In case of MP system, SLIST_FOREACH would force a cache line
 	 * write-back for every modified 'uidinfo', thus we try to keep the
 	 * lists short.
 	 */
 	const u_int uihash_sz = (maxcpus > 1 ? 1024 : 64);
 	uihashtbl = hashinit(uihash_sz, HASH_SLIST, true, &uihash);
 	/*
 	 * Ensure that uid 0 is always in the user hash table, as
 	 * sbreserve() expects it available from interrupt context.
 	 */
 	(void)uid_find(0);
 	sysctl_kern_uidinfo_setup();
 	hashstat_register("uihash", uid_stats);
+}
 struct uidinfo *
 uid_find(uid_t uid)
+{
 	struct uidinfo *uip, *uip_first, *newuip;
 	struct uihashhead *uipp;
 	uipp = UIHASH(uid);
 	newuip = NULL;
 	/*
 	 * To make insertion atomic, abstraction of SLIST will be violated.