svn commit: r357881 - stable/12/cddl/contrib/opensolaris/lib/libzfs/common

[Alan Somers]

Author: asomers
Date: Thu Feb 13 20:49:45 2020
New Revision: 357881
URL: https://svnweb.freebsd.org/changeset/base/357881

Log:
  MFC r357235:
  
  Speed up "zpool import" in the presence of many zvols
  
  By default, zpools may not be backed by zvols (that can be changed with the
  "vfs.zfs.vol.recursive" sysctl). When that sysctl is set to 0, the kernel
  does not attempt to read zvols when looking for vdevs. But the zpool command
  still does. This change brings the zpool command into line with the kernel's
  behavior. It speeds "zpool import" when an already imported pool has many
  zvols, or a zvol with many snapshots.
  
  PR:		241083
  Reported by:	Martin Birgmeier <d8zNeCFG at aon.at>
  Reviewed by:	mav, Ryan Moeller <ryan at freqlabs.com>
  Sponsored by:	Axcient
  Differential Revision:	https://reviews.freebsd.org/D22077

Modified:
  stable/12/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
==============================================================================
--- stable/12/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c	Thu Feb 13 20:46:05 2020	(r357880)
+++ stable/12/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c	Thu Feb 13 20:49:45 2020	(r357881)
@@ -1244,12 +1244,20 @@ zpool_find_import_impl(libzfs_handle_t *hdl, importarg
 	avl_tree_t slice_cache;
 	rdsk_node_t *slice;
 	void *cookie;
+	boolean_t skip_zvols = B_FALSE;
+	int value;
+	size_t size = sizeof(value);
 
 	if (dirs == 0) {
 		dirs = 1;
 		dir = &default_dir;
 	}
 
+	if (sysctlbyname("vfs.zfs.vol.recursive", &value, &size, NULL, 0) == 0
+	    && value == 0) {
+		skip_zvols = B_TRUE;
+	}
+
 	/*
 	 * Go through and read the label configuration information from every
 	 * possible device, organizing the information according to pool GUID
@@ -1314,6 +1322,10 @@ zpool_find_import_impl(libzfs_handle_t *hdl, importarg
 			}
 
 			LIST_FOREACH(mp, &mesh.lg_class, lg_class) {
+				if (skip_zvols &&
+				    strcmp(mp->lg_name, "ZFS::ZVOL") == 0) {
+					continue;
+				}
 		        	LIST_FOREACH(gp, &mp->lg_geom, lg_geom) {
 					LIST_FOREACH(pp, &gp->lg_provider, lg_provider) {
 						slice = zfs_alloc(hdl, sizeof (rdsk_node_t));