mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-12-01 00:49:43 +00:00
4b9b25d943
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]e0c1b49f5b[2]f302ad8811/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>
105 lines
2.7 KiB
C
105 lines
2.7 KiB
C
// SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
|
|
/*
|
|
* Copyright (c) Facebook, Inc.
|
|
* All rights reserved.
|
|
*
|
|
* This source code is licensed under both the BSD-style license (found in the
|
|
* LICENSE file in the root directory of this source tree) and the GPLv2 (found
|
|
* in the COPYING file in the root directory of this source tree).
|
|
* You may select, at your option, one of the above-listed licenses.
|
|
*/
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/compat.h>
|
|
#include <linux/string.h>
|
|
#include <linux/zstd.h>
|
|
|
|
#include "common/zstd_deps.h"
|
|
|
|
/* Common symbols. zstd_compress must depend on zstd_decompress. */
|
|
|
|
unsigned int zstd_is_error(size_t code)
|
|
{
|
|
return ZSTD_isError(code);
|
|
}
|
|
EXPORT_SYMBOL(zstd_is_error);
|
|
|
|
zstd_error_code zstd_get_error_code(size_t code)
|
|
{
|
|
return ZSTD_getErrorCode(code);
|
|
}
|
|
EXPORT_SYMBOL(zstd_get_error_code);
|
|
|
|
const char *zstd_get_error_name(size_t code)
|
|
{
|
|
return ZSTD_getErrorName(code);
|
|
}
|
|
EXPORT_SYMBOL(zstd_get_error_name);
|
|
|
|
/* Decompression symbols. */
|
|
|
|
size_t zstd_dctx_workspace_bound(void)
|
|
{
|
|
return ZSTD_estimateDCtxSize();
|
|
}
|
|
EXPORT_SYMBOL(zstd_dctx_workspace_bound);
|
|
|
|
zstd_dctx *zstd_init_dctx(void *workspace, size_t workspace_size)
|
|
{
|
|
if (workspace == NULL)
|
|
return NULL;
|
|
return ZSTD_initStaticDCtx(workspace, workspace_size);
|
|
}
|
|
EXPORT_SYMBOL(zstd_init_dctx);
|
|
|
|
size_t zstd_decompress_dctx(zstd_dctx *dctx, void *dst, size_t dst_capacity,
|
|
const void *src, size_t src_size)
|
|
{
|
|
return ZSTD_decompressDCtx(dctx, dst, dst_capacity, src, src_size);
|
|
}
|
|
EXPORT_SYMBOL(zstd_decompress_dctx);
|
|
|
|
size_t zstd_dstream_workspace_bound(size_t max_window_size)
|
|
{
|
|
return ZSTD_estimateDStreamSize(max_window_size);
|
|
}
|
|
EXPORT_SYMBOL(zstd_dstream_workspace_bound);
|
|
|
|
zstd_dstream *zstd_init_dstream(size_t max_window_size, void *workspace,
|
|
size_t workspace_size)
|
|
{
|
|
if (workspace == NULL)
|
|
return NULL;
|
|
(void)max_window_size;
|
|
return ZSTD_initStaticDStream(workspace, workspace_size);
|
|
}
|
|
EXPORT_SYMBOL(zstd_init_dstream);
|
|
|
|
size_t zstd_reset_dstream(zstd_dstream *dstream)
|
|
{
|
|
return ZSTD_resetDStream(dstream);
|
|
}
|
|
EXPORT_SYMBOL(zstd_reset_dstream);
|
|
|
|
size_t zstd_decompress_stream(zstd_dstream *dstream, zstd_out_buffer *output,
|
|
zstd_in_buffer *input)
|
|
{
|
|
return ZSTD_decompressStream(dstream, output, input);
|
|
}
|
|
EXPORT_SYMBOL(zstd_decompress_stream);
|
|
|
|
size_t zstd_find_frame_compressed_size(const void *src, size_t src_size)
|
|
{
|
|
return ZSTD_findFrameCompressedSize(src, src_size);
|
|
}
|
|
EXPORT_SYMBOL(zstd_find_frame_compressed_size);
|
|
|
|
size_t zstd_get_frame_header(zstd_frame_header *header, const void *src,
|
|
size_t src_size)
|
|
{
|
|
return ZSTD_getFrameHeader(header, src, src_size);
|
|
}
|
|
EXPORT_SYMBOL(zstd_get_frame_header);
|
|
|
|
MODULE_LICENSE("Dual BSD/GPL");
|
|
MODULE_DESCRIPTION("Zstd Decompressor");
|