 @@ -1,14 +1,14 @@
-/* $NetBSD: vmstat.c,v 1.244 2021/04/01 05:33:50 simonb Exp $ */
+/* $NetBSD: vmstat.c,v 1.245 2021/04/01 06:23:14 simonb Exp $ */
 /*-
  * Copyright (c) 1998, 2000, 2001, 2007, 2019, 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.
  *	- 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
 @@ -61,27 +61,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.244 2021/04/01 05:33:50 simonb Exp $");
+__RCSID("$NetBSD: vmstat.c,v 1.245 2021/04/01 06:23:14 simonb Exp $");
 #endif
 #endif /* not lint */
 #define	__POOL_EXPOSE
 #define __NAMECACHE_PRIVATE
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/mount.h>
 #include <sys/uio.h>
 #include <sys/buf.h>
 #include <sys/evcnt.h>
 @@ -103,26 +103,27 @@ __RCSID("$NetBSD: vmstat.c,v 1.244 2021/
 #include <uvm/uvm_extern.h>
 #include <uvm/uvm_stat.h>
 #include <net/if.h>
 #include <netinet/in.h>
 #include <netinet/in_var.h>
 #include <ufs/ufs/inode.h>
 #include <nfs/rpcv2.h>
 #include <nfs/nfsproto.h>
 #include <nfs/nfsnode.h>
 #include <assert.h>
 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <kvm.h>
 #include <limits.h>
 #include <nlist.h>
 #undef n_hash
 #include <paths.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stddef.h>
 #include <stdlib.h>
 @@ -197,51 +198,43 @@ struct nlist intrnl[] =
 	{ .n_name = "_intrcnt" },
 #define	X_EINTRCNT	3
 	{ .n_name = "_eintrcnt" },
 #define	X_INTRNL_SIZE	4
 	{ .n_name = NULL },
 };
 /*
  * Namelist for hash statistics
  */
 struct nlist hashnl[] =
+{
-#define	X_NFSNODE	0
+#define	X_BUFHASH	0
 	{ .n_name = "_nfsnodehash" },
 #define	X_NFSNODETBL	1
 	{ .n_name = "_nfsnodehashtbl" },
 #define	X_IHASH		2
 	{ .n_name = "_ihash" },
 #define	X_IHASHTBL	3
 	{ .n_name = "_ihashtbl" },
 #define	X_BUFHASH	4
 	{ .n_name = "_bufhash" },
-#define	X_BUFHASHTBL	5
+#define	X_BUFHASHTBL	1
 	{ .n_name = "_bufhashtbl" },
-#define	X_UIHASH	6
+#define	X_UIHASH	2
 	{ .n_name = "_uihash" },
-#define	X_UIHASHTBL	7
+#define	X_UIHASHTBL	3
 	{ .n_name = "_uihashtbl" },
-#define	X_IFADDRHASH	8
+#define	X_IFADDRHASH	4
 	{ .n_name = "_in_ifaddrhash" },
-#define	X_IFADDRHASHTBL	9
+#define	X_IFADDRHASHTBL	5
 	{ .n_name = "_in_ifaddrhashtbl" },
-#define	X_VCACHEHASH	10
+#define	X_VCACHEHASH	6
 	{ .n_name = "_vcache_hashmask" },
-#define	X_VCACHETBL	11
+#define	X_VCACHETBL	7
 	{ .n_name = "_vcache_hashtab" },
-#define X_HASHNL_SIZE	12	/* must be last */
+#define X_HASHNL_SIZE	8	/* must be last */
 	{ .n_name = NULL },
 };
 /*
  * Namelist for kernel histories
  */
 struct nlist histnl[] =
