OpenZFS 6585 - sha512, skein, and edonr have an unenforced dependency on extensible...

Authored by: ilovezfs <ilovezfs@icloud.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Richard Laager <rlaager@wiktel.com>
Approved by: Robert Mustacchi <rm@joyent.com>
Ported by: Tony Hutter <hutter2@llnl.gov>

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

Inpsection showed that feature->fi_feature was 7, which is the value of
SPA_FEATURE_EXTENSIBLE_DATASET in the spa_feature enum.  This commit
adds extensible dataset as a dependency for the sha512, edonr, and skein
feature flags, which prevents the panic.

OpenZFS-issue: https://www.illumos.org/issues/6585
OpenZFS-commit: https://github.com/illumos/illumos-gate/commit/892586e8a147c02d7f4053cc405229a13e796928
Porting Notes:
This code was originally from Illumos, but I actually ported it from:
openzfsonosx/zfs@b62a652

diff --git a/man/man5/zpool-features.5 b/man/man5/zpool-features.5
index dcfb30d1874360187b0c0b28fe5af943178a4454..ffefd4129654f30f7215992d9145c02eef9412be 100644 (file)
--- a/man/man5/zpool-features.5
+++ b/man/man5/zpool-features.5
@@ -464,7 +464,7 @@ improving performance by avoiding the use of spill blocks.
 l l .
 GUID   org.illumos:sha512
 READ\-ONLY COMPATIBLE  no
-DEPENDENCIES   none
+DEPENDENCIES   extensible_dataset
 .TE
 
 This feature enables the use of the SHA-512/256 truncated hash algorithm
@@ -497,7 +497,7 @@ the updated GRUB stage2 module is installed).
 l l .
 GUID   org.illumos:skein
 READ\-ONLY COMPATIBLE  no
-DEPENDENCIES   none
+DEPENDENCIES   extensible_dataset
 .TE
 
 This feature enables the use of the Skein hash algorithm for checksum
@@ -533,7 +533,7 @@ error.
 l l .
 GUID   org.illumos:edonr
 READ\-ONLY COMPATIBLE  no
-DEPENDENCIES   none
+DEPENDENCIES   extensible_dataset
 .TE
 
 This feature enables the use of the Edon-R hash algorithm for checksum,

diff --git a/module/zfs/zfeature_common.c b/module/zfs/zfeature_common.c
index e8b0a16aed86f83306d88d3b1517d853d8701031..9beb4903e5bd119c71e4c3eebe34d9fa9c58c6d7 100644 (file)
--- a/module/zfs/zfeature_common.c
+++ b/module/zfs/zfeature_common.c
@@ -253,16 +253,36 @@ zpool_feature_init(void)
            "Variable on-disk size of dnodes.",
            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);
+       }
+
+       {
+       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);
+       }
 }