svn commit: r367010 - head/sys/contrib/openzfs/module/os/freebsd/spl

[Ryan Moeller]

Author: freqlabs
Date: Sat Oct 24 16:25:52 2020
New Revision: 367010
URL: https://svnweb.freebsd.org/changeset/base/367010

Log:
  Skip RAW kstat sysctls by default
  
  hese kstats are often expensive to compute so we want to avoid them
  unless specifically requested.
  
  The following kstats are affected by this change:
  
  kstat.zfs.${pool}.multihost
  kstat.zfs.${pool}.misc.state
  kstat.zfs.${pool}.txgs
  kstat.zfs.misc.fletcher_4_bench
  kstat.zfs.misc.vdev_raidz_bench
  kstat.zfs.misc.dbufs
  kstat.zfs.misc.dbgmsg
  
  PR:		249258
  Reported by:	mjg
  Reviewed by:	mjg, allanjude
  Obtained from:	https://github.com/openzfs/zfs/pull/11099
  Sponsored by:	iXsystems, Inc.

Modified:
  head/sys/contrib/openzfs/module/os/freebsd/spl/spl_kstat.c

Modified: head/sys/contrib/openzfs/module/os/freebsd/spl/spl_kstat.c
==============================================================================
--- head/sys/contrib/openzfs/module/os/freebsd/spl/spl_kstat.c	Sat Oct 24 16:17:07 2020	(r367009)
+++ head/sys/contrib/openzfs/module/os/freebsd/spl/spl_kstat.c	Sat Oct 24 16:25:52 2020	(r367010)
@@ -475,14 +475,14 @@ kstat_install(kstat_t *ksp)
 		if (ksp->ks_raw_ops.data) {
 			root = SYSCTL_ADD_PROC(&ksp->ks_sysctl_ctx,
 			    SYSCTL_CHILDREN(ksp->ks_sysctl_root),
-			    OID_AUTO, ksp->ks_name,
-			    CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE,
+			    OID_AUTO, ksp->ks_name, CTLTYPE_STRING | CTLFLAG_RD
+			    | CTLFLAG_MPSAFE | CTLFLAG_SKIP,
 			    ksp, 0, kstat_sysctl_raw, "A", ksp->ks_name);
 		} else {
 			root = SYSCTL_ADD_PROC(&ksp->ks_sysctl_ctx,
 			    SYSCTL_CHILDREN(ksp->ks_sysctl_root),
-			    OID_AUTO, ksp->ks_name,
-			    CTLTYPE_OPAQUE | CTLFLAG_RD | CTLFLAG_MPSAFE,
+			    OID_AUTO, ksp->ks_name, CTLTYPE_OPAQUE | CTLFLAG_RD
+			    | CTLFLAG_MPSAFE | CTLFLAG_SKIP,
 			    ksp, 0, kstat_sysctl_raw, "", ksp->ks_name);
 		}
 		break;