Updated the lz4 decompressor

As an experiment, I stole the lz4 decompressor from upstream lz4 (1.9.3), and landed it. Feedback suggested that keeping the vendor lz4 code isolated and unlinted was probably reasonable, so I lobbed it into its own file. It also seemed reasonable to put the mostly-untouched* code into lz4.c proper, and relegate the integrated and ZFS-specific code to lz4_zfs.c. Reviewed-by: Matthew Ahrens <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Rich Ercolani <[email protected]> Closes openzfs#12805
rincebrain · Jan 7, 2022 · e9701fe · e9701fe
1 parent af88d47
commit e9701fe
Show file tree

Hide file tree

Showing 7 changed files with 1,728 additions and 886 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -121,6 +121,7 @@ cstyle:
 		! -name 'zfs_config.*' ! -name '*.mod.c' \
 		! -name 'opt_global.h' ! -name '*_if*.h' \
 		! -path './module/zstd/lib/*' \
+		! -path './module/zfs/lz4.c' \
 		-exec ${top_srcdir}/scripts/cstyle.pl -cpP {} \+
 
 filter_executable = -exec test -x '{}' \; -print

diff --git a/config/ax_code_coverage.m4 b/config/ax_code_coverage.m4
@@ -224,6 +224,7 @@ CODE_COVERAGE_GENHTML_OPTIONS ?= $(CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT)
 # Ignore tmp and tests themselves
 CODE_COVERAGE_IGNORE_PATTERN ?= "/tmp/*" "*/tests/*"
 CODE_COVERAGE_IGNORE_PATTERN += "*/module/zstd/lib/*"
+CODE_COVERAGE_IGNORE_PATTERN += "*/module/zfs/lz4.c"
 
 GITIGNOREFILES ?=
 GITIGNOREFILES += $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_DIRECTORY)

diff --git a/lib/libzpool/Makefile.am b/lib/libzpool/Makefile.am
@@ -90,9 +90,11 @@ KERNEL_C = \
 	dsl_destroy.c \
 	dsl_userhold.c \
 	edonr_zfs.c \
-	hkdf.c \
 	fm.c \
 	gzip.c \
+	hkdf.c \
+	lz4.c \
+	lz4_zfs.c \
 	lzjb.c \
 	lz4.c \
 	metaslab.c \

diff --git a/module/Makefile.bsd b/module/Makefile.bsd
@@ -223,6 +223,7 @@ SRCS+=	abd.c \
 	gzip.c \
 	lzjb.c \
 	lz4.c \
+	lz4_zfs.c \
 	metaslab.c \
 	mmp.c \
 	multilist.c \
@@ -346,7 +347,7 @@ CFLAGS.dsl_dir.c= -Wno-cast-qual
 CFLAGS.dsl_deadlist.c= -Wno-cast-qual
 CFLAGS.dsl_prop.c= -Wno-cast-qual
 CFLAGS.fm.c= -Wno-cast-qual
-CFLAGS.lz4.c= -Wno-cast-qual
+CFLAGS.lz4_zfs.c= -Wno-cast-qual
 CFLAGS.spa.c= -Wno-cast-qual
 CFLAGS.spa_misc.c= -Wno-cast-qual
 CFLAGS.sysctl_os.c= -include ../zfs_config.h

diff --git a/module/zfs/Makefile.in b/module/zfs/Makefile.in
@@ -56,6 +56,7 @@ $(MODULE)-objs += fm.o
 $(MODULE)-objs += gzip.o
 $(MODULE)-objs += hkdf.o
 $(MODULE)-objs += lz4.o
+$(MODULE)-objs += lz4_zfs.o
 $(MODULE)-objs += lzjb.o
 $(MODULE)-objs += metaslab.o
 $(MODULE)-objs += mmp.o