zfs: Support zstd compression
PATCH 1/2 zfs: Support zstd compression
Signed-off-by Vladimir Serbinenko <[email protected]>
--- grub-core/Makefile.core.def | 1 + grub-core/fs/zfs/zfs.c | 35 +++++++++++++++++++++++++++++++++++ include/grub/zfs/zio.h | 1 + 3 files changed, 37 insertions(+)
grub-core/Makefile.core.def +1 -0
@@ -1601,6 +1601,7 @@ module = { common = fs/zfs/zfs_lz4.c; common = fs/zfs/zfs_sha256.c; common = fs/zfs/zfs_fletcher.c; + cppflags = '-I$(srcdir)/lib/posix_wrap -I$(srcdir)/lib/zstd'; }; module = {
grub-core/fs/zfs/zfs.c +35 -0
@@ -57,6 +57,8 @@#include <grub/i18n.h> #include <grub/safemath.h> +#include <zstd.h> +GRUB_MOD_LICENSE ("GPLv3+" );#define ZPOOL_PROP_BOOTFS "bootfs"
@@ -293,6 +295,7 @@ static const char *spa_feature_names[] = {"org.open-zfs:large_blocks" ,"com.klarasystems:vdev_zaps_v2" ,"com.delphix:head_errlog" , +"org.freebsd:zstd_compress" , NULL };
@@ -314,6 +317,37 @@ zlib_decompress (void *s, void *d,return grub_errno; } +static grub_err_t +zstd_decompress (void *ibuf,void *obuf,grub_size_t isize, +grub_size_t osize) +{ +grub_size_t zstd_ret; +grub_uint8_t *byte_buf = (grub_uint8_t *) ibuf; + +if (isize <8 ) +return grub_error (GRUB_ERR_BAD_COMPRESSED_DATA ,"zstd data too short" ); + +grub_uint32_t c_len =grub_be_to_cpu32 (grub_get_unaligned32 (byte_buf)); + +if (c_len > isize -8 ) +return grub_error (GRUB_ERR_BAD_COMPRESSED_DATA , +"zstd data announced size overflow" ); + +/* ZFS uses non-stadard magic for zstd streams. Rather than adjusting +library functions, replace non-standard magic with standard onw. */ + byte_buf[4 ] =0x28 ; + byte_buf[5 ] =0xb5 ; + byte_buf[6 ] =0x2f ; + byte_buf[7 ] =0xfd ; + zstd_ret =ZSTD_decompress (obuf, osize, byte_buf +4 , c_len +4 ); + +if (ZSTD_isError (zstd_ret)) +return grub_error (GRUB_ERR_BAD_COMPRESSED_DATA , +"zstd data corrupted (error %d)" , (int ) zstd_ret); + +return GRUB_ERR_NONE ; +} +static grub_err_t zle_decompress (void *s,void *d,grub_size_t slen,grub_size_t dlen)
@@ -364,6 +398,7 @@ static decomp_entry_t decomp_table[ZIO_COMPRESS_FUNCTIONS] = { {"gzip-9", zlib_decompress}, /* ZIO_COMPRESS_GZIP9 */ {"zle", zle_decompress}, /* ZIO_COMPRESS_ZLE */ {"lz4", lz4_decompress}, /* ZIO_COMPRESS_LZ4 */ + {"zstd", zstd_decompress}, /* ZIO_COMPRESS_ZSTD */ }; static grub_err_t zio_read_data (blkptr_t * bp, grub_zfs_endian_t endian,
include/grub/zfs/zio.h +1 -0
@@ -89,6 +89,7 @@ enum zio_compress {ZIO_COMPRESS_GZIP9 ,ZIO_COMPRESS_ZLE ,ZIO_COMPRESS_LZ4 , +ZIO_COMPRESS_ZSTD , ZIO_COMPRESS_FUNCTIONS };
Signature · 7 lines
2.39.2 _______________________________________________ Grub-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/grub-devel
PATCH 2/2 zfs: Add test for zfs zstd
Signed-off-by Vladimir Serbinenko <[email protected]>
--- tests/util/grub-fs-tester.in | 2 +- tests/zfs_test.in | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
tests/util/grub-fs-tester.in +1 -1
@@ -779,7 +779,7 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do sleep 1 "zfs" create -o casesensitivity=insensitive "$FSLABEL"/"grub fs" sleep 1;; - x"zfs_lzjb" | xzfs_gzip | xzfs_zle) + x"zfs_lzjb" | xzfs_gzip | xzfs_zle | xzfs_zstd) "zpool" create -O compression=${fs/zfs_/} -R "$MNTPOINTRW" "$FSLABEL" "${MOUNTDEVICE}" sleep 1 "zfs" create -o compression=${fs/zfs_/} "$FSLABEL"/"grub fs"
tests/zfs_test.in +1 -0
@@ -19,6 +19,7 @@ fi "@builddir@/grub-fs-tester" zfs_lzjb "@builddir@/grub-fs-tester" zfs_gzip "@builddir@/grub-fs-tester" zfs_zle +"@builddir@/grub-fs-tester" zfs_zstd "@builddir@/grub-fs-tester" zfs_raidz3 "@builddir@/grub-fs-tester" zfs_raidz2 "@builddir@/grub-fs-tester" zfs_raidz
Signature · 7 lines
2.39.2 _______________________________________________ Grub-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/grub-devel
Quoted 1 line · Vladimir Serbinenko
Signed-off-by Vladimir Serbinenko <[email protected]>
Reviewed-by Daniel Kiper <[email protected]>
Daniel
_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel
Re: [PATCH 2/2] zfs: Add test for zfs zstd
In reply to Vladimir SerbinenkoQuoted 1 line · Vladimir Serbinenko
Signed-off-by Vladimir Serbinenko <[email protected]>
Reviewed-by Daniel Kiper <[email protected]>
Daniel
_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel