]> git.dujemihanovic.xyz Git - u-boot.git/commit
lib: zstd: update to latest Linux zstd 1.5.2
authorBrandon Maier <brandon.maier@collins.com>
Thu, 12 Jan 2023 16:27:45 +0000 (10:27 -0600)
committerTom Rini <trini@konsulko.com>
Thu, 19 Jan 2023 00:04:17 +0000 (19:04 -0500)
commit4b9b25d943ff95c7421cab261333fc29852fe3b1
tree582c64ed55b282344d3d3397761737c2d9525bb7
parente875cabd7420200529b1dab43602af35afc83430
lib: zstd: update to latest Linux zstd 1.5.2

Update the zstd implementation to match Linux zstd 1.5.2 from commit
2aa14b1ab2.

This was motivated by running into decompression corruption issues when
trying to uncompress files compressed with newer versions of zstd. zstd
users also claim significantly improved decompression times with newer
zstd versions which is a side benefit.

Original zstd code was copied from Linux commit 2aa14b1ab2 which is a
custom-built implementation based on zstd 1.3.1. Linux switched to an
implementation that is a copy of the upstream zstd code in Linux commit
e0c1b49f5b, this results in a large code diff. However this should make
future updates easier along with other benefits[1].

This commit is a straight mirror of the Linux zstd code, except to:
- update a few #include that do not translate cleanly
  - linux/swab.h -> asm/byteorder.h
  - linux/limits.h -> linux/kernel.h
  - linux/module.h -> linux/compat.h
- remove assert() from debug.h so it doesn't conflict with u-boot's
  assert()
- strip out the compressor code as was done in the previous u-boot zstd
- update existing zstd users to the new Linux zstd API
- change the #define for MEM_STATIC to use INLINE_KEYWORD for codesize
- add a new KConfig option that sets zstd build options to minify code
  based on zstd's ZSTD_LIB_MINIFY[2].

These changes were tested by booting a zstd 1.5.2 compressed kernel inside a
FIT. And the squashfs changes by loading a file from zstd compressed squashfs
with sqfsload. buildman was used to compile test other boards and check for
binary bloat, as follows:

> $ buildman -b zstd2 --boards dh_imx6,m53menlo,mvebu_espressobin-88f3720,sandbox,sandbox64,stm32mp15_dhcom_basic,stm32mp15_dhcor_basic,turris_mox,turris_omnia -sS
> Summary of 6 commits for 9 boards (8 threads, 1 job per thread)
> 01: Merge branch '2023-01-10-platform-updates'
>        arm:  w+   m53menlo dh_imx6
> 02: lib: zstd: update to latest Linux zstd 1.5.2
>    aarch64: (for 2/2 boards) all -3186.0 rodata +920.0 text -4106.0
>        arm: (for 5/5 boards) all +1254.4 rodata +940.0 text +314.4
>    sandbox: (for 2/2 boards) all -4452.0 data -16.0 rodata +640.0 text -5076.0

[1] https://github.com/torvalds/linux/commit/e0c1b49f5b674cca7b10549c53b3791d0bbc90a8
[2] https://github.com/facebook/zstd/blob/f302ad8811643c428c4e3498e28f53a0578020d3/lib/libzstd.mk#L31

Signed-off-by: Brandon Maier <brandon.maier@collins.com>
[trini: Set ret to -EINVAL for the error of "failed to detect
compressed" to fix warning, drop ZSTD_SRCSIZEHINT_MAX for non-Linux host
tool builds]
Signed-off-by: Tom Rini <trini@konsulko.com>
45 files changed:
fs/squashfs/sqfs_decompressor.c
include/linux/zstd.h
include/linux/zstd_errors.h [new file with mode: 0644]
include/linux/zstd_lib.h [new file with mode: 0644]
lib/Kconfig
lib/zstd/Makefile
lib/zstd/bitstream.h [deleted file]
lib/zstd/common/bitstream.h [new file with mode: 0644]
lib/zstd/common/compiler.h [new file with mode: 0644]
lib/zstd/common/cpu.h [new file with mode: 0644]
lib/zstd/common/debug.c [new file with mode: 0644]
lib/zstd/common/debug.h [new file with mode: 0644]
lib/zstd/common/entropy_common.c [new file with mode: 0644]
lib/zstd/common/error_private.c [new file with mode: 0644]
lib/zstd/common/error_private.h [new file with mode: 0644]
lib/zstd/common/fse.h [new file with mode: 0644]
lib/zstd/common/fse_decompress.c [new file with mode: 0644]
lib/zstd/common/huf.h [new file with mode: 0644]
lib/zstd/common/mem.h [new file with mode: 0644]
lib/zstd/common/portability_macros.h [new file with mode: 0644]
lib/zstd/common/zstd_common.c [new file with mode: 0644]
lib/zstd/common/zstd_deps.h [new file with mode: 0644]
lib/zstd/common/zstd_internal.h [new file with mode: 0644]
lib/zstd/decompress.c [deleted file]
lib/zstd/decompress/huf_decompress.c [new file with mode: 0644]
lib/zstd/decompress/zstd_ddict.c [new file with mode: 0644]
lib/zstd/decompress/zstd_ddict.h [new file with mode: 0644]
lib/zstd/decompress/zstd_decompress.c [new file with mode: 0644]
lib/zstd/decompress/zstd_decompress_block.c [new file with mode: 0644]
lib/zstd/decompress/zstd_decompress_block.h [new file with mode: 0644]
lib/zstd/decompress/zstd_decompress_internal.h [new file with mode: 0644]
lib/zstd/decompress_sources.h [new file with mode: 0644]
lib/zstd/entropy_common.c [deleted file]
lib/zstd/error_private.h [deleted file]
lib/zstd/fse.h [deleted file]
lib/zstd/fse_decompress.c [deleted file]
lib/zstd/huf.h [deleted file]
lib/zstd/huf_decompress.c [deleted file]
lib/zstd/mem.h [deleted file]
lib/zstd/zstd.c
lib/zstd/zstd_common.c [deleted file]
lib/zstd/zstd_common_module.c [new file with mode: 0644]
lib/zstd/zstd_decompress_module.c [new file with mode: 0644]
lib/zstd/zstd_internal.h [deleted file]
lib/zstd/zstd_opt.h [deleted file]