Tue Apr 17 08:36:11 2018 UTC ()

Pull up following revision(s) (requested by hannken in ticket #772):

	sys/miscfs/procfs/procfs_subr.c: revision 1.112

Change procfs_revoke_vnodes() to use vrecycle()/vgone() instead
of VOP_REVOKE().

Gets rid of a bunch of suspensions on /proc as vrecycle() will
succeed most time and we suspend at most once per call.


(martin)

diff -r1.108.6.1 -r1.108.6.2 src/sys/miscfs/procfs/procfs_subr.c

--- src/sys/miscfs/procfs/procfs_subr.c 2018/04/12 13:42:48	1.108.6.1
+++ src/sys/miscfs/procfs/procfs_subr.c 2018/04/17 08:36:11	1.108.6.2

 @@ -1,14 +1,14 @@
-/*	$NetBSD: procfs_subr.c,v 1.108.6.1 2018/04/12 13:42:48 martin Exp $	*/
+/*	$NetBSD: procfs_subr.c,v 1.108.6.2 2018/04/17 08:36:11 martin Exp $	*/
 /*-
  * Copyright (c) 2006, 2007, 2008 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.
 @@ -92,33 +92,34 @@
  * 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.
+ *
  *	@(#)procfs_subr.c	8.6 (Berkeley) 5/14/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_subr.c,v 1.108.6.1 2018/04/12 13:42:48 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_subr.c,v 1.108.6.2 2018/04/17 08:36:11 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/time.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/fstrans.h>
 #include <sys/vnode.h>
 #include <sys/stat.h>
 #include <sys/file.h>
 #include <sys/filedesc.h>
 #include <sys/kauth.h>
 #include <miscfs/procfs/procfs.h>
 /*
  * Allocate a pfsnode/vnode pair.  The vnode is referenced.
  * The pid, type, and file descriptor uniquely identify a pfsnode.
  */
 int
 @@ -353,41 +354,58 @@ procfs_revoke_selector(void *arg, struct
 	struct proc *p = arg;
 	struct pfsnode *pfs;
 	KASSERT(mutex_owned(vp->v_interlock));
 	pfs = VTOPFS(vp);
 	return (pfs != NULL && pfs->pfs_pid == p->p_pid);
+}
 void
 procfs_revoke_vnodes(struct proc *p, void *arg)
+{
 	int error;
 	bool suspended;
 	struct vnode *vp;
 	struct vnode_iterator *marker;
 	struct mount *mp = (struct mount *)arg;
 	if (!(p->p_flag & PK_SUGID))
 		return;
 	suspended = false;
 	vfs_vnode_iterator_init(mp, &marker);
 	while ((vp = vfs_vnode_iterator_next(marker,
 	    procfs_revoke_selector, p)) != NULL) {
-		VOP_REVOKE(vp, REVOKEALL);
+		if (vrecycle(vp))
-		vrele(vp);
+			continue;
 		/* Vnode is busy, we have to suspend the mount for vgone(). */
 		while (! suspended) {
 			error = vfs_suspend(mp, 0);
 			if (error == 0) {
 				suspended = true;
 			} else if (error != EINTR && error != ERESTART) {
 				KASSERT(error == EOPNOTSUPP);
 				break;
+			}
+		}
 		vgone(vp);
+	}
 	if (suspended)
 		vfs_resume(mp);
 	vfs_vnode_iterator_destroy(marker);
+}
 int
 procfs_proc_lock(int pid, struct proc **bunghole, int notfound)
+{
 	struct proc *tp;
 	int error = 0;
 	mutex_enter(proc_lock);
 	if (pid == 0)
 		tp = &proc0;