+{
 	{ .n_name = "_kern_histories" },
 #define	X_KERN_HISTORIES		0
 	{ .n_name = NULL },
 };
 @@ -290,26 +283,27 @@ kvm_t *kd;
 	    (width) - (fixed) - (ovflw) > 0 ?		\
 	    (width) - (fixed) - (ovflw) : 0,		\
 	    (val)) - (width);				\
 	if ((ovflw) < 0)				\
 		(ovflw) = 0;				\
 } while (/* CONSTCOND */0)
 void	cpustats(int *);
 void	cpucounters(struct cpu_counter *);
 void	deref_kptr(const void *, void *, size_t, const char *);
 void	drvstats(int *);
 void	doevcnt(int verbose, int type);
 void	dohashstat(int, int, const char *);
 void	dohashstat_sysctl(int, int, const char *);
 void	dointr(int verbose);
 void	dopool(int, int);
 void	dopoolcache(int);
 void	dosum(void);
 void	dovmstat(struct timespec *, int);
 void	print_total_hdr(void);
 void	dovmtotal(struct timespec *, int);
 void	kread(struct nlist *, int, void *, size_t);
 int	kreadc(struct nlist *, int, void *, size_t);
 void	needhdr(int);
 void	getnlist(int);
 long	getuptime(void);
 void	printhdr(void);
 @@ -1915,26 +1909,29 @@ struct kernel_hash {
 void
 dohashstat(int verbose, int todo, const char *hashname)
+{
 	LIST_HEAD(, generic)	*hashtbl_list;
 	SLIST_HEAD(, generic)	*hashtbl_slist;
 	TAILQ_HEAD(, generic)	*hashtbl_tailq;
 	struct kernel_hash	*curhash;
 	void	*hashaddr, *hashbuf, *nhashbuf, *nextaddr;
 	size_t	elemsize, hashbufsize, thissize;
 	u_long	hashsize, i;
 	int	used, items, chain, maxchain;
 	if (memf == NULL)
 		return dohashstat_sysctl(verbose, todo, hashname);
 	hashbuf = NULL;
 	hashbufsize = 0;
 	if (todo & HASHLIST) {
 		(void)printf("Supported hashes:\n");
 		for (curhash = khashes; curhash->description; curhash++) {
 			if (hashnl[curhash->hashsize].n_value == 0 ||
 			    hashnl[curhash->hashtbl].n_value == 0)
 				continue;
 			(void)printf("\t%-16s%s\n",
 			    hashnl[curhash->hashsize].n_name + 1,
 			    curhash->description);
+		}
 @@ -2047,26 +2044,95 @@ dohashstat(int verbose, int todo, const
 			items += chain;
 			if (verbose && chain > 1)
 				(void)printf("\tchain = %d\n", chain);
 			if (chain > maxchain)
 				maxchain = chain;
+		}
 		(void)printf("%-16s %8ld %8d %8.2f %8d %8.2f %8d\n",
 		    hashnl[curhash->hashsize].n_name + 1,
 		    hashsize, used, used * 100.0 / hashsize,
 		    items, used ? (double)items / used : 0.0, maxchain);
+	}
+}
 void
 dohashstat_sysctl(int verbose, int todo, const char *hashname)
+{
 	struct hashstat_sysctl hash, *data, *hs;
 	int mib[3];
 	int error;
 	size_t i, len, miblen;
 	miblen = __arraycount(mib);
 	error = sysctlnametomib("kern.hashstat", mib, &miblen);
 	if (error)
 		err(EXIT_FAILURE, "nametomib kern.hashstat failed");
 	assert(miblen < 3);
 	if (todo & HASHLIST) {
 		mib[miblen] = CTL_DESCRIBE;
 		miblen++;
 	};
 	if (hashname) {
 		mib[miblen] = CTL_QUERY;
 		miblen++;
 		memset(&hash, 0, sizeof(hash));
 		strlcpy(hash.hash_name, hashname, sizeof(hash.hash_name));
 		len = sizeof(hash);
 		error = sysctl(mib, miblen, &hash, &len, &hash, len);
 		if (error == ENOENT) {
 			err(1, "hash '%s' not found", hashname);
 			return;
 		} else if (error) {
 			err(1, "sysctl kern.hashstat query failed");
 			return;
+		}
 		data = &hash;
 		len = 1;
 	} else {
 		data = asysctl(mib, miblen, &len);
 		if (data == NULL)
 			err(1, "failed to read kern.hashstat");
 		len /= sizeof(*data);
+	}
 	if (todo & HASHLIST) {
 		printf("Supported hashes:\n");
 		for (i = 0, hs = data; i < len; i++, hs++) {
 			printf("\t%-16s%s\n", hs->hash_name, hs->hash_desc);
+		}
 	} else {
 		printf("%-16s %8s %8s %8s %8s %8s %8s\n"
 		    "%-16s %8s %8s %8s %8s %8s %8s\n",
 		    "", "total", "used", "util", "num", "average", "maximum",
 		    "hash table", "buckets", "buckets", "%", "items", "chain",
 		    "chain");
 		for (i = 0, hs = data; i < len; i++, hs++) {
 			printf("%-16s %8"PRId64" %8"PRId64" %8.2f %8"PRId64
 			    " %8.2f %8"PRId64"\n",
 			    hs->hash_name, hs->hash_size, hs->hash_used,
 			    hs->hash_used * 100.0 / hs->hash_size, hs->hash_items,
 			    hs->hash_used ? (double)hs->hash_items / hs->hash_used : 0.0,
 			    hs->hash_maxchain);
+		}
+	}
 	if (!hashname && (data != NULL))
 		free(data);
+}
 /*
  * kreadc like kread but returns 1 if successful, 0 otherwise
  */
 int
 kreadc(struct nlist *nl, int nlx, void *addr, size_t size)
+{
 	const char *sym;
 	sym = nl[nlx].n_name;
 	if (*sym == '_')
 		++sym;
 	if (nl[nlx].n_type == 0 || nl[nlx].n_value == 0)
 		return 0;
 @@ -2244,27 +2310,27 @@ hist_traverse_sysctl(int todo, const cha
 	int mib[4];
 	unsigned int i;
 	size_t len, miblen;
 	struct sysctlnode query, histnode[32];
 	/* retrieve names of available histories */
 	miblen = __arraycount(mib);
 	error = sysctlnametomib("kern.hist", mib, &miblen);
 	if (error != 0) {
 		if (errno == ENOENT) {
  			warnx("kernel history is not compiled into the kernel.");
 			return;
 		} else
-			err(EXIT_FAILURE, "nametomib failed");
+			err(EXIT_FAILURE, "nametomib kern.hist failed");
+	}
 	/* get the list of nodenames below kern.hist */
 	mib[2] = CTL_QUERY;
 	memset(&query, 0, sizeof(query));
 	query.sysctl_flags = SYSCTL_VERSION;
 	len = sizeof(histnode);
 	error = sysctl(mib, 3, &histnode[0], &len, &query, sizeof(query));
 	if (error != 0) {
 		err(1, "query failed");
 		return;
+	}
 	if (len == 0) {