Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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

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: 892586e8a1
Porting Notes:
This code was originally from Illumos, but I actually ported it from:
openzfsonosx/zfs@b62a652
This commit is contained in:
ilovezfs 2016-01-28 04:51:19 -08:00 committed by Tony Hutter
parent 4a2e9a17d5
commit 125a406e24
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
man/man5/zpool-features.5
View File

@ -464,7 +464,7 @@ improving performance by avoiding the use of spill blocks.
l l . l l .
GUID org.illumos:sha512 GUID org.illumos:sha512
READ\-ONLY COMPATIBLE no READ\-ONLY COMPATIBLE no
DEPENDENCIES none DEPENDENCIES extensible_dataset
.TE .TE
This feature enables the use of the SHA-512/256 truncated hash algorithm 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 . l l .
GUID org.illumos:skein GUID org.illumos:skein
READ\-ONLY COMPATIBLE no READ\-ONLY COMPATIBLE no
DEPENDENCIES none DEPENDENCIES extensible_dataset
.TE .TE
This feature enables the use of the Skein hash algorithm for checksum This feature enables the use of the Skein hash algorithm for checksum
@ -533,7 +533,7 @@ error.
l l . l l .
GUID org.illumos:edonr GUID org.illumos:edonr
READ\-ONLY COMPATIBLE no READ\-ONLY COMPATIBLE no
DEPENDENCIES none DEPENDENCIES extensible_dataset
.TE .TE
This feature enables the use of the Edon-R hash algorithm for checksum, This feature enables the use of the Edon-R hash algorithm for checksum,

26
module/zfs/zfeature_common.c
View File

@ -253,16 +253,36 @@ zpool_feature_init(void)
"Variable on-disk size of dnodes.", "Variable on-disk size of dnodes.",
ZFEATURE_FLAG_PER_DATASET, large_dnode_deps); 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, zfeature_register(SPA_FEATURE_SHA512,
"org.illumos:sha512", "sha512", "org.illumos:sha512", "sha512",
"SHA-512/256 hash algorithm.", "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, zfeature_register(SPA_FEATURE_SKEIN,
"org.illumos:skein", "skein", "org.illumos:skein", "skein",
"Skein hash algorithm.", "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, zfeature_register(SPA_FEATURE_EDONR,
"org.illumos:edonr", "edonr", "org.illumos:edonr", "edonr",
"Edon-R hash algorithm.", "Edon-R hash algorithm.",
ZFEATURE_FLAG_PER_DATASET, NULL); ZFEATURE_FLAG_PER_DATASET, edonr_deps);
}
} }