git: 57b9b81894e8 - stable/13 - zfs: merge OpenZFS master-9312e0fd1
Martin Matuska
mm at FreeBSD.org
Wed Mar 10 09:37:03 UTC 2021
The branch stable/13 has been updated by mm:
URL: https://cgit.FreeBSD.org/src/commit/?id=57b9b81894e89f8fc686246618b3ac422a756641
commit 57b9b81894e89f8fc686246618b3ac422a756641
Author: Martin Matuska <mm at FreeBSD.org>
AuthorDate: 2021-02-22 11:35:56 +0000
Commit: Martin Matuska <mm at FreeBSD.org>
CommitDate: 2021-03-10 01:53:32 +0000
zfs: merge OpenZFS master-9312e0fd1
Notable upstream changes:
778869fa1 Fix reporting of mount progress
e7adccf7f Disable use of hardware crypto offload drivers on FreeBSD
03e02e5b5 Fix checksum errors not being counted on repeated repair
64e0fe14f Restore FreeBSD resource usage accounting
11f2e9a49 Fix panic if scrubbing after removing a slog device
(cherry picked from commit ba27dd8be821792e15bdabfac69fd6cab0cf9dd3)
---
cddl/lib/libzpool/Makefile | 2 +-
stand/libsa/zfs/zstd_shim.c | 5 +
sys/contrib/openzfs/cmd/zfs/zfs_main.c | 3 -
sys/contrib/openzfs/cmd/ztest/ztest.c | 113 ++++++++-
.../openzfs/include/os/freebsd/spl/sys/uio.h | 43 +---
sys/contrib/openzfs/include/os/linux/spl/sys/uio.h | 22 +-
.../include/os/linux/zfs/sys/zfs_context_os.h | 1 -
sys/contrib/openzfs/include/sys/spa.h | 3 +-
sys/contrib/openzfs/include/sys/uio_impl.h | 21 +-
sys/contrib/openzfs/include/sys/zfs_context.h | 3 +-
sys/contrib/openzfs/lib/libzpool/util.c | 74 ++++--
.../lib/libzutil/os/linux/zutil_device_path_os.c | 252 ++++++++++++---------
.../openzfs/module/os/freebsd/spl/spl_uio.c | 9 +-
sys/contrib/openzfs/module/zfs/dsl_scan.c | 6 +-
sys/contrib/openzfs/module/zfs/spa_config.c | 2 +-
sys/contrib/openzfs/module/zfs/vdev.c | 5 +-
sys/contrib/openzfs/module/zfs/vdev_indirect.c | 10 +-
sys/contrib/openzfs/module/zfs/vdev_raidz.c | 20 +-
sys/contrib/openzfs/module/zfs/vdev_rebuild.c | 3 +
sys/contrib/openzfs/module/zfs/zfs_fm.c | 46 +++-
sys/contrib/openzfs/module/zfs/zfs_ioctl.c | 2 +-
sys/contrib/openzfs/module/zfs/zfs_vnops.c | 2 +-
sys/contrib/openzfs/module/zfs/zio.c | 11 +-
sys/contrib/openzfs/scripts/zfs.sh | 2 +-
sys/contrib/openzfs/tests/runfiles/common.run | 3 +-
.../functional/cli_root/zpool_events/Makefile.am | 3 +-
.../zpool_events/zpool_events_clear_retained.ksh | 135 +++++++++++
.../zpool_events/zpool_events_duplicates.ksh | 11 -
sys/modules/zfs/zfs_config.h | 2 +-
29 files changed, 569 insertions(+), 245 deletions(-)
diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile
index 819f67ceec5a..6893e31ff20a 100644
--- a/cddl/lib/libzpool/Makefile
+++ b/cddl/lib/libzpool/Makefile
@@ -160,9 +160,9 @@ KERNEL_C = \
zfs_debug.c \
zfs_fm.c \
zfs_fuid.c \
- zfs_racct.c \
zfs_sa.c \
zfs_znode.c \
+ zfs_racct.c \
zfs_ratelimit.c \
zfs_rlock.c \
zil.c \
diff --git a/stand/libsa/zfs/zstd_shim.c b/stand/libsa/zfs/zstd_shim.c
index b94df6f51913..91f5171a72b5 100644
--- a/stand/libsa/zfs/zstd_shim.c
+++ b/stand/libsa/zfs/zstd_shim.c
@@ -37,4 +37,9 @@ __FBSDID("$FreeBSD$");
#define ZFS_MODULE_PARAM_ARGS void
typedef int boolean_t; /* This one may be tough to get rid of */
+/* TODO: openzfs/include/sys/uio_impl.h must not be included */
+#ifndef _SYS_UIO_IMPL_H
+#define _SYS_UIO_IMPL_H
+#endif
+
#include <contrib/openzfs/module/zstd/zfs_zstd.c>
diff --git a/sys/contrib/openzfs/cmd/zfs/zfs_main.c b/sys/contrib/openzfs/cmd/zfs/zfs_main.c
index ab2b006ae460..9a59fddbf06d 100644
--- a/sys/contrib/openzfs/cmd/zfs/zfs_main.c
+++ b/sys/contrib/openzfs/cmd/zfs/zfs_main.c
@@ -6912,9 +6912,6 @@ report_mount_progress(int current, int total)
time_t now = time(NULL);
char info[32];
- /* report 1..n instead of 0..n-1 */
- ++current;
-
/* display header if we're here for the first time */
if (current == 1) {
set_progress_header(gettext("Mounting ZFS filesystems"));
diff --git a/sys/contrib/openzfs/cmd/ztest/ztest.c b/sys/contrib/openzfs/cmd/ztest/ztest.c
index d2bf0101993e..cfa1290d78d1 100644
--- a/sys/contrib/openzfs/cmd/ztest/ztest.c
+++ b/sys/contrib/openzfs/cmd/ztest/ztest.c
@@ -158,6 +158,9 @@ enum ztest_class_state {
ZTEST_VDEV_CLASS_RND
};
+#define ZO_GVARS_MAX_ARGLEN ((size_t)64)
+#define ZO_GVARS_MAX_COUNT ((size_t)10)
+
typedef struct ztest_shared_opts {
char zo_pool[ZFS_MAX_DATASET_NAME_LEN];
char zo_dir[ZFS_MAX_DATASET_NAME_LEN];
@@ -185,6 +188,8 @@ typedef struct ztest_shared_opts {
int zo_mmp_test;
int zo_special_vdevs;
int zo_dump_dbgmsg;
+ int zo_gvars_count;
+ char zo_gvars[ZO_GVARS_MAX_COUNT][ZO_GVARS_MAX_ARGLEN];
} ztest_shared_opts_t;
static const ztest_shared_opts_t ztest_opts_defaults = {
@@ -212,6 +217,7 @@ static const ztest_shared_opts_t ztest_opts_defaults = {
.zo_maxloops = 50, /* max loops during spa_freeze() */
.zo_metaslab_force_ganging = 64 << 10,
.zo_special_vdevs = ZTEST_VDEV_CLASS_RND,
+ .zo_gvars_count = 0,
};
extern uint64_t metaslab_force_ganging;
@@ -918,8 +924,21 @@ process_options(int argc, char **argv)
ztest_parse_name_value(optarg, zo);
break;
case 'o':
- if (set_global_var(optarg) != 0)
+ if (zo->zo_gvars_count >= ZO_GVARS_MAX_COUNT) {
+ (void) fprintf(stderr,
+ "max global var count (%zu) exceeded\n",
+ ZO_GVARS_MAX_COUNT);
+ usage(B_FALSE);
+ }
+ char *v = zo->zo_gvars[zo->zo_gvars_count];
+ if (strlcpy(v, optarg, ZO_GVARS_MAX_ARGLEN) >=
+ ZO_GVARS_MAX_ARGLEN) {
+ (void) fprintf(stderr,
+ "global var option '%s' is too long\n",
+ optarg);
usage(B_FALSE);
+ }
+ zo->zo_gvars_count++;
break;
case 'G':
zo->zo_dump_dbgmsg = 1;
@@ -6373,6 +6392,75 @@ ztest_fletcher_incr(ztest_ds_t *zd, uint64_t id)
}
}
+static int
+ztest_set_global_vars(void)
+{
+ for (size_t i = 0; i < ztest_opts.zo_gvars_count; i++) {
+ char *kv = ztest_opts.zo_gvars[i];
+ VERIFY3U(strlen(kv), <=, ZO_GVARS_MAX_ARGLEN);
+ VERIFY3U(strlen(kv), >, 0);
+ int err = set_global_var(kv);
+ if (ztest_opts.zo_verbose > 0) {
+ (void) printf("setting global var %s ... %s\n", kv,
+ err ? "failed" : "ok");
+ }
+ if (err != 0) {
+ (void) fprintf(stderr,
+ "failed to set global var '%s'\n", kv);
+ return (err);
+ }
+ }
+ return (0);
+}
+
+static char **
+ztest_global_vars_to_zdb_args(void)
+{
+ char **args = calloc(2*ztest_opts.zo_gvars_count + 1, sizeof (char *));
+ char **cur = args;
+ for (size_t i = 0; i < ztest_opts.zo_gvars_count; i++) {
+ char *kv = ztest_opts.zo_gvars[i];
+ *cur = "-o";
+ cur++;
+ *cur = strdup(kv);
+ cur++;
+ }
+ ASSERT3P(cur, ==, &args[2*ztest_opts.zo_gvars_count]);
+ *cur = NULL;
+ return (args);
+}
+
+/* The end of strings is indicated by a NULL element */
+static char *
+join_strings(char **strings, const char *sep)
+{
+ size_t totallen = 0;
+ for (char **sp = strings; *sp != NULL; sp++) {
+ totallen += strlen(*sp);
+ totallen += strlen(sep);
+ }
+ if (totallen > 0) {
+ ASSERT(totallen >= strlen(sep));
+ totallen -= strlen(sep);
+ }
+
+ size_t buflen = totallen + 1;
+ char *o = malloc(buflen); /* trailing 0 byte */
+ o[0] = '\0';
+ for (char **sp = strings; *sp != NULL; sp++) {
+ size_t would;
+ would = strlcat(o, *sp, buflen);
+ VERIFY3U(would, <, buflen);
+ if (*(sp+1) == NULL) {
+ break;
+ }
+ would = strlcat(o, sep, buflen);
+ VERIFY3U(would, <, buflen);
+ }
+ ASSERT3S(strlen(o), ==, totallen);
+ return (o);
+}
+
static int
ztest_check_path(char *path)
{
@@ -6601,13 +6689,21 @@ ztest_run_zdb(char *pool)
ztest_get_zdb_bin(bin, len);
- (void) sprintf(zdb,
- "%s -bcc%s%s -G -d -Y -e -y -p %s %s",
+ char **set_gvars_args = ztest_global_vars_to_zdb_args();
+ char *set_gvars_args_joined = join_strings(set_gvars_args, " ");
+ free(set_gvars_args);
+
+ size_t would = snprintf(zdb, len,
+ "%s -bcc%s%s -G -d -Y -e -y %s -p %s %s",
bin,
ztest_opts.zo_verbose >= 3 ? "s" : "",
ztest_opts.zo_verbose >= 4 ? "v" : "",
+ set_gvars_args_joined,
ztest_opts.zo_dir,
pool);
+ ASSERT3U(would, <, len);
+
+ free(set_gvars_args_joined);
if (ztest_opts.zo_verbose >= 5)
(void) printf("Executing %s\n", strstr(zdb, "zdb "));
@@ -7727,7 +7823,7 @@ main(int argc, char **argv)
char numbuf[NN_NUMBUF_SZ];
char *cmd;
boolean_t hasalt;
- int f;
+ int f, err;
char *fd_data_str = getenv("ZTEST_FD_DATA");
struct sigaction action;
@@ -7794,6 +7890,15 @@ main(int argc, char **argv)
}
ASSERT3U(ztest_opts.zo_datasets, ==, ztest_shared_hdr->zh_ds_count);
+ err = ztest_set_global_vars();
+ if (err != 0 && !fd_data_str) {
+ /* error message done by ztest_set_global_vars */
+ exit(EXIT_FAILURE);
+ } else {
+ /* children should not be spawned if setting gvars fails */
+ VERIFY3S(err, ==, 0);
+ }
+
/* Override location of zpool.cache */
VERIFY3S(asprintf((char **)&spa_config_path, "%s/zpool.cache",
ztest_opts.zo_dir), !=, -1);
diff --git a/sys/contrib/openzfs/include/os/freebsd/spl/sys/uio.h b/sys/contrib/openzfs/include/os/freebsd/spl/sys/uio.h
index f1d30195f048..b71f2f2e5625 100644
--- a/sys/contrib/openzfs/include/os/freebsd/spl/sys/uio.h
+++ b/sys/contrib/openzfs/include/os/freebsd/spl/sys/uio.h
@@ -55,38 +55,12 @@ typedef struct zfs_uio {
#define zfs_uio_fault_disable(u, set)
#define zfs_uio_prefaultpages(size, u) (0)
-
-static __inline void
-zfs_uio_init(zfs_uio_t *uio, struct uio *uio_s)
-{
- GET_UIO_STRUCT(uio) = uio_s;
-}
-
-static __inline void
+static inline void
zfs_uio_setoffset(zfs_uio_t *uio, offset_t off)
{
zfs_uio_offset(uio) = off;
}
-static __inline int
-zfs_uiomove(void *cp, size_t n, zfs_uio_rw_t dir, zfs_uio_t *uio)
-{
- ASSERT(zfs_uio_rw(uio) == dir);
- return (uiomove(cp, (int)n, GET_UIO_STRUCT(uio)));
-}
-
-int zfs_uiocopy(void *p, size_t n, zfs_uio_rw_t rw, zfs_uio_t *uio,
- size_t *cbytes);
-void zfs_uioskip(zfs_uio_t *uiop, size_t n);
-int zfs_uio_fault_move(void *p, size_t n, zfs_uio_rw_t dir, zfs_uio_t *uio);
-
-static inline void
-zfs_uio_iov_at_index(zfs_uio_t *uio, uint_t idx, void **base, uint64_t *len)
-{
- *base = zfs_uio_iovbase(uio, idx);
- *len = zfs_uio_iovlen(uio, idx);
-}
-
static inline void
zfs_uio_advance(zfs_uio_t *uio, size_t size)
{
@@ -94,19 +68,14 @@ zfs_uio_advance(zfs_uio_t *uio, size_t size)
zfs_uio_offset(uio) += size;
}
-static inline offset_t
-zfs_uio_index_at_offset(zfs_uio_t *uio, offset_t off, uint_t *vec_idx)
+static __inline void
+zfs_uio_init(zfs_uio_t *uio, struct uio *uio_s)
{
- *vec_idx = 0;
- while (*vec_idx < zfs_uio_iovcnt(uio) &&
- off >= zfs_uio_iovlen(uio, *vec_idx)) {
- off -= zfs_uio_iovlen(uio, *vec_idx);
- (*vec_idx)++;
- }
-
- return (off);
+ GET_UIO_STRUCT(uio) = uio_s;
}
+int zfs_uio_fault_move(void *p, size_t n, zfs_uio_rw_t dir, zfs_uio_t *uio);
+
#endif /* !_STANDALONE */
#endif /* !_OPENSOLARIS_SYS_UIO_H_ */
diff --git a/sys/contrib/openzfs/include/os/linux/spl/sys/uio.h b/sys/contrib/openzfs/include/os/linux/spl/sys/uio.h
index 0deed3c5736d..66af2b0b534c 100644
--- a/sys/contrib/openzfs/include/os/linux/spl/sys/uio.h
+++ b/sys/contrib/openzfs/include/os/linux/spl/sys/uio.h
@@ -78,19 +78,14 @@ typedef struct zfs_uio {
#define zfs_uio_rlimit_fsize(z, u) (0)
#define zfs_uio_fault_move(p, n, rw, u) zfs_uiomove((p), (n), (rw), (u))
+extern int zfs_uio_prefaultpages(ssize_t, zfs_uio_t *);
+
static inline void
zfs_uio_setoffset(zfs_uio_t *uio, offset_t off)
{
uio->uio_loffset = off;
}
-static inline void
-zfs_uio_iov_at_index(zfs_uio_t *uio, uint_t idx, void **base, uint64_t *len)
-{
- *base = zfs_uio_iovbase(uio, idx);
- *len = zfs_uio_iovlen(uio, idx);
-}
-
static inline void
zfs_uio_advance(zfs_uio_t *uio, size_t size)
{
@@ -98,19 +93,6 @@ zfs_uio_advance(zfs_uio_t *uio, size_t size)
uio->uio_loffset += size;
}
-static inline offset_t
-zfs_uio_index_at_offset(zfs_uio_t *uio, offset_t off, uint_t *vec_idx)
-{
- *vec_idx = 0;
- while (*vec_idx < zfs_uio_iovcnt(uio) &&
- off >= zfs_uio_iovlen(uio, *vec_idx)) {
- off -= zfs_uio_iovlen(uio, *vec_idx);
- (*vec_idx)++;
- }
-
- return (off);
-}
-
static inline void
zfs_uio_iovec_init(zfs_uio_t *uio, const struct iovec *iov,
unsigned long nr_segs, offset_t offset, zfs_uio_seg_t seg, ssize_t resid,
diff --git a/sys/contrib/openzfs/include/os/linux/zfs/sys/zfs_context_os.h b/sys/contrib/openzfs/include/os/linux/zfs/sys/zfs_context_os.h
index 9e5fdd79f019..de7015b929b6 100644
--- a/sys/contrib/openzfs/include/os/linux/zfs/sys/zfs_context_os.h
+++ b/sys/contrib/openzfs/include/os/linux/zfs/sys/zfs_context_os.h
@@ -23,7 +23,6 @@
#ifndef ZFS_CONTEXT_OS_H
#define ZFS_CONTEXT_OS_H
-#include <sys/uio_impl.h>
#include <linux/dcache_compat.h>
#include <linux/utsname_compat.h>
diff --git a/sys/contrib/openzfs/include/sys/spa.h b/sys/contrib/openzfs/include/sys/spa.h
index 0762ae8a3e13..8391be8328b6 100644
--- a/sys/contrib/openzfs/include/sys/spa.h
+++ b/sys/contrib/openzfs/include/sys/spa.h
@@ -20,7 +20,7 @@
*/
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2011, 2020 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2021 by Delphix. All rights reserved.
* Copyright 2011 Nexenta Systems, Inc. All rights reserved.
* Copyright (c) 2014 Spectra Logic Corporation, All rights reserved.
* Copyright 2013 Saso Kiselkov. All rights reserved.
@@ -1150,6 +1150,7 @@ extern int zfs_ereport_post(const char *clazz, spa_t *spa, vdev_t *vd,
extern boolean_t zfs_ereport_is_valid(const char *clazz, spa_t *spa, vdev_t *vd,
zio_t *zio);
extern void zfs_ereport_taskq_fini(void);
+extern void zfs_ereport_clear(spa_t *spa, vdev_t *vd);
extern nvlist_t *zfs_event_create(spa_t *spa, vdev_t *vd, const char *type,
const char *name, nvlist_t *aux);
extern void zfs_post_remove(spa_t *spa, vdev_t *vd);
diff --git a/sys/contrib/openzfs/include/sys/uio_impl.h b/sys/contrib/openzfs/include/sys/uio_impl.h
index be70cea54818..cde3ef40485b 100644
--- a/sys/contrib/openzfs/include/sys/uio_impl.h
+++ b/sys/contrib/openzfs/include/sys/uio_impl.h
@@ -42,8 +42,27 @@
#include <sys/uio.h>
extern int zfs_uiomove(void *, size_t, zfs_uio_rw_t, zfs_uio_t *);
-extern int zfs_uio_prefaultpages(ssize_t, zfs_uio_t *);
extern int zfs_uiocopy(void *, size_t, zfs_uio_rw_t, zfs_uio_t *, size_t *);
extern void zfs_uioskip(zfs_uio_t *, size_t);
+static inline void
+zfs_uio_iov_at_index(zfs_uio_t *uio, uint_t idx, void **base, uint64_t *len)
+{
+ *base = zfs_uio_iovbase(uio, idx);
+ *len = zfs_uio_iovlen(uio, idx);
+}
+
+static inline offset_t
+zfs_uio_index_at_offset(zfs_uio_t *uio, offset_t off, uint_t *vec_idx)
+{
+ *vec_idx = 0;
+ while (*vec_idx < zfs_uio_iovcnt(uio) &&
+ off >= zfs_uio_iovlen(uio, *vec_idx)) {
+ off -= zfs_uio_iovlen(uio, *vec_idx);
+ (*vec_idx)++;
+ }
+
+ return (off);
+}
+
#endif /* _SYS_UIO_IMPL_H */
diff --git a/sys/contrib/openzfs/include/sys/zfs_context.h b/sys/contrib/openzfs/include/sys/zfs_context.h
index ee3216d6763a..6cdcc6d30966 100644
--- a/sys/contrib/openzfs/include/sys/zfs_context.h
+++ b/sys/contrib/openzfs/include/sys/zfs_context.h
@@ -72,6 +72,7 @@ extern "C" {
#include <sys/trace.h>
#include <sys/procfs_list.h>
#include <sys/mod.h>
+#include <sys/uio_impl.h>
#include <sys/zfs_context_os.h>
#else /* _KERNEL || _STANDALONE */
@@ -652,7 +653,7 @@ extern void random_fini(void);
struct spa;
extern void show_pool_stats(struct spa *);
-extern int set_global_var(char *arg);
+extern int set_global_var(char const *arg);
typedef struct callb_cpr {
kmutex_t *cc_lockp;
diff --git a/sys/contrib/openzfs/lib/libzpool/util.c b/sys/contrib/openzfs/lib/libzpool/util.c
index ebfaa9b41a2a..2da2375a1d2d 100644
--- a/sys/contrib/openzfs/lib/libzpool/util.c
+++ b/sys/contrib/openzfs/lib/libzpool/util.c
@@ -148,18 +148,54 @@ show_pool_stats(spa_t *spa)
nvlist_free(config);
}
+/* *k_out must be freed by the caller */
+static int
+set_global_var_parse_kv(const char *arg, char **k_out, u_longlong_t *v_out)
+{
+ 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;
+ }
+
+ *k_out = k;
+ *v_out = val;
+ return (0);
+
+err_free:
+ free(k);
+
+ return (err);
+}
+
/*
* Sets given global variable in libzpool to given unsigned 32-bit value.
* arg: "<variable>=<value>"
*/
int
-set_global_var(char *arg)
+set_global_var(char const *arg)
{
void *zpoolhdl;
- char *varname = arg, *varval;
+ char *varname;
u_longlong_t val;
+ int ret;
-#ifndef _LITTLE_ENDIAN
+#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
@@ -167,19 +203,12 @@ set_global_var(char *arg)
*/
fprintf(stderr, "Setting global variables is only supported on "
"little-endian systems\n");
- return (ENOTSUP);
+ ret = ENOTSUP;
+ goto out_ret;
#endif
- if (arg != NULL && (varval = strchr(arg, '=')) != NULL) {
- *varval = '\0';
- varval++;
- val = strtoull(varval, NULL, 0);
- if (val > UINT32_MAX) {
- fprintf(stderr, "Value for global variable '%s' must "
- "be a 32-bit unsigned integer\n", varname);
- return (EOVERFLOW);
- }
- } else {
- return (EINVAL);
+
+ if ((ret = set_global_var_parse_kv(arg, &varname, &val)) != 0) {
+ goto out_ret;
}
zpoolhdl = dlopen("libzpool.so", RTLD_LAZY);
@@ -189,18 +218,25 @@ set_global_var(char *arg)
if (var == NULL) {
fprintf(stderr, "Global variable '%s' does not exist "
"in libzpool.so\n", varname);
- return (EINVAL);
+ ret = EINVAL;
+ goto out_dlclose;
}
*var = (uint32_t)val;
- dlclose(zpoolhdl);
} else {
fprintf(stderr, "Failed to open libzpool.so to set global "
"variable\n");
- return (EIO);
+ ret = EIO;
+ goto out_dlclose;
}
- return (0);
+ ret = 0;
+
+out_dlclose:
+ dlclose(zpoolhdl);
+ free(varname);
+out_ret:
+ return (ret);
}
static nvlist_t *
diff --git a/sys/contrib/openzfs/lib/libzutil/os/linux/zutil_device_path_os.c b/sys/contrib/openzfs/lib/libzutil/os/linux/zutil_device_path_os.c
index 36331fd72bf7..1f767bb7a6e7 100644
--- a/sys/contrib/openzfs/lib/libzutil/os/linux/zutil_device_path_os.c
+++ b/sys/contrib/openzfs/lib/libzutil/os/linux/zutil_device_path_os.c
@@ -154,15 +154,124 @@ zfs_strip_path(char *path)
return (strrchr(path, '/') + 1);
}
+/*
+ * Given a dev name like "sda", return the full enclosure sysfs path to
+ * the disk. You can also pass in the name with "/dev" prepended
+ * to it (like /dev/sda).
+ *
+ * For example, disk "sda" in enclosure slot 1:
+ * dev: "sda"
+ * returns: "/sys/class/enclosure/1:0:3:0/Slot 1"
+ *
+ * 'dev' must be a non-devicemapper device.
+ *
+ * Returned string must be freed.
+ */
+char *
+zfs_get_enclosure_sysfs_path(const char *dev_name)
+{
+ DIR *dp = NULL;
+ struct dirent *ep;
+ char buf[MAXPATHLEN];
+ char *tmp1 = NULL;
+ char *tmp2 = NULL;
+ char *tmp3 = NULL;
+ char *path = NULL;
+ size_t size;
+ int tmpsize;
+
+ if (dev_name == NULL)
+ return (NULL);
+
+ /* If they preface 'dev' with a path (like "/dev") then strip it off */
+ tmp1 = strrchr(dev_name, '/');
+ if (tmp1 != NULL)
+ dev_name = tmp1 + 1; /* +1 since we want the chr after '/' */
+
+ tmpsize = asprintf(&tmp1, "/sys/block/%s/device", dev_name);
+ if (tmpsize == -1 || tmp1 == NULL) {
+ tmp1 = NULL;
+ goto end;
+ }
+
+ dp = opendir(tmp1);
+ if (dp == NULL) {
+ tmp1 = NULL; /* To make free() at the end a NOP */
+ goto end;
+ }
+
+ /*
+ * Look though all sysfs entries in /sys/block/<dev>/device for
+ * the enclosure symlink.
+ */
+ while ((ep = readdir(dp))) {
+ /* Ignore everything that's not our enclosure_device link */
+ if (strstr(ep->d_name, "enclosure_device") == NULL)
+ continue;
+
+ if (asprintf(&tmp2, "%s/%s", tmp1, ep->d_name) == -1 ||
+ tmp2 == NULL)
+ break;
+
+ size = readlink(tmp2, buf, sizeof (buf));
+
+ /* Did readlink fail or crop the link name? */
+ if (size == -1 || size >= sizeof (buf)) {
+ free(tmp2);
+ tmp2 = NULL; /* To make free() at the end a NOP */
+ break;
+ }
+
+ /*
+ * We got a valid link. readlink() doesn't terminate strings
+ * so we have to do it.
+ */
+ buf[size] = '\0';
+
+ /*
+ * Our link will look like:
+ *
+ * "../../../../port-11:1:2/..STUFF../enclosure/1:0:3:0/SLOT 1"
+ *
+ * We want to grab the "enclosure/1:0:3:0/SLOT 1" part
+ */
+ tmp3 = strstr(buf, "enclosure");
+ if (tmp3 == NULL)
+ break;
+
+ if (asprintf(&path, "/sys/class/%s", tmp3) == -1) {
+ /* If asprintf() fails, 'path' is undefined */
+ path = NULL;
+ break;
+ }
+
+ if (path == NULL)
+ break;
+ }
+
+end:
+ free(tmp2);
+ free(tmp1);
+
+ if (dp != NULL)
+ closedir(dp);
+
+ return (path);
+}
+
/*
* Allocate and return the underlying device name for a device mapper device.
- * If a device mapper device maps to multiple devices, return the first device.
*
* For example, dm_name = "/dev/dm-0" could return "/dev/sda". Symlinks to a
* DM device (like /dev/disk/by-vdev/A0) are also allowed.
*
- * Returns device name, or NULL on error or no match. If dm_name is not a DM
- * device then return NULL.
+ * If the DM device has multiple underlying devices (like with multipath
+ * DM devices), then favor underlying devices that have a symlink back to their
+ * back to their enclosure device in sysfs. This will be useful for the
+ * zedlet scripts that toggle the fault LED.
+ *
+ * Returns an underlying device name, or NULL on error or no match. If dm_name
+ * is not a DM device then return NULL.
*
* NOTE: The returned name string must be *freed*.
*/
@@ -176,6 +285,8 @@ dm_get_underlying_path(const char *dm_name)
char *path = NULL;
char *dev_str;
int size;
+ char *first_path = NULL;
+ char *enclosure_path;
if (dm_name == NULL)
return (NULL);
@@ -204,13 +315,27 @@ dm_get_underlying_path(const char *dm_name)
goto end;
/*
- * Return first entry (that isn't itself a directory) in the
- * directory containing device-mapper dependent (underlying)
- * devices.
+ * A device-mapper device can have multiple paths to it (multipath).
+ * Favor paths that have a symlink back to their enclosure device.
+ * We have to do this since some enclosures may only provide a symlink
+ * back for one underlying path to a disk and not the other.
+ *
+ * If no paths have links back to their enclosure, then just return the
+ * first path.
*/
while ((ep = readdir(dp))) {
if (ep->d_type != DT_DIR) { /* skip "." and ".." dirs */
+ if (!first_path)
+ first_path = strdup(ep->d_name);
+
+ enclosure_path =
+ zfs_get_enclosure_sysfs_path(ep->d_name);
+
+ if (!enclosure_path)
+ continue;
+
size = asprintf(&path, "/dev/%s", ep->d_name);
+ free(enclosure_path);
break;
}
}
@@ -220,6 +345,17 @@ end:
closedir(dp);
free(tmp);
free(realp);
+
+ if (!path) {
+ /*
+ * None of the underlying paths had a link back to their
+ * enclosure devices. Throw up out hands and return the first
+ * underlying path.
+ */
+ size = asprintf(&path, "/dev/%s", first_path);
+ }
+
+ free(first_path);
return (path);
}
@@ -331,110 +467,6 @@ zfs_get_underlying_path(const char *dev_name)
return (name);
}
-/*
- * Given a dev name like "sda", return the full enclosure sysfs path to
- * the disk. You can also pass in the name with "/dev" prepended
- * to it (like /dev/sda).
- *
- * For example, disk "sda" in enclosure slot 1:
- * dev: "sda"
- * returns: "/sys/class/enclosure/1:0:3:0/Slot 1"
- *
- * 'dev' must be a non-devicemapper device.
- *
- * Returned string must be freed.
- */
-char *
-zfs_get_enclosure_sysfs_path(const char *dev_name)
-{
- DIR *dp = NULL;
- struct dirent *ep;
- char buf[MAXPATHLEN];
- char *tmp1 = NULL;
- char *tmp2 = NULL;
- char *tmp3 = NULL;
- char *path = NULL;
- size_t size;
- int tmpsize;
-
- if (dev_name == NULL)
- return (NULL);
-
- /* If they preface 'dev' with a path (like "/dev") then strip it off */
- tmp1 = strrchr(dev_name, '/');
- if (tmp1 != NULL)
- dev_name = tmp1 + 1; /* +1 since we want the chr after '/' */
-
- tmpsize = asprintf(&tmp1, "/sys/block/%s/device", dev_name);
- if (tmpsize == -1 || tmp1 == NULL) {
- tmp1 = NULL;
- goto end;
- }
-
- dp = opendir(tmp1);
- if (dp == NULL) {
- tmp1 = NULL; /* To make free() at the end a NOP */
- goto end;
- }
-
- /*
- * Look though all sysfs entries in /sys/block/<dev>/device for
- * the enclosure symlink.
- */
- while ((ep = readdir(dp))) {
- /* Ignore everything that's not our enclosure_device link */
- if (strstr(ep->d_name, "enclosure_device") == NULL)
- continue;
-
- if (asprintf(&tmp2, "%s/%s", tmp1, ep->d_name) == -1 ||
- tmp2 == NULL)
- break;
-
- size = readlink(tmp2, buf, sizeof (buf));
-
- /* Did readlink fail or crop the link name? */
- if (size == -1 || size >= sizeof (buf)) {
- free(tmp2);
- tmp2 = NULL; /* To make free() at the end a NOP */
- break;
- }
-
- /*
- * We got a valid link. readlink() doesn't terminate strings
- * so we have to do it.
- */
- buf[size] = '\0';
-
- /*
- * Our link will look like:
- *
- * "../../../../port-11:1:2/..STUFF../enclosure/1:0:3:0/SLOT 1"
- *
- * We want to grab the "enclosure/1:0:3:0/SLOT 1" part
- */
- tmp3 = strstr(buf, "enclosure");
- if (tmp3 == NULL)
- break;
-
- if (asprintf(&path, "/sys/class/%s", tmp3) == -1) {
- /* If asprintf() fails, 'path' is undefined */
- path = NULL;
- break;
- }
-
- if (path == NULL)
- break;
- }
-
-end:
- free(tmp2);
- free(tmp1);
-
- if (dp != NULL)
- closedir(dp);
-
- return (path);
-}
#ifdef HAVE_LIBUDEV
diff --git a/sys/contrib/openzfs/module/os/freebsd/spl/spl_uio.c b/sys/contrib/openzfs/module/os/freebsd/spl/spl_uio.c
index f5f3524f7b9d..59a781ee1b64 100644
--- a/sys/contrib/openzfs/module/os/freebsd/spl/spl_uio.c
+++ b/sys/contrib/openzfs/module/os/freebsd/spl/spl_uio.c
@@ -41,10 +41,17 @@
*/
#include <sys/param.h>
-#include <sys/uio.h>
+#include <sys/uio_impl.h>
#include <sys/vnode.h>
#include <sys/zfs_znode.h>
+int
+zfs_uiomove(void *cp, size_t n, zfs_uio_rw_t dir, zfs_uio_t *uio)
+{
+ ASSERT(zfs_uio_rw(uio) == dir);
+ return (uiomove(cp, (int)n, GET_UIO_STRUCT(uio)));
+}
+
/*
* same as zfs_uiomove() but doesn't modify uio structure.
* return in cbytes how many bytes were copied.
diff --git a/sys/contrib/openzfs/module/zfs/dsl_scan.c b/sys/contrib/openzfs/module/zfs/dsl_scan.c
index 40adfbcee4e1..a54cd6ca800e 100644
--- a/sys/contrib/openzfs/module/zfs/dsl_scan.c
+++ b/sys/contrib/openzfs/module/zfs/dsl_scan.c
@@ -20,7 +20,7 @@
*/
/*
* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2011, 2018 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2021 by Delphix. All rights reserved.
* Copyright 2016 Gary Mills
* Copyright (c) 2017, 2019, Datto Inc. All rights reserved.
* Copyright (c) 2015, Nexenta Systems, Inc. All rights reserved.
@@ -987,6 +987,10 @@ dsl_scan_done(dsl_scan_t *scn, boolean_t complete, dmu_tx_t *tx)
(u_longlong_t)spa_get_errlog_size(spa));
spa_async_request(spa, SPA_ASYNC_RESILVER);
}
+
+ /* Clear recent error events (i.e. duplicate events tracking) */
+ if (complete)
+ zfs_ereport_clear(spa, NULL);
}
scn->scn_phys.scn_end_time = gethrestime_sec();
diff --git a/sys/contrib/openzfs/module/zfs/spa_config.c b/sys/contrib/openzfs/module/zfs/spa_config.c
index 4a3144313267..ad82932ce567 100644
--- a/sys/contrib/openzfs/module/zfs/spa_config.c
+++ b/sys/contrib/openzfs/module/zfs/spa_config.c
@@ -32,7 +32,6 @@
#include <sys/fm/fs/zfs.h>
#include <sys/spa_impl.h>
#include <sys/nvpair.h>
-#include <sys/uio.h>
#include <sys/fs/zfs.h>
#include <sys/vdev_impl.h>
#include <sys/zfs_ioctl.h>
@@ -40,6 +39,7 @@
#include <sys/sunddi.h>
#include <sys/zfeature.h>
#include <sys/zfs_file.h>
+#include <sys/zfs_context.h>
#ifdef _KERNEL
#include <sys/zone.h>
#endif
diff --git a/sys/contrib/openzfs/module/zfs/vdev.c b/sys/contrib/openzfs/module/zfs/vdev.c
index 553e470ad461..ad4f3efb87b1 100644
--- a/sys/contrib/openzfs/module/zfs/vdev.c
+++ b/sys/contrib/openzfs/module/zfs/vdev.c
@@ -21,7 +21,7 @@
/*
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2011, 2020 by Delphix. All rights reserved.
+ * Copyright (c) 2011, 2021 by Delphix. All rights reserved.
* Copyright 2017 Nexenta Systems, Inc.
* Copyright (c) 2014 Integros [integros.com]
* Copyright 2016 Toomas Soome <tsoome at me.com>
@@ -4170,6 +4170,9 @@ vdev_clear(spa_t *spa, vdev_t *vd)
vd->vdev_parent->vdev_ops == &vdev_spare_ops &&
vd->vdev_parent->vdev_child[0] == vd)
vd->vdev_unspare = B_TRUE;
+
+ /* Clear recent error events cache (i.e. duplicate events tracking) */
+ zfs_ereport_clear(spa, vd);
}
boolean_t
diff --git a/sys/contrib/openzfs/module/zfs/vdev_indirect.c b/sys/contrib/openzfs/module/zfs/vdev_indirect.c
index b26d0993711a..416f4c54d8e8 100644
--- a/sys/contrib/openzfs/module/zfs/vdev_indirect.c
*** 418 LINES SKIPPED ***
More information about the dev-commits-src-all
mailing list