 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_misc.c,v 1.247 2019/12/31 13:07:13 ad Exp $	*/
+/*	$NetBSD: linux_misc.c,v 1.248 2020/04/19 20:31:59 thorpej Exp $	*/
 /*-
  * Copyright (c) 1995, 1998, 1999, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Frank van der Linden and Eric Haszlakiewicz; by Jason R. Thorpe
  * of the Numerical Aerospace Simulation Facility, NASA Ames Research Center.
+ *
  * 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
 @@ -47,27 +47,27 @@
  *	linux_sys_readdir		: linux_misc_notalpha.c
  *	linux_sys_setresgid		: linux_misc_notalpha.c
  *	linux_sys_time			: linux_misc_notalpha.c
  *	linux_sys_utime			: linux_misc_notalpha.c
  *	linux_sys_waitpid		: linux_misc_notalpha.c
  *	linux_sys_old_mmap		: linux_oldmmap.c
  *	linux_sys_oldolduname		: linux_oldolduname.c
  *	linux_sys_oldselect		: linux_oldselect.c
  *	linux_sys_olduname		: linux_olduname.c
  *	linux_sys_pipe			: linux_pipe.c
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.247 2019/12/31 13:07:13 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_misc.c,v 1.248 2020/04/19 20:31:59 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/dirent.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/filedesc.h>
 #include <sys/ioctl.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 @@ -1350,27 +1350,27 @@ linux_sys_sysinfo(struct lwp *l, const s
 	memset(&si, 0, sizeof(si));
 	si.uptime = time_uptime;
 	la = &averunnable;
 	si.loads[0] = la->ldavg[0] * LINUX_SYSINFO_LOADS_SCALE / la->fscale;
 	si.loads[1] = la->ldavg[1] * LINUX_SYSINFO_LOADS_SCALE / la->fscale;
 	si.loads[2] = la->ldavg[2] * LINUX_SYSINFO_LOADS_SCALE / la->fscale;
 	si.totalram = ctob((u_long)physmem);
 	si.freeram = (u_long)uvm_availmem() * uvmexp.pagesize;
 	si.sharedram = 0;	/* XXX */
 	si.bufferram = (u_long)uvmexp.filepages * uvmexp.pagesize;
 	si.totalswap = (u_long)uvmexp.swpages * uvmexp.pagesize;
 	si.freeswap =
 	    (u_long)(uvmexp.swpages - uvmexp.swpginuse) * uvmexp.pagesize;
-	si.procs = nprocs;
+	si.procs = atomic_load_relaxed(&nprocs);
 	/* The following are only present in newer Linux kernels. */
 	si.totalbig = 0;
 	si.freebig = 0;
 	si.mem_unit = 1;
 	return (copyout(&si, SCARG(uap, arg), sizeof si));
+}
 int
 linux_sys_getrlimit(struct lwp *l, const struct linux_sys_getrlimit_args *uap, register_t *retval)
