 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_cache.c,v 1.96 2014/06/03 19:42:17 joerg Exp $	*/
+/*	$NetBSD: vfs_cache.c,v 1.97 2014/06/03 21:16:15 joerg Exp $	*/
 /*-
  * Copyright (c) 2008 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.
 @@ -48,33 +48,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.
+ *
  *	@(#)vfs_cache.c	8.3 (Berkeley) 8/22/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_cache.c,v 1.96 2014/06/03 19:42:17 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_cache.c,v 1.97 2014/06/03 21:16:15 joerg Exp $");
 #include "opt_ddb.h"
 #include "opt_revcache.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
 #include <sys/time.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 #include <sys/namei.h>
 #include <sys/errno.h>
 #include <sys/pool.h>
 #include <sys/mutex.h>
 #include <sys/atomic.h>
 #include <sys/kthread.h>
 #include <sys/kernel.h>
 #include <sys/cpu.h>
 #include <sys/evcnt.h>
 @@ -1088,13 +1089,59 @@ namecache_count_pass2(void)
 	COUNT(cpup->cpu_stats, ncs_pass2);
 	mutex_exit(&cpup->cpu_lock);
+}
 void
 namecache_count_2passes(void)
+{
 	struct nchcpu *cpup = curcpu()->ci_data.cpu_nch;
 	mutex_enter(&cpup->cpu_lock);
 	COUNT(cpup->cpu_stats, ncs_2passes);
 	mutex_exit(&cpup->cpu_lock);
+}
 static int
 cache_stat_sysctl(SYSCTLFN_ARGS)
+{
 	struct nchstats_sysctl stats;
 	if (oldp == NULL) {
 		*oldlenp = sizeof(stats);
 		return 0;
+	}
 	if (*oldlenp < sizeof(stats)) {
 		*oldlenp = 0;
 		return 0;
+	}
 	memset(&stats, 0, sizeof(stats));
 	sysctl_unlock();
 	cache_lock_cpus();
 	stats.ncs_goodhits = nchstats.ncs_goodhits;
 	stats.ncs_neghits = nchstats.ncs_neghits;
 	stats.ncs_badhits = nchstats.ncs_badhits;
 	stats.ncs_falsehits = nchstats.ncs_falsehits;
 	stats.ncs_miss = nchstats.ncs_miss;
 	stats.ncs_long = nchstats.ncs_long;
 	stats.ncs_pass2 = nchstats.ncs_pass2;
 	stats.ncs_2passes = nchstats.ncs_2passes;
 	stats.ncs_revhits = nchstats.ncs_revhits;
 	stats.ncs_revmiss = nchstats.ncs_revmiss;
 	cache_unlock_cpus();
 	sysctl_relock();
 	*oldlenp = sizeof(stats);
 	return sysctl_copyout(l, &stats, oldp, sizeof(stats));
+}
 SYSCTL_SETUP(sysctl_cache_stat_setup, "vfs.namecache_stats subtree setup")
+{
 	sysctl_createv(clog, 0, NULL, NULL,
 		       CTLFLAG_PERMANENT,
 		       CTLTYPE_STRUCT, "namecache_stats",
 		       SYSCTL_DESCR("namecache statistics"),
 		       cache_stat_sysctl, 0, NULL, 0,
 		       CTL_VFS, CTL_CREATE, CTL_EOL);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: namei.src,v 1.32 2014/06/03 19:30:29 joerg Exp $	*/
+/*	$NetBSD: namei.src,v 1.33 2014/06/03 21:16:15 joerg Exp $	*/
 /*
  * Copyright (c) 1985, 1989, 1991, 1993
  *	The Regents of the University of California.  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.
 @@ -294,17 +294,30 @@ void	namecache_print(struct vnode *, voi
 struct	nchstats {
 	long	ncs_goodhits;		/* hits that we can really use */
 	long	ncs_neghits;		/* negative hits that we can use */
 	long	ncs_badhits;		/* hits we must drop */
 	long	ncs_falsehits;		/* hits with id mismatch */
 	long	ncs_miss;		/* misses */
 	long	ncs_long;		/* long names that ignore cache */
 	long	ncs_pass2;		/* names found with passes == 2 */
 	long	ncs_2passes;		/* number of times we attempt it */
 	long	ncs_revhits;		/* reverse-cache hits */
 	long	ncs_revmiss;		/* reverse-cache misses */
 };
 struct	nchstats_sysctl {
 	uint64_t ncs_goodhits;		/* hits that we can really use */
 	uint64_t ncs_neghits;		/* negative hits that we can use */
 	uint64_t ncs_badhits;		/* hits we must drop */
 	uint64_t ncs_falsehits;		/* hits with id mismatch */
 	uint64_t ncs_miss;		/* misses */
 	uint64_t ncs_long;		/* long names that ignore cache */
 	uint64_t ncs_pass2;		/* names found with passes == 2 */
 	uint64_t ncs_2passes;		/* number of times we attempt it */
 	uint64_t ncs_revhits;		/* reverse-cache hits */
 	uint64_t ncs_revmiss;		/* reverse-cache misses */
 };
 #ifdef _KERNEL
 extern struct nchstats nchstats;
 #endif
 /* #endif !_SYS_NAMEI_H_ (generated by gennameih.awk) */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vmstat.c,v 1.77 2010/04/30 16:21:05 njoly Exp $	*/
+/*	$NetBSD: vmstat.c,v 1.78 2014/06/03 21:16:15 joerg Exp $	*/
 /*-
  * Copyright (c) 1983, 1989, 1992, 1993
  *	The Regents of the University of California.  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.
 @@ -24,27 +24,27 @@
  * 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>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)vmstat.c	8.2 (Berkeley) 1/12/94";
 #endif
-__RCSID("$NetBSD: vmstat.c,v 1.77 2010/04/30 16:21:05 njoly Exp $");
+__RCSID("$NetBSD: vmstat.c,v 1.78 2014/06/03 21:16:15 joerg Exp $");
 #endif /* not lint */
 /*
  * Cursed vmstat -- from Robert Elz.
  */
 #include <sys/param.h>
 #include <sys/uio.h>
 #include <sys/namei.h>
 #include <sys/sysctl.h>
 #include <sys/evcnt.h>
 #include <uvm/uvm_extern.h>
 @@ -53,27 +53,27 @@ __RCSID("$NetBSD: vmstat.c,v 1.77 2010/0
 #include <stdlib.h>
 #include <string.h>
 #include <util.h>
 #include "systat.h"
 #include "extern.h"
 #include "drvstats.h"
 #include "utmpentry.h"
 #include "vmstat.h"
 static struct Info {
 	struct	uvmexp_sysctl uvmexp;
 	struct	vmtotal Total;
-	struct	nchstats nchstats;
+	struct	nchstats_sysctl nchstats;
 	long	nchcount;
 	long	*intrcnt;
 	u_int64_t	*evcnt;
 } s, s1, s2, z;
 enum display_mode display_mode = TIME;
 static void allocinfo(struct Info *);
 static void copyinfo(struct Info *, struct Info *);
 static float cputime(int);
 static void dinfo(int, int, int);
 static void getinfo(struct Info *);
 static int ucount(void);
 @@ -766,27 +766,32 @@ putfloat(double f, int l, int c, int w,
+	}
 	addstr(b);
+}
 static void
 getinfo(struct Info *stats)
