 @@ -1,14 +1,14 @@
-/*	$NetBSD: vfs_bio.c,v 1.297 2020/07/31 04:07:30 chs Exp $	*/
+/*	$NetBSD: vfs_bio.c,v 1.298 2021/04/01 06:25:59 simonb Exp $	*/
 /*-
  * Copyright (c) 2007, 2008, 2009, 2019, 2020 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran, and by 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.
 @@ -113,27 +113,27 @@
  * - bufcache_lock: protects global buffer cache state.
  * - BC_BUSY: a long term per-buffer lock.
  * - buf_t::b_objlock: lock on completion (biowait vs biodone).
+ *
  * For buffers associated with vnodes (a most common case) b_objlock points
  * to the vnode_t::v_interlock.  Otherwise, it points to generic buffer_lock.
+ *
  * Lock order:
  *	bufcache_lock ->
  *		buf_t::b_objlock
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_bio.c,v 1.297 2020/07/31 04:07:30 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_bio.c,v 1.298 2021/04/01 06:25:59 simonb Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_bufcache.h"
 #include "opt_dtrace.h"
 #include "opt_biohist.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/vnode.h>
 @@ -242,26 +242,28 @@ biohist_init(void)
+{
 	BIOHIST_INIT(biohist, BIOHIST_SIZE);
+}
 /*
  * Definitions for the buffer hash lists.
  */
 #define	BUFHASH(dvp, lbn)	\
 	(&bufhashtbl[(((long)(dvp) >> 8) + (int)(lbn)) & bufhash])
 LIST_HEAD(bufhashhdr, buf) *bufhashtbl, invalhash;
 u_long	bufhash;
 static int     bufhash_stats(struct hashstat_sysctl *, bool);
 static kcondvar_t needbuffer_cv;
 /*
  * Buffer queue lock.
  */
 kmutex_t bufcache_lock __cacheline_aligned;
 kmutex_t buffer_lock __cacheline_aligned;
 /* Software ISR for completed transfers. */
 static void *biodone_sih;
 /* Buffer pool for I/O buffers. */
 static pool_cache_t buf_cache;
 @@ -526,26 +528,27 @@ bufinit(void)
 	/*
 	 * Estimate hash table size based on the amount of memory we
 	 * intend to use for the buffer cache. The average buffer
 	 * size is dependent on our clients (i.e. filesystems).
+	 *
 	 * For now, use an empirical 3K per buffer.
 	 */
 	nbuf = (bufmem_hiwater / 1024) / 3;
 	bufhashtbl = hashinit(nbuf, HASH_LIST, true, &bufhash);
 	sysctl_kern_buf_setup();
 	sysctl_vm_buf_setup();
 	hashstat_register("bufhash", bufhash_stats);
+}
 void
 bufinit2(void)
+{
 	biodone_sih = softint_establish(SOFTINT_BIO | SOFTINT_MPSAFE, biointr,
 	    NULL);
 	if (biodone_sih == NULL)
 		panic("bufinit2: can't establish soft interrupt");
+}
 static int
 @@ -1943,26 +1946,60 @@ sysctl_vm_buf_setup(void)
 		       SYSCTL_DESCR("Minimum amount of kernel memory to "
 				    "reserve for buffer cache"),
 		       sysctl_bufvm_update, 0, &bufmem_lowater, 0,
 		       CTL_VM, CTL_CREATE, CTL_EOL);
 	sysctl_createv(&vfsbio_sysctllog, 0, NULL, NULL,
 		       CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
 		       CTLTYPE_LONG, "bufmem_hiwater",
 		       SYSCTL_DESCR("Maximum amount of kernel memory to use "
 				    "for buffer cache"),
 		       sysctl_bufvm_update, 0, &bufmem_hiwater, 0,
 		       CTL_VM, CTL_CREATE, CTL_EOL);
+}
 static int
 bufhash_stats(struct hashstat_sysctl *hs, bool fill)
+{
 	buf_t *bp;
 	uint64_t chain;
 	strlcpy(hs->hash_name, "bufhash", sizeof(hs->hash_name));
 	strlcpy(hs->hash_desc, "buffer hash", sizeof(hs->hash_desc));
 	if (!fill)
 		return 0;
 	hs->hash_size = bufhash + 1;
 	for (size_t i = 0; i < hs->hash_size; i++) {
 		chain = 0;
 		mutex_enter(&bufcache_lock);
 		LIST_FOREACH(bp, &bufhashtbl[i], b_hash) {
 			chain++;
+		}
 		mutex_exit(&bufcache_lock);
 		if (chain > 0) {
 			hs->hash_used++;
 			hs->hash_items += chain;
 			if (chain > hs->hash_maxchain)
 				hs->hash_maxchain = chain;
+		}
 		preempt_point();
+	}
 	return 0;
+}
 #ifdef DEBUG
 /*
  * Print out statistics on the current allocation of the buffer pool.
  * Can be enabled to print out on every ``sync'' by setting "syncprt"
  * in vfs_syscalls.c using sysctl.
  */
 void
 vfs_bufstats(void)
+{
 	int i, j, count;
 	buf_t *bp;
 	struct bqueue *dp;
 	int counts[MAXBSIZE / MIN_PAGE_SIZE + 1];