+{
 	/* {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux_sched.c,v 1.73 2019/11/23 19:42:52 ad Exp $	*/
+/*	$NetBSD: linux_sched.c,v 1.74 2020/04/19 20:31:59 thorpej Exp $	*/
 /*-
  * Copyright (c) 1999, 2019 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center; by Matthias Scheler.
+ *
  * 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
 @@ -25,27 +25,27 @@
  * 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.
  */
 /*
  * Linux compatibility module. Try to deal with scheduler related syscalls.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_sched.c,v 1.73 2019/11/23 19:42:52 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_sched.c,v 1.74 2020/04/19 20:31:59 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
 #include <sys/syscallargs.h>
 #include <sys/wait.h>
 #include <sys/kauth.h>
 #include <sys/ptrace.h>
 #include <sys/atomic.h>
 #include <sys/cpu.h>
 @@ -172,54 +172,44 @@ linux_clone_nptl(struct lwp *l, const st
 	/* {
 		syscallarg(int) flags;
 		syscallarg(void *) stack;
 		syscallarg(void *) parent_tidptr;
 		syscallarg(void *) tls;
 		syscallarg(void *) child_tidptr;
 	} */
 	struct proc *p;
 	struct lwp *l2;
 	struct linux_emuldata *led;
 	void *parent_tidptr, *tls, *child_tidptr;
 	vaddr_t uaddr;
 	lwpid_t lid;
-	int flags, tnprocs, error;
+	int flags, error;
 	p = l->l_proc;
 	flags = SCARG(uap, flags);
 	parent_tidptr = SCARG(uap, parent_tidptr);
 	tls = SCARG(uap, tls);
 	child_tidptr = SCARG(uap, child_tidptr);
 	tnprocs = atomic_inc_uint_nv(&nprocs);
 	if (__predict_false(tnprocs >= maxproc) ||
 	    kauth_authorize_process(l->l_cred, KAUTH_PROCESS_FORK, p,
 	    KAUTH_ARG(tnprocs), NULL, NULL) != 0) {
 		atomic_dec_uint(&nprocs);
 		return EAGAIN;
 	uaddr = uvm_uarea_alloc();
 	if (__predict_false(uaddr == 0)) {
 		atomic_dec_uint(&nprocs);
 		return ENOMEM;
+	}
 	error = lwp_create(l, p, uaddr, LWP_DETACHED | LWP_PIDLID,
 	    SCARG(uap, stack), 0, child_return, NULL, &l2, l->l_class,
 	    &l->l_sigmask, &l->l_sigstk);
 	if (__predict_false(error)) {
 		DPRINTF(("%s: lwp_create error=%d\n", __func__, error));
 		atomic_dec_uint(&nprocs);
 		uvm_uarea_free(uaddr);
 		return error;
+	}
 	lid = l2->l_lid;
 	/* LINUX_CLONE_CHILD_CLEARTID: clear TID in child's memory on exit() */
 	if (flags & LINUX_CLONE_CHILD_CLEARTID) {
 		led = l2->l_emuldata;
 		led->led_clear_tid = child_tidptr;
+	}
 	/* LINUX_CLONE_PARENT_SETTID: store child's TID in parent's memory */
 	if (flags & LINUX_CLONE_PARENT_SETTID) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: linux32_sysinfo.c,v 1.10 2019/12/31 13:07:13 ad Exp $ */
+/*	$NetBSD: linux32_sysinfo.c,v 1.11 2020/04/19 20:31:59 thorpej Exp $ */
 /*-
  * Copyright (c) 2006 Emmanuel Dreyfus, 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.
  * 3. All advertising materials mentioning features or use of this software
 @@ -23,27 +23,27 @@
  * 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_sysinfo.c,v 1.10 2019/12/31 13:07:13 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_sysinfo.c,v 1.11 2020/04/19 20:31:59 thorpej Exp $");
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/dirent.h>
 #include <sys/proc.h>
 #include <sys/syscallargs.h>
 #include <uvm/uvm_extern.h>
 #include <compat/netbsd32/netbsd32.h>
 #include <compat/netbsd32/netbsd32_conv.h>
 @@ -73,23 +73,23 @@ linux32_sys_sysinfo(struct lwp *l, const
 	memset(&si, 0, sizeof(si));
 	si.uptime = time_uptime;
 	la = &averunnable;
 	si.loads[0] = la->ldavg[0] * LINUX_SYSINFO_LOADS_SCALE / la->fscale;
 	si.loads[1] = la->ldavg[1] * LINUX_SYSINFO_LOADS_SCALE / la->fscale;
 	si.loads[2] = la->ldavg[2] * LINUX_SYSINFO_LOADS_SCALE / la->fscale;
 	si.totalram = ctob((u_long)physmem);
 	si.freeram = (u_long)uvm_availmem() * uvmexp.pagesize;
 	si.sharedram = 0;	/* XXX */
 	si.bufferram = (u_long)uvmexp.filepages * uvmexp.pagesize;
 	si.totalswap = (u_long)uvmexp.swpages * uvmexp.pagesize;
 	si.freeswap =
 	    (u_long)(uvmexp.swpages - uvmexp.swpginuse) * uvmexp.pagesize;
-	si.procs = nprocs;
+	si.procs = atomic_load_relaxed(&nprocs);
 	/* The following are only present in newer Linux kernels. */
 	si.totalbig = 0;
 	si.freebig = 0;
 	si.mem_unit = 1;
 	return (copyout(&si, SCARG_P32(uap, arg), sizeof si));
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: netbsd32_execve.c,v 1.41 2019/09/17 15:19:27 christos Exp $	*/
+/*	$NetBSD: netbsd32_execve.c,v 1.42 2020/04/19 20:31:59 thorpej Exp $	*/
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
  * 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.
 @@ -18,27 +18,27 @@
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR 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: netbsd32_execve.c,v 1.41 2019/09/17 15:19:27 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_execve.c,v 1.42 2020/04/19 20:31:59 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/atomic.h>
 #include <sys/mount.h>
 #include <sys/namei.h>
 #include <sys/stat.h>
 #include <sys/spawn.h>
 #include <sys/uidinfo.h>
 #include <sys/vnode.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/syscallargs.h>
 @@ -172,26 +172,27 @@ netbsd32_posix_spawn(struct lwp *l,
 	syscallarg(const netbsd32_posix_spawnattrp) attrp;
 	syscallarg(netbsd32_charpp) argv;
 	syscallarg(netbsd32_charpp) envp;
 	} */
 	int error;
 	struct posix_spawn_file_actions *fa = NULL;
 	struct posix_spawnattr *sa = NULL;
 	pid_t pid;
 	bool child_ok = false;
 	rlim_t max_fileactions;
 	proc_t *p = l->l_proc;
 	/* check_posix_spawn() increments nprocs for us. */
 	error = check_posix_spawn(l);
 	if (error) {
 		*retval = error;
 		return 0;
+	}
 	/* copy in file_actions struct */
 	if (SCARG_P32(uap, file_actions) != NULL) {
 		max_fileactions = 2 * uimin(p->p_rlimit[RLIMIT_NOFILE].rlim_cur,
 		    maxfiles);
 		error = netbsd32_posix_spawn_fa_alloc(&fa,
 		    SCARG_P32(uap, file_actions), max_fileactions);
 		if (error)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_exec.c,v 1.496 2020/04/14 22:42:18 kamil Exp $	*/
+/*	$NetBSD: kern_exec.c,v 1.497 2020/04/19 20:31:59 thorpej Exp $	*/
 /*-
  * Copyright (c) 2008, 2019, 2020 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.
 @@ -52,27 +52,27 @@
  * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``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 TOOLS GMBH 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_exec.c,v 1.496 2020/04/14 22:42:18 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.497 2020/04/19 20:31:59 thorpej Exp $");
 #include "opt_exec.h"
 #include "opt_execfmt.h"
 #include "opt_ktrace.h"
 #include "opt_modular.h"
 #include "opt_syscall_debug.h"
 #include "veriexec.h"
 #include "opt_pax.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/filedesc.h>
 #include <sys/kernel.h>
 @@ -2387,26 +2387,30 @@ posix_spawn_fa_alloc(struct posix_spawn_
 		memcpy(fae->fae_path, pbuf, fal);
+	}
 	PNBUF_PUT(pbuf);
 	*fap = fa;
 	return 0;
 out:
 	if (pbuf)
 		PNBUF_PUT(pbuf);
 	posix_spawn_fa_free(fa, i);
 	return error;
+}
 /*
  * N.B. increments nprocs upon success.  Callers need to drop nprocs if
  * they fail for some other reason.
  */
 int
 check_posix_spawn(struct lwp *l1)
+{
 	int error, tnprocs, count;
 	uid_t uid;
 	struct proc *p1;
 	p1 = l1->l_proc;
 	uid = kauth_cred_getuid(l1->l_cred);
 	tnprocs = atomic_inc_uint_nv(&nprocs);
 	/*
 	 * Although process entries are dynamically created, we still keep
 @@ -2741,26 +2745,27 @@ sys_posix_spawn(struct lwp *l1, const st
 		syscallarg(const struct posix_spawnattr *) attrp;
 		syscallarg(char *const *) argv;
 		syscallarg(char *const *) envp;
 	} */
 	int error;
 	struct posix_spawn_file_actions *fa = NULL;
 	struct posix_spawnattr *sa = NULL;
 	pid_t pid;
 	bool child_ok = false;
 	rlim_t max_fileactions;
 	proc_t *p = l1->l_proc;
 	/* check_posix_spawn() increments nprocs for us. */
 	error = check_posix_spawn(l1);
 	if (error) {
 		*retval = error;
 		return 0;
+	}
 	/* copy in file_actions struct */
 	if (SCARG(uap, file_actions) != NULL) {
 		max_fileactions = 2 * uimin(p->p_rlimit[RLIMIT_NOFILE].rlim_cur,
 		    maxfiles);
 		error = posix_spawn_fa_alloc(&fa, SCARG(uap, file_actions),
 		    max_fileactions);
 		if (error)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_exit.c,v 1.287 2020/04/04 20:20:12 thorpej Exp $	*/
+/*	$NetBSD: kern_exit.c,v 1.288 2020/04/19 20:31:59 thorpej Exp $	*/
 /*-
  * Copyright (c) 1998, 1999, 2006, 2007, 2008, 2020 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center, and 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
 @@ -57,27 +57,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.
+ *
  *	@(#)kern_exit.c	8.10 (Berkeley) 2/23/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_exit.c,v 1.287 2020/04/04 20:20:12 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exit.c,v 1.288 2020/04/19 20:31:59 thorpej Exp $");
 #include "opt_ktrace.h"
 #include "opt_dtrace.h"
 #include "opt_sysv.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 @@ -1206,26 +1206,27 @@ proc_free(struct proc *p, struct wrusage
 	 * If anyone tries to access the proc structure after here they will
 	 * get a shock - bits are missing.  Attempt to make it hard!  We
 	 * don't bother with any further locking past this point.
 	 */
 	p->p_stat = SIDL;		/* not even a zombie any more */
 	LIST_REMOVE(p, p_list);	/* off zombproc */
 	parent->p_nstopchild--;
 	LIST_REMOVE(p, p_sibling);
 	/*
 	 * Let pid be reallocated.
 	 */
 	proc_free_pid(p->p_pid);
 	atomic_dec_uint(&nprocs);
 	/*
 	 * Unlink process from its process group.
 	 * Releases the proc_lock.
 	 */
 	proc_leavepgrp(p);
 	/*
 	 * Delay release until after lwp_free.
 	 */
 	cred2 = l->l_cred;
 	/*

 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_proc.c,v 1.243 2020/04/06 08:20:05 kamil Exp $	*/
+/*	$NetBSD: kern_proc.c,v 1.244 2020/04/19 20:31:59 thorpej Exp $	*/
 /*-
  * Copyright (c) 1999, 2006, 2007, 2008, 2020 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center, and 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
 @@ -52,27 +52,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.
+ *
  *	@(#)kern_proc.c	8.7 (Berkeley) 2/14/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.243 2020/04/06 08:20:05 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.244 2020/04/19 20:31:59 thorpej Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_kstack.h"
 #include "opt_maxuprc.h"
 #include "opt_dtrace.h"
 #include "opt_compat_netbsd32.h"
 #include "opt_kaslr.h"
 #endif
 #if defined(__HAVE_COMPAT_NETBSD32) && !defined(COMPAT_NETBSD32) \
     && !defined(_RUMPKERNEL)
 #define COMPAT_NETBSD32
 #endif
 @@ -856,28 +856,26 @@ proc_free_pid(pid_t pid)
 	pt->pt_proc = P_FREE(pid & ~pid_tbl_mask);
 	KASSERT(pt->pt_pid == pid);
 	pt->pt_pid = 0;
 	if (pt->pt_pgrp == NULL) {
 		/* link last freed entry onto ours */
 		pid &= pid_tbl_mask;
 		pt = &pid_table[last_free_pt];
 		pt->pt_proc = P_FREE(P_NEXT(pt->pt_proc) | pid);
 		pt->pt_pid = 0;
 		last_free_pt = pid;
 		pid_alloc_cnt--;
+	}
 	atomic_dec_uint(&nprocs);
+}
 void
 proc_free_mem(struct proc *p)
+{
 	kdtrace_proc_dtor(NULL, p);
 	pool_cache_put(proc_cache, p);
+}
 /*
  * proc_enterpgrp: move p to a new or existing process group (and session).
+ *

 @@ -1,14 +1,14 @@
-/*      $NetBSD: procfs_linux.c,v 1.80 2020/01/02 15:42:27 thorpej Exp $      */
+/*      $NetBSD: procfs_linux.c,v 1.81 2020/04/19 20:31:59 thorpej Exp $      */
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Frank van der Linden for Wasabi Systems, Inc.
+ *
  * 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
 @@ -26,27 +26,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 WASABI SYSTEMS, INC
  * 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: procfs_linux.c,v 1.80 2020/01/02 15:42:27 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_linux.c,v 1.81 2020/04/19 20:31:59 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/cpu.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/exec.h>
 #include <sys/resource.h>
 #include <sys/resourcevar.h>
 #include <sys/signal.h>
 #include <sys/signalvar.h>
 @@ -336,27 +336,27 @@ procfs_doloadavg(struct lwp *curl, struc
 	error = ENAMETOOLONG;
 	bf = malloc(LBFSZ, M_TEMP, M_WAITOK);
 	averunnable.fscale = FSCALE;
 	len = snprintf(bf, LBFSZ,
 	        "%d.%02d %d.%02d %d.%02d %d/%d %d\n",
 		(int)(averunnable.ldavg[0] / averunnable.fscale),
 		(int)(averunnable.ldavg[0] * 100 / averunnable.fscale % 100),
 		(int)(averunnable.ldavg[1] / averunnable.fscale),
 		(int)(averunnable.ldavg[1] * 100 / averunnable.fscale % 100),
 		(int)(averunnable.ldavg[2] / averunnable.fscale),
 		(int)(averunnable.ldavg[2] * 100 / averunnable.fscale % 100),
 ,		/* number of ONPROC processes */
-		nprocs,
+		atomic_load_relaxed(&nprocs),
 );		/* last pid */
 	if (len == 0)
 		goto out;
 	error = uiomove_frombuf(bf, len, uio);
 out:
 	free(bf, M_TEMP);
 	return error;
+}
 /*
  * Linux compatible /proc/<pid>/statm. Only active when the -o linux
  * mountflag is used.

 @@ -1,14 +1,14 @@
-/*	$NetBSD: procfs_vfsops.c,v 1.104 2020/04/04 20:49:30 ad Exp $	*/
+/*	$NetBSD: procfs_vfsops.c,v 1.105 2020/04/19 20:31:59 thorpej Exp $	*/
 /*
  * Copyright (c) 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Jan-Simon Pendry.
+ *
  * 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.
 @@ -66,27 +66,27 @@
  * 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.
+ *
  *	@(#)procfs_vfsops.c	8.7 (Berkeley) 5/10/95
  */
 /*
  * procfs VFS interface
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_vfsops.c,v 1.104 2020/04/04 20:49:30 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_vfsops.c,v 1.105 2020/04/19 20:31:59 thorpej Exp $");
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
 #endif
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/syslog.h>
 @@ -226,29 +226,29 @@ procfs_start(struct mount *mp, int flags
 /*
  * Get file system statistics.
  */
 int
 procfs_statvfs(struct mount *mp, struct statvfs *sbp)
+{
 	genfs_statvfs(mp, sbp);
 	sbp->f_bsize = PAGE_SIZE;
 	sbp->f_frsize = PAGE_SIZE;
 	sbp->f_iosize = PAGE_SIZE;
 	sbp->f_blocks = 1;
-	sbp->f_files = maxproc;			/* approx */
+	sbp->f_files = maxproc;					/* approx */
-	sbp->f_ffree = maxproc - nprocs;	/* approx */
+	sbp->f_ffree = maxproc - atomic_load_relaxed(&nprocs);	/* approx */
-	sbp->f_favail = maxproc - nprocs;	/* approx */
+	sbp->f_favail = maxproc - atomic_load_relaxed(&nprocs);	/* approx */
 	return (0);
+}
 /*ARGSUSED*/
 int
 procfs_sync(
     struct mount *mp,
     int waitfor,
     kauth_cred_t uc)
+{
 	return (0);

 @@ -1,14 +1,14 @@
-/*      $NetBSD: lwproc.c,v 1.44 2020/02/15 18:12:15 ad Exp $	*/
+/*      $NetBSD: lwproc.c,v 1.45 2020/04/19 20:32:00 thorpej Exp $	*/
 /*
  * Copyright (c) 2010, 2011 Antti Kantee.  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.
+ *
 @@ -18,27 +18,27 @@
  * 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.
  */
 #define RUMP__CURLWP_PRIVATE
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lwproc.c,v 1.44 2020/02/15 18:12:15 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lwproc.c,v 1.45 2020/04/19 20:32:00 thorpej Exp $");
 #include <sys/param.h>
 #include <sys/atomic.h>
 #include <sys/filedesc.h>
 #include <sys/fstrans.h>
 #include <sys/kauth.h>
 #include <sys/kmem.h>
 #include <sys/lwp.h>
 #include <sys/ktrace.h>
 #include <sys/pool.h>
 #include <sys/proc.h>
 #include <sys/queue.h>
 #include <sys/resourcevar.h>
 @@ -168,27 +168,28 @@ lwproc_proc_free(struct proc *p)
 	/* childranee eunt initus */
 	while ((child = LIST_FIRST(&p->p_children)) != NULL) {
 		LIST_REMOVE(child, p_sibling);
 		child->p_pptr = initproc;
 		child->p_ppid = 1;
 		LIST_INSERT_HEAD(&initproc->p_children, child, p_sibling);
+	}
 	KASSERT(p->p_nlwps == 0);
 	KASSERT(LIST_EMPTY(&p->p_lwps));
 	LIST_REMOVE(p, p_list);
 	LIST_REMOVE(p, p_sibling);
-	proc_free_pid(p->p_pid); /* decrements nprocs */
+	proc_free_pid(p->p_pid);
 	atomic_dec_uint(&nprocs);
 	proc_leavepgrp(p); /* releases proc_lock */
 	cred = p->p_cred;
 	chgproccnt(kauth_cred_getuid(cred), -1);
 	rump_proc_vfs_release(p);
 	doexithooks(p);
 	lim_free(p->p_limit);
 	pstatsfree(p->p_stats);
 	kauth_cred_free(p->p_cred);
 	proc_finispecific(p);
 	mutex_obj_free(p->p_lock);