From 802c258fc1c91c0980adad3f2bdfbf1685687666 Mon Sep 17 00:00:00 2001 From: Rob Norris Date: Mon, 19 Jun 2023 13:04:04 +1000 Subject: [PATCH] compress: add "slack" compression options Signed-off-by: Allan Jude --- include/sys/zio_compress.h | 3 ++ include/zfeature_common.h | 1 + lib/libzpool/Makefile.am | 1 + module/Makefile.bsd | 1 + module/zcommon/zfeature_common.c | 11 +++++++ module/zcommon/zfs_prop.c | 1 + module/zfs/Makefile.in | 1 + module/zfs/slack.c | 56 ++++++++++++++++++++++++++++++++ module/zfs/zfs_ioctl.c | 14 ++++++++ module/zfs/zio_compress.c | 3 ++ 10 files changed, 92 insertions(+) create mode 100644 module/zfs/slack.c diff --git a/include/sys/zio_compress.h b/include/sys/zio_compress.h index 4a22ad2a27..4c0d920fc2 100644 --- a/include/sys/zio_compress.h +++ b/include/sys/zio_compress.h @@ -54,6 +54,7 @@ enum zio_compress { ZIO_COMPRESS_ZLE, ZIO_COMPRESS_LZ4, ZIO_COMPRESS_ZSTD, + ZIO_COMPRESS_SLACK, ZIO_COMPRESS_FUNCTIONS }; @@ -179,6 +180,8 @@ extern size_t lz4_compress_zfs(void *src, void *dst, size_t s_len, size_t d_len, int level); extern int lz4_decompress_zfs(void *src, void *dst, size_t s_len, size_t d_len, int level); +extern size_t slack_compress(void *src, void *dst, size_t s_len, size_t d_len, + int level); /* * Compress and decompress data if necessary. diff --git a/include/zfeature_common.h b/include/zfeature_common.h index 76dd7ed574..26ca125766 100644 --- a/include/zfeature_common.h +++ b/include/zfeature_common.h @@ -75,6 +75,7 @@ typedef enum spa_feature { SPA_FEATURE_DEVICE_REBUILD, SPA_FEATURE_ZSTD_COMPRESS, SPA_FEATURE_DRAID, + SPA_FEATURE_SLACK_COMPRESS, SPA_FEATURES } spa_feature_t; diff --git a/lib/libzpool/Makefile.am b/lib/libzpool/Makefile.am index a0176d1a1f..185ea37ed3 100644 --- a/lib/libzpool/Makefile.am +++ b/lib/libzpool/Makefile.am @@ -108,6 +108,7 @@ KERNEL_C = \ sa.c \ sha256.c \ skein_zfs.c \ + slack.c \ spa.c \ spa_boot.c \ spa_checkpoint.c \ diff --git a/module/Makefile.bsd b/module/Makefile.bsd index 02d0fd1eff..4a693c776a 100644 --- a/module/Makefile.bsd +++ b/module/Makefile.bsd @@ -234,6 +234,7 @@ SRCS+= abd.c \ sa.c \ sha256.c \ skein_zfs.c \ + slack.c \ spa.c \ spa_boot.c \ spa_checkpoint.c \ diff --git a/module/zcommon/zfeature_common.c b/module/zcommon/zfeature_common.c index fc0e09605e..b004d47113 100644 --- a/module/zcommon/zfeature_common.c +++ b/module/zcommon/zfeature_common.c @@ -598,6 +598,17 @@ zpool_feature_init(void) zfeature_register(SPA_FEATURE_DRAID, "org.openzfs:draid", "draid", "Support for distributed spare RAID", ZFEATURE_FLAG_MOS, ZFEATURE_TYPE_BOOLEAN, NULL); + + { + static const spa_feature_t slack_deps[] = { + SPA_FEATURE_EXTENSIBLE_DATASET, + SPA_FEATURE_NONE + }; + zfeature_register(SPA_FEATURE_SLACK_COMPRESS, + "com.klarasystems:slack_compress", "slack_compress", + "slack compression support", + ZFEATURE_FLAG_PER_DATASET, ZFEATURE_TYPE_BOOLEAN, slack_deps); + } } #if defined(_KERNEL) diff --git a/module/zcommon/zfs_prop.c b/module/zcommon/zfs_prop.c index 5f88bd0208..8ac9ab0879 100644 --- a/module/zcommon/zfs_prop.c +++ b/module/zcommon/zfs_prop.c @@ -127,6 +127,7 @@ zfs_prop_init(void) { "gzip-9", ZIO_COMPRESS_GZIP_9 }, { "zle", ZIO_COMPRESS_ZLE }, { "lz4", ZIO_COMPRESS_LZ4 }, + { "slack", ZIO_COMPRESS_SLACK }, { "zstd", ZIO_COMPRESS_ZSTD }, { "zstd-fast", ZIO_COMPLEVEL_ZSTD(ZIO_ZSTD_LEVEL_FAST_DEFAULT) }, diff --git a/module/zfs/Makefile.in b/module/zfs/Makefile.in index e6e8948c22..30e981ffc6 100644 --- a/module/zfs/Makefile.in +++ b/module/zfs/Makefile.in @@ -70,6 +70,7 @@ $(MODULE)-objs += rrwlock.o $(MODULE)-objs += sa.o $(MODULE)-objs += sha256.o $(MODULE)-objs += skein_zfs.o +$(MODULE)-objs += slack.o $(MODULE)-objs += spa.o $(MODULE)-objs += spa_boot.o $(MODULE)-objs += spa_checkpoint.o diff --git a/module/zfs/slack.c b/module/zfs/slack.c new file mode 100644 index 0000000000..6c9a041806 --- /dev/null +++ b/module/zfs/slack.c @@ -0,0 +1,56 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. + * + * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE + * or http://www.opensolaris.org/os/licensing. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ + +/* + * Copyright (c) 2023, Klara Inc. + */ + +#include +#include + +/* + * Slack compression simply searches for the last non-zero byte in the buffer, + * and sets the position as the size of the "compressed" data. + */ + +size_t +slack_compress(void *src, void *dst, size_t s_len, size_t d_len, int level) +{ + ASSERT3U(s_len, >, 0); + ASSERT0(P2PHASE(s_len, sizeof (uint64_t))); + + uint64_t *buf = (uint64_t *)src; + + int p = (s_len / sizeof (uint64_t)) - 1; + for (; p >= 0; p--) + if (buf[p] != 0) + break; + + if (p < 0) + return (s_len); + + size_t c_len = (p + 1) * sizeof (uint64_t); + if (c_len > d_len) + return (s_len); + + memcpy(dst, src, c_len); + return (c_len); +} diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c index efdb0e6dad..b78cb80219 100644 --- a/module/zfs/zfs_ioctl.c +++ b/module/zfs/zfs_ioctl.c @@ -4569,6 +4569,20 @@ zfs_check_settable(const char *dsname, nvpair_t *pair, cred_t *cr) } spa_close(spa, FTAG); } + + if (compval == ZIO_COMPRESS_SLACK) { + spa_t *spa; + + if ((err = spa_open(dsname, &spa, FTAG)) != 0) + return (err); + + if (!spa_feature_is_enabled(spa, + SPA_FEATURE_SLACK_COMPRESS)) { + spa_close(spa, FTAG); + return (SET_ERROR(ENOTSUP)); + } + spa_close(spa, FTAG); + } } break; diff --git a/module/zfs/zio_compress.c b/module/zfs/zio_compress.c index cded11f4cb..7c8188f7d7 100644 --- a/module/zfs/zio_compress.c +++ b/module/zfs/zio_compress.c @@ -68,6 +68,7 @@ zio_compress_info_t zio_compress_table[ZIO_COMPRESS_FUNCTIONS] = { {"lz4", 0, lz4_compress_zfs, lz4_decompress_zfs, NULL}, {"zstd", ZIO_ZSTD_LEVEL_DEFAULT, zfs_zstd_compress, zfs_zstd_decompress, zfs_zstd_decompress_level}, + {"slack", 0, slack_compress, NULL, NULL }, }; uint8_t @@ -215,6 +216,8 @@ zio_compress_to_feature(enum zio_compress comp) switch (comp) { case ZIO_COMPRESS_ZSTD: return (SPA_FEATURE_ZSTD_COMPRESS); + case ZIO_COMPRESS_SLACK: + return (SPA_FEATURE_SLACK_COMPRESS); default: break; }