+{
 	int mib[2];
 	size_t size;
 	int i;
 	cpureadstats();
 	drvreadstats();
-	NREAD(X_NCHSTATS, &stats->nchstats, sizeof stats->nchstats);
+	size = sizeof(stats->nchstats);
 	if (sysctlbyname("vfs.namecache_stats", &stats->nchstats, &size,
 	    NULL, 0) < 0) {
 		error("can't get namecache statistics: %s\n", strerror(errno));
 		memset(&stats->nchstats, 0, sizeof(stats->nchstats));
+	}
 	if (nintr)
 		NREAD(X_INTRCNT, stats->intrcnt, nintr * LONG);
 	for (i = 0; i < nevcnt; i++)
 		KREAD(ie_head[i].ie_count, &stats->evcnt[i],
 		      sizeof stats->evcnt[i]);
 	size = sizeof(stats->uvmexp);
 	mib[0] = CTL_VM;
 	mib[1] = VM_UVMEXP2;
 	if (sysctl(mib, 2, &stats->uvmexp, &size, NULL, 0) < 0) {
 		error("can't get uvmexp: %s\n", strerror(errno));
 		memset(&stats->uvmexp, 0, sizeof(stats->uvmexp));
+	}
 	size = sizeof(stats->Total);

 @@ -1,14 +1,14 @@
-/* $NetBSD: vmstat.c,v 1.193 2014/06/02 19:16:10 joerg Exp $ */
+/* $NetBSD: vmstat.c,v 1.194 2014/06/03 21:16:15 joerg Exp $ */
 /*-
  * Copyright (c) 1998, 2000, 2001, 2007 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.
  *	- Simon Burge and Luke Mewburn of Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -60,27 +60,27 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1986, 1991, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)vmstat.c	8.2 (Berkeley) 3/1/95";
 #else
-__RCSID("$NetBSD: vmstat.c,v 1.193 2014/06/02 19:16:10 joerg Exp $");
+__RCSID("$NetBSD: vmstat.c,v 1.194 2014/06/03 21:16:15 joerg Exp $");
 #endif
 #endif /* not lint */
 #define	__POOL_EXPOSE
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/mount.h>
 #include <sys/uio.h>
 #include <sys/buf.h>
 #include <sys/evcnt.h>
 #include <sys/ioctl.h>
 @@ -838,28 +838,28 @@ pct(long top, long bot)
 	long ans;
 	if (bot == 0)
 		return (0);
 	ans = (long)((quad_t)top * 100 / bot);
 	return (ans);
+}
 #define	PCT(top, bot) (int)pct((long)(top), (long)(bot))
 void
 dosum(void)
+{
-	struct nchstats nchstats;
+	struct nchstats_sysctl nch_stats;
-	u_long nchtotal;
+	uint64_t nchtotal;
 	struct uvmexp_sysctl uvmexp2;
 	size_t ssize;
 	int active_kernel;
 	struct cpu_counter cc;
 	/*
 	 * The "active" and "inactive" variables
 	 * are now estimated by the kernel and sadly
 	 * can not easily be dug out of a crash dump.
 	 */
 	ssize = sizeof(uvmexp2);
 	memset(&uvmexp2, 0, ssize);
 	active_kernel = (memf == NULL);
 @@ -955,48 +955,71 @@ dosum(void)
 	(void)printf("%9u times daemon wokeup\n",uvmexp.pdwoke);
 	(void)printf("%9u revolutions of the clock hand\n", uvmexp.pdrevs);
 	(void)printf("%9u pages freed by daemon\n", uvmexp.pdfreed);
 	(void)printf("%9u pages scanned by daemon\n", uvmexp.pdscans);
 	(void)printf("%9u anonymous pages scanned by daemon\n",
 	    uvmexp.pdanscan);
 	(void)printf("%9u object pages scanned by daemon\n", uvmexp.pdobscan);
 	(void)printf("%9u pages reactivated\n", uvmexp.pdreact);
 	(void)printf("%9u pages found busy by daemon\n", uvmexp.pdbusy);
 	(void)printf("%9u total pending pageouts\n", uvmexp.pdpending);
 	(void)printf("%9u pages deactivated\n", uvmexp.pddeact);
-	kread(namelist, X_NCHSTATS, &nchstats, sizeof(nchstats));
+	if (active_kernel) {
-	nchtotal = nchstats.ncs_goodhits + nchstats.ncs_neghits +
+		ssize = sizeof(nch_stats);
-	    nchstats.ncs_badhits + nchstats.ncs_falsehits +
+		if (sysctlbyname("vfs.namecache_stats", &nch_stats, &ssize,
-	    nchstats.ncs_miss + nchstats.ncs_long;
+		    NULL, 0)) {
-	(void)printf("%9lu total name lookups\n", nchtotal);
+			warn("vfs.namecache_stats failed");
-	(void)printf("%9lu good hits\n", nchstats.ncs_goodhits);
+			memset(&nch_stats, 0, sizeof(nch_stats));
 	(void)printf("%9lu negative hits\n", nchstats.ncs_neghits);
-	(void)printf("%9lu bad hits\n", nchstats.ncs_badhits);
+	} else {
-	(void)printf("%9lu false hits\n", nchstats.ncs_falsehits);
+		struct nchstats nch_stats_kvm;
 	(void)printf("%9lu miss\n", nchstats.ncs_miss);
-	(void)printf("%9lu too long\n", nchstats.ncs_long);
+		kread(namelist, X_NCHSTATS, &nch_stats_kvm,
-	(void)printf("%9lu pass2 hits\n", nchstats.ncs_pass2);
+		    sizeof(nch_stats_kvm));
-	(void)printf("%9lu 2passes\n", nchstats.ncs_2passes);
+		nch_stats.ncs_goodhits = nch_stats_kvm.ncs_goodhits;
 		nch_stats.ncs_neghits = nch_stats_kvm.ncs_neghits;
 		nch_stats.ncs_badhits = nch_stats_kvm.ncs_badhits;
 		nch_stats.ncs_falsehits = nch_stats_kvm.ncs_falsehits;
 		nch_stats.ncs_miss = nch_stats_kvm.ncs_miss;
 		nch_stats.ncs_long = nch_stats_kvm.ncs_long;
 		nch_stats.ncs_pass2 = nch_stats_kvm.ncs_pass2;
 		nch_stats.ncs_2passes = nch_stats_kvm.ncs_2passes;
 		nch_stats.ncs_revhits = nch_stats_kvm.ncs_revhits;
 		nch_stats.ncs_revmiss = nch_stats_kvm.ncs_revmiss;
+	}
 	nchtotal = nch_stats.ncs_goodhits + nch_stats.ncs_neghits +
 	    nch_stats.ncs_badhits + nch_stats.ncs_falsehits +
 	    nch_stats.ncs_miss + nch_stats.ncs_long;
 	(void)printf("%9" PRIu64 " total name lookups\n", nchtotal);
 	(void)printf("%9" PRIu64 " good hits\n", nch_stats.ncs_goodhits);
 	(void)printf("%9" PRIu64 " negative hits\n", nch_stats.ncs_neghits);
 	(void)printf("%9" PRIu64 " bad hits\n", nch_stats.ncs_badhits);
 	(void)printf("%9" PRIu64 " false hits\n", nch_stats.ncs_falsehits);
 	(void)printf("%9" PRIu64 " miss\n", nch_stats.ncs_miss);
 	(void)printf("%9" PRIu64 " too long\n", nch_stats.ncs_long);
 	(void)printf("%9" PRIu64 " pass2 hits\n", nch_stats.ncs_pass2);
 	(void)printf("%9" PRIu64 " 2passes\n", nch_stats.ncs_2passes);
 	(void)printf(
 	    "%9s cache hits (%d%% pos + %d%% neg) system %d%% per-process\n",
-	    "", PCT(nchstats.ncs_goodhits, nchtotal),
+	    "", PCT(nch_stats.ncs_goodhits, nchtotal),
-	    PCT(nchstats.ncs_neghits, nchtotal),
+	    PCT(nch_stats.ncs_neghits, nchtotal),
-	    PCT(nchstats.ncs_pass2, nchtotal));
+	    PCT(nch_stats.ncs_pass2, nchtotal));
 	(void)printf("%9s deletions %d%%, falsehits %d%%, toolong %d%%\n", "",
-	    PCT(nchstats.ncs_badhits, nchtotal),
+	    PCT(nch_stats.ncs_badhits, nchtotal),
-	    PCT(nchstats.ncs_falsehits, nchtotal),
+	    PCT(nch_stats.ncs_falsehits, nchtotal),
-	    PCT(nchstats.ncs_long, nchtotal));
+	    PCT(nch_stats.ncs_long, nchtotal));
+}
 void
 doforkst(void)
+{
 	kread(namelist, X_UVMEXP, &uvmexp, sizeof(uvmexp));
 	(void)printf("%u forks total\n", uvmexp.forks);
 	(void)printf("%u forks blocked parent\n", uvmexp.forks_ppwait);
 	(void)printf("%u forks shared address space with parent\n",
 	    uvmexp.forks_sharevm);
+}