aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndriy Gapon <avg@FreeBSD.org>2019-08-12 11:42:16 +0000
committerAndriy Gapon <avg@FreeBSD.org>2019-08-12 11:42:16 +0000
commit4139761bb5002f4055cb4a774214e3566069a991 (patch)
tree3ad7f131f3d47214786e0aefef3dd35a8e240fbf
parent9236a881f68afe669de6d91d2a984511c97af754 (diff)
parentfeaa27590c679fea301c2c0f391cfa4b6f62e8fa (diff)
downloadsrc-4139761bb5002f4055cb4a774214e3566069a991.tar.gz
src-4139761bb5002f4055cb4a774214e3566069a991.zip
MFV r350896: 6585 sha512, skein, and edonr have an unenforced dependency on extensible dataset
illumos/illumos-gate@892586e8a147c02d7f4053cc405229a13e796928 https://github.com/illumos/illumos-gate/commit/892586e8a147c02d7f4053cc405229a13e796928 https://www.illumos.org/issues/6585 In any pool without the extensible dataset feature flag already enabled, creating a dataset with dedup set to use one of the new checksums would result in the following panic as soon as any data was added: panic[cpu0]/thread=ffffff0006761c40: feature_get_refcount(spa, feature, &refcount) != 48 (0x30 != 0x30), file: ../../common/fs/zfs/zfeature.c line 390 ffffff0006761830 fffffffffba8fbdd () ffffff0006761890 zfs:feature_do_action+11a () ffffff00067618c0 zfs:spa_feature_incr+1e () ffffff0006761920 zfs:dmu_object_zapify+b7 () ffffff00067619b0 zfs:dsl_dataset_activate_feature+97 () ffffff0006761a20 zfs:dsl_dataset_sync+ba () ffffff0006761ab0 zfs:dsl_pool_sync+153 () ffffff0006761b70 zfs:spa_sync+26e () ffffff0006761c20 zfs:txg_sync_thread+227 () ffffff0006761c30 unix:thread_start+8 () Inspection showed that feature->fi_feature was 7, which is the value of SPA_FEATURE_EXTENSIBLE_DATASET in the spa_feature enum. Testing shows that the panic can be prevented by explicitly setting extensible dataset as a dependency for the sha512, edonr, and skein feature flags. Alternatively, the new checksums code could possibly be changed to obviate the need for the dependency. Reviewed by: Matthew Ahrens <mahrens@delphix.com> Reviewed by: Richard Laager <rlaager@wiktel.com> Approved by: Robert Mustacchi <rm@joyent.com> Author: ilovezfs <ilovezfs@icloud.com> Note that FreeBSD does not support ednor yet. MFC after: 2 weeks
Notes
Notes: svn path=/head/; revision=350897
-rw-r--r--cddl/contrib/opensolaris/cmd/zpool/zpool-features.74
-rw-r--r--sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c19
2 files changed, 18 insertions, 5 deletions
diff --git a/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 b/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
index 4e6b63514456..9e0086075896 100644
--- a/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
+++ b/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
@@ -531,7 +531,7 @@ boot loader.
.Bl -column "READ\-ONLY COMPATIBLE" "org.illumos:sha512"
.It GUID Ta org.illumos:sha512
.It READ\-ONLY COMPATIBLE Ta no
-.It DEPENDENCIES Ta none
+.It DEPENDENCIES Ta extensible_dataset
.El
.Pp
The
@@ -570,7 +570,7 @@ are destroyed.
.Bl -column "READ\-ONLY COMPATIBLE" "org.illumos:skein"
.It GUID Ta org.illumos:skein
.It READ\-ONLY COMPATIBLE Ta no
-.It DEPENDENCIES Ta none
+.It DEPENDENCIES Ta extensible_dataset
.El
.Pp
The
diff --git a/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c b/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c
index fe1375fa2222..476f571e6649 100644
--- a/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c
+++ b/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c
@@ -255,20 +255,33 @@ zpool_feature_init(void)
ZFEATURE_FLAG_PER_DATASET, large_dnode_deps);
}
+ static const spa_feature_t sha512_deps[] = {
+ SPA_FEATURE_EXTENSIBLE_DATASET,
+ SPA_FEATURE_NONE
+ };
zfeature_register(SPA_FEATURE_SHA512,
"org.illumos:sha512", "sha512",
"SHA-512/256 hash algorithm.",
- ZFEATURE_FLAG_PER_DATASET, NULL);
+ ZFEATURE_FLAG_PER_DATASET, sha512_deps);
+
+ static const spa_feature_t skein_deps[] = {
+ SPA_FEATURE_EXTENSIBLE_DATASET,
+ SPA_FEATURE_NONE
+ };
zfeature_register(SPA_FEATURE_SKEIN,
"org.illumos:skein", "skein",
"Skein hash algorithm.",
- ZFEATURE_FLAG_PER_DATASET, NULL);
+ ZFEATURE_FLAG_PER_DATASET, skein_deps);
#ifdef illumos
+ static const spa_feature_t edonr_deps[] = {
+ SPA_FEATURE_EXTENSIBLE_DATASET,
+ SPA_FEATURE_NONE
+ };
zfeature_register(SPA_FEATURE_EDONR,
"org.illumos:edonr", "edonr",
"Edon-R hash algorithm.",
- ZFEATURE_FLAG_PER_DATASET, NULL);
+ ZFEATURE_FLAG_PER_DATASET, edonr_deps);
#endif
zfeature_register(SPA_FEATURE_DEVICE_REMOVAL,