mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-12-24 03:53:31 +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>
145 lines
4.3 KiB
C
145 lines
4.3 KiB
C
/*
|
|
* Copyright (c) Yann Collet, 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.
|
|
*/
|
|
|
|
/* Note : this module is expected to remain private, do not expose it */
|
|
|
|
#ifndef ERROR_H_MODULE
|
|
#define ERROR_H_MODULE
|
|
|
|
|
|
|
|
/* ****************************************
|
|
* Dependencies
|
|
******************************************/
|
|
#include <linux/zstd_errors.h> /* enum list */
|
|
#include "compiler.h"
|
|
#include "debug.h"
|
|
#include "zstd_deps.h" /* size_t */
|
|
|
|
|
|
/* ****************************************
|
|
* Compiler-specific
|
|
******************************************/
|
|
#define ERR_STATIC static __attribute__((unused))
|
|
|
|
|
|
/*-****************************************
|
|
* Customization (error_public.h)
|
|
******************************************/
|
|
typedef ZSTD_ErrorCode ERR_enum;
|
|
#define PREFIX(name) ZSTD_error_##name
|
|
|
|
|
|
/*-****************************************
|
|
* Error codes handling
|
|
******************************************/
|
|
#undef ERROR /* already defined on Visual Studio */
|
|
#define ERROR(name) ZSTD_ERROR(name)
|
|
#define ZSTD_ERROR(name) ((size_t)-PREFIX(name))
|
|
|
|
ERR_STATIC unsigned ERR_isError(size_t code) { return (code > ERROR(maxCode)); }
|
|
|
|
ERR_STATIC ERR_enum ERR_getErrorCode(size_t code) { if (!ERR_isError(code)) return (ERR_enum)0; return (ERR_enum) (0-code); }
|
|
|
|
/* check and forward error code */
|
|
#define CHECK_V_F(e, f) size_t const e = f; if (ERR_isError(e)) return e
|
|
#define CHECK_F(f) { CHECK_V_F(_var_err__, f); }
|
|
|
|
|
|
/*-****************************************
|
|
* Error Strings
|
|
******************************************/
|
|
|
|
const char* ERR_getErrorString(ERR_enum code); /* error_private.c */
|
|
|
|
ERR_STATIC const char* ERR_getErrorName(size_t code)
|
|
{
|
|
return ERR_getErrorString(ERR_getErrorCode(code));
|
|
}
|
|
|
|
/*
|
|
* Ignore: this is an internal helper.
|
|
*
|
|
* This is a helper function to help force C99-correctness during compilation.
|
|
* Under strict compilation modes, variadic macro arguments can't be empty.
|
|
* However, variadic function arguments can be. Using a function therefore lets
|
|
* us statically check that at least one (string) argument was passed,
|
|
* independent of the compilation flags.
|
|
*/
|
|
static INLINE_KEYWORD UNUSED_ATTR
|
|
void _force_has_format_string(const char *format, ...) {
|
|
(void)format;
|
|
}
|
|
|
|
/*
|
|
* Ignore: this is an internal helper.
|
|
*
|
|
* We want to force this function invocation to be syntactically correct, but
|
|
* we don't want to force runtime evaluation of its arguments.
|
|
*/
|
|
#define _FORCE_HAS_FORMAT_STRING(...) \
|
|
if (0) { \
|
|
_force_has_format_string(__VA_ARGS__); \
|
|
}
|
|
|
|
#define ERR_QUOTE(str) #str
|
|
|
|
/*
|
|
* Return the specified error if the condition evaluates to true.
|
|
*
|
|
* In debug modes, prints additional information.
|
|
* In order to do that (particularly, printing the conditional that failed),
|
|
* this can't just wrap RETURN_ERROR().
|
|
*/
|
|
#define RETURN_ERROR_IF(cond, err, ...) \
|
|
if (cond) { \
|
|
RAWLOG(3, "%s:%d: ERROR!: check %s failed, returning %s", \
|
|
__FILE__, __LINE__, ERR_QUOTE(cond), ERR_QUOTE(ERROR(err))); \
|
|
_FORCE_HAS_FORMAT_STRING(__VA_ARGS__); \
|
|
RAWLOG(3, ": " __VA_ARGS__); \
|
|
RAWLOG(3, "\n"); \
|
|
return ERROR(err); \
|
|
}
|
|
|
|
/*
|
|
* Unconditionally return the specified error.
|
|
*
|
|
* In debug modes, prints additional information.
|
|
*/
|
|
#define RETURN_ERROR(err, ...) \
|
|
do { \
|
|
RAWLOG(3, "%s:%d: ERROR!: unconditional check failed, returning %s", \
|
|
__FILE__, __LINE__, ERR_QUOTE(ERROR(err))); \
|
|
_FORCE_HAS_FORMAT_STRING(__VA_ARGS__); \
|
|
RAWLOG(3, ": " __VA_ARGS__); \
|
|
RAWLOG(3, "\n"); \
|
|
return ERROR(err); \
|
|
} while(0);
|
|
|
|
/*
|
|
* If the provided expression evaluates to an error code, returns that error code.
|
|
*
|
|
* In debug modes, prints additional information.
|
|
*/
|
|
#define FORWARD_IF_ERROR(err, ...) \
|
|
do { \
|
|
size_t const err_code = (err); \
|
|
if (ERR_isError(err_code)) { \
|
|
RAWLOG(3, "%s:%d: ERROR!: forwarding error in %s: %s", \
|
|
__FILE__, __LINE__, ERR_QUOTE(err), ERR_getErrorName(err_code)); \
|
|
_FORCE_HAS_FORMAT_STRING(__VA_ARGS__); \
|
|
RAWLOG(3, ": " __VA_ARGS__); \
|
|
RAWLOG(3, "\n"); \
|
|
return err_code; \
|
|
} \
|
|
} while(0);
|
|
|
|
|
|
#endif /* ERROR_H_MODULE */
|