4 files changed, 108 insertions, 99 deletions

diff --git a/sys/contrib/openzfs/lib/libzpool/Makefile.am b/sys/contrib/openzfs/lib/libzpool/Makefile.am
index 8553b377a760..aeacc595b363 100644
--- a/sys/contrib/openzfs/lib/libzpool/Makefile.am
+++ b/sys/contrib/openzfs/lib/libzpool/Makefile.am
@@ -177,6 +177,7 @@ nodist_libzpool_la_SOURCES = \
 	module/zfs/zfs_byteswap.c \
 	module/zfs/zfs_chksum.c \
 	module/zfs/zfs_debug_common.c \
+	module/zfs/zfs_crrd.c \
 	module/zfs/zfs_fm.c \
 	module/zfs/zfs_fuid.c \
 	module/zfs/zfs_ratelimit.c \
@@ -199,7 +200,7 @@ libzpool_la_LIBADD = \
 	libzstd.la \
 	libzutil.la
 
-libzpool_la_LIBADD += $(LIBCLOCK_GETTIME) $(ZLIB_LIBS) -ldl -lm
+libzpool_la_LIBADD += $(LIBCLOCK_GETTIME) $(ZLIB_LIBS) -lm
 
 libzpool_la_LDFLAGS = -pthread
 
diff --git a/sys/contrib/openzfs/lib/libzpool/abd_os.c b/sys/contrib/openzfs/lib/libzpool/abd_os.c
index 0d5795de143a..8bd7a64ab24a 100644
--- a/sys/contrib/openzfs/lib/libzpool/abd_os.c
+++ b/sys/contrib/openzfs/lib/libzpool/abd_os.c
@@ -302,7 +302,7 @@ abd_iter_at_end(struct abd_iter *aiter)
 void
 abd_iter_advance(struct abd_iter *aiter, size_t amount)
 {
-	ASSERT3P(aiter->iter_mapaddr, ==, NULL);
+	ASSERT0P(aiter->iter_mapaddr);
 	ASSERT0(aiter->iter_mapsize);
 
 	if (abd_iter_at_end(aiter))
@@ -315,7 +315,7 @@ abd_iter_advance(struct abd_iter *aiter, size_t amount)
 void
 abd_iter_map(struct abd_iter *aiter)
 {
-	ASSERT3P(aiter->iter_mapaddr, ==, NULL);
+	ASSERT0P(aiter->iter_mapaddr);
 	ASSERT0(aiter->iter_mapsize);
 
 	if (abd_iter_at_end(aiter))
diff --git a/sys/contrib/openzfs/lib/libzpool/kernel.c b/sys/contrib/openzfs/lib/libzpool/kernel.c
index e397fc851cc1..e63153a03370 100644
--- a/sys/contrib/openzfs/lib/libzpool/kernel.c
+++ b/sys/contrib/openzfs/lib/libzpool/kernel.c
@@ -369,7 +369,7 @@ cv_timedwait(kcondvar_t *cv, kmutex_t *mp, clock_t abstime)
 	if (delta <= 0)
 		return (-1);
 
-	VERIFY(gettimeofday(&tv, NULL) == 0);
+	VERIFY0(gettimeofday(&tv, NULL));
 
 	ts.tv_sec = tv.tv_sec + delta / hz;
 	ts.tv_nsec = tv.tv_usec * NSEC_PER_USEC + (delta % hz) * (NANOSEC / hz);
@@ -1025,25 +1025,13 @@ spl_fstrans_unmark(fstrans_cookie_t cookie)
 }
 
 int
-__spl_pf_fstrans_check(void)
-{
-	return (0);
-}
-
-int
 kmem_cache_reap_active(void)
 {
 	return (0);
 }
 
 void
-zvol_create_minor(const char *name)
-{
-	(void) name;
-}
-
-void
-zvol_create_minors_recursive(const char *name)
+zvol_create_minors(const char *name)
 {
 	(void) name;
 }
@@ -1073,8 +1061,8 @@ zvol_rename_minors(spa_t *spa, const char *oldname, const char *newname,
 int
 zfs_file_open(const char *path, int flags, int mode, zfs_file_t **fpp)
 {
-	int fd = -1;
-	int dump_fd = -1;
+	int fd;
+	int dump_fd;
 	int err;
 	int old_umask = 0;
 	zfs_file_t *fp;
diff --git a/sys/contrib/openzfs/lib/libzpool/util.c b/sys/contrib/openzfs/lib/libzpool/util.c
index a297daedbd4d..66d6f43967d5 100644
--- a/sys/contrib/openzfs/lib/libzpool/util.c
+++ b/sys/contrib/openzfs/lib/libzpool/util.c
@@ -36,7 +36,7 @@
 #include <sys/fs/zfs.h>
 #include <sys/zfs_refcount.h>
 #include <sys/zfs_ioctl.h>
-#include <dlfcn.h>
+#include <sys/tunables.h>
 #include <libzutil.h>
 
 /*
@@ -137,12 +137,10 @@ show_pool_stats(spa_t *spa)
 	nvlist_t *config, *nvroot;
 	const char *name;
 
-	VERIFY(spa_get_stats(spa_name(spa), &config, NULL, 0) == 0);
+	VERIFY0(spa_get_stats(spa_name(spa), &config, NULL, 0));
 
-	VERIFY(nvlist_lookup_nvlist(config, ZPOOL_CONFIG_VDEV_TREE,
-	    &nvroot) == 0);
-	VERIFY(nvlist_lookup_string(config, ZPOOL_CONFIG_POOL_NAME,
-	    &name) == 0);
+	VERIFY0(nvlist_lookup_nvlist(config, ZPOOL_CONFIG_VDEV_TREE, &nvroot));
+	VERIFY0(nvlist_lookup_string(config, ZPOOL_CONFIG_POOL_NAME, &name));
 
 	show_vdev_stats(name, ZPOOL_CONFIG_CHILDREN, nvroot, 0);
 	show_vdev_stats(NULL, ZPOOL_CONFIG_L2CACHE, nvroot, 0);
@@ -151,97 +149,119 @@ show_pool_stats(spa_t *spa)
 	nvlist_free(config);
 }
 
-/* *k_out must be freed by the caller */
+/*
+ * Common helper for working with libzpool tunables from the command line.
+ *
+ * Valid inputs:
+ *
+ *   <name>		show named tunable and value
+ *   <name>=<value>	set tunable value
+ *
+ *   show		show all tunables and values
+ *   show=<name>	show named tunable and value
+ *   info		show info about all tunables
+ *   info=<name>	show info about named tunable
+ */
+
+typedef enum { SHOW, INFO, SET } tunable_mode_t;
+
 static int
-set_global_var_parse_kv(const char *arg, char **k_out, u_longlong_t *v_out)
+list_tunables_cb(const zfs_tunable_t *tunable, void *arg)
 {
-	int err;
-	VERIFY(arg);
-	char *d = strdup(arg);
-
-	char *save = NULL;
-	char *k = strtok_r(d, "=", &save);
-	char *v_str = strtok_r(NULL, "=", &save);
-	char *follow = strtok_r(NULL, "=", &save);
-	if (k == NULL || v_str == NULL || follow != NULL) {
-		err = EINVAL;
-		goto err_free;
-	}
-
-	u_longlong_t val = strtoull(v_str, NULL, 0);
-	if (val > UINT32_MAX) {
-		fprintf(stderr, "Value for global variable '%s' must "
-		    "be a 32-bit unsigned integer, got '%s'\n", k, v_str);
-		err = EOVERFLOW;
-		goto err_free;
+	const tunable_mode_t *mode = arg;
+
+	static const char *type[] = {
+		"int", "uint", "ulong", "u64", "str",
+	};
+	static const char *perm[] = {
+		"rw", "rd",
+	};
+
+	if (*mode == SHOW) {
+		char val[64];
+		int err = zfs_tunable_get(tunable, val, sizeof (val));
+		if (err == 0)
+			printf("%s: %s\n", tunable->zt_name, val);
+		else
+			printf("%s: [error getting tunable value: %s]\n",
+			    tunable->zt_name, strerror(err));
+	} else {
+		printf("%s [%s %s]: %s\n", tunable->zt_name,
+		    type[tunable->zt_type], perm[tunable->zt_perm],
+		    tunable->zt_desc);
 	}
 
-	*k_out = strdup(k);
-	*v_out = val;
-	free(d);
 	return (0);
-
-err_free:
-	free(d);
-
-	return (err);
 }
-
-/*
- * Sets given global variable in libzpool to given unsigned 32-bit value.
- * arg: "<variable>=<value>"
- */
 int
-set_global_var(char const *arg)
+handle_tunable_option(const char *_arg, boolean_t quiet)
 {
-	void *zpoolhdl;
-	char *varname;
-	u_longlong_t val;
-	int ret;
-
-#ifndef _ZFS_LITTLE_ENDIAN
-	/*
-	 * On big endian systems changing a 64-bit variable would set the high
-	 * 32 bits instead of the low 32 bits, which could cause unexpected
-	 * results.
-	 */
-	fprintf(stderr, "Setting global variables is only supported on "
-	    "little-endian systems\n");
-	ret = ENOTSUP;
-	goto out_ret;
-#endif
+	int err = 0;
+	char *arg = strdup(_arg);
+	char *k, *v;
+
+	v = arg;
+	k = strsep(&v, "=");
+
+	tunable_mode_t mode;
+
+	if (strcmp(k, "show") == 0) {
+		mode = SHOW;
+		k = v;
+	} else if (strcmp(k, "info") == 0) {
+		mode = INFO;
+		k = v;
+	} else if (v == NULL) {
+		mode = SHOW;
+	} else {
+		mode = SET;
+	}
 
-	if ((ret = set_global_var_parse_kv(arg, &varname, &val)) != 0) {
-		goto out_ret;
+	if (quiet && mode != SET) {
+		err = EINVAL;
+		goto out;
 	}
 
-	zpoolhdl = dlopen("libzpool.so", RTLD_LAZY);
-	if (zpoolhdl != NULL) {
-		uint32_t *var;
-		var = dlsym(zpoolhdl, varname);
-		if (var == NULL) {
-			fprintf(stderr, "Global variable '%s' does not exist "
-			    "in libzpool.so\n", varname);
-			ret = EINVAL;
-			goto out_dlclose;
+	if (mode == SET) {
+		const zfs_tunable_t *tunable = zfs_tunable_lookup(k);
+		if (tunable == NULL) {
+			err = ENOENT;
+			goto out;
 		}
-		*var = (uint32_t)val;
 
+		char vold[256], vnew[256];
+		if (zfs_tunable_get(tunable, vold, sizeof (vold)) != 0)
+			strcpy(vold, "???");
+		err = zfs_tunable_set(tunable, v);
+		if (err != 0)
+			goto out;
+		if (zfs_tunable_get(tunable, vnew, sizeof (vnew)) != 0)
+			strcpy(vnew, "???");
+
+		if (!quiet)
+			printf("%s: %s -> %s\n", k, vold, vnew);
+	} else if (k != NULL) {
+		const zfs_tunable_t *tunable = zfs_tunable_lookup(k);
+		if (tunable == NULL) {
+			err = ENOENT;
+			goto out;
+		}
+		list_tunables_cb(tunable, &mode);
 	} else {
-		fprintf(stderr, "Failed to open libzpool.so to set global "
-		    "variable\n");
-		ret = EIO;
-		goto out_free;
+		zfs_tunable_iter(list_tunables_cb, &mode);
 	}
 
-	ret = 0;
+out:
+	if (!quiet) {
+		if (err == ENOENT)
+			fprintf(stderr, "no such tunable: %s\n", k);
+		else if (err != 0)
+			fprintf(stderr, "couldn't set tunable '%s': %s\n",
+			    k, strerror(err));
+	}
 
-out_dlclose:
-	dlclose(zpoolhdl);
-out_free:
-	free(varname);
-out_ret:
-	return (ret);
+	free(arg);
+	return (err);
 }
 
 static nvlist_t *