mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-28 15:41:40 +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>
125 lines
2.8 KiB
C
125 lines
2.8 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.
|
|
*/
|
|
|
|
/*
|
|
* This file provides common libc dependencies that zstd requires.
|
|
* The purpose is to allow replacing this file with a custom implementation
|
|
* to compile zstd without libc support.
|
|
*/
|
|
|
|
/* Need:
|
|
* NULL
|
|
* INT_MAX
|
|
* UINT_MAX
|
|
* ZSTD_memcpy()
|
|
* ZSTD_memset()
|
|
* ZSTD_memmove()
|
|
*/
|
|
#ifndef ZSTD_DEPS_COMMON
|
|
#define ZSTD_DEPS_COMMON
|
|
|
|
#include <linux/kernel.h>
|
|
#include <linux/stddef.h>
|
|
|
|
#define ZSTD_memcpy(d,s,n) __builtin_memcpy((d),(s),(n))
|
|
#define ZSTD_memmove(d,s,n) __builtin_memmove((d),(s),(n))
|
|
#define ZSTD_memset(d,s,n) __builtin_memset((d),(s),(n))
|
|
|
|
#endif /* ZSTD_DEPS_COMMON */
|
|
|
|
/*
|
|
* Define malloc as always failing. That means the user must
|
|
* either use ZSTD_customMem or statically allocate memory.
|
|
* Need:
|
|
* ZSTD_malloc()
|
|
* ZSTD_free()
|
|
* ZSTD_calloc()
|
|
*/
|
|
#ifdef ZSTD_DEPS_NEED_MALLOC
|
|
#ifndef ZSTD_DEPS_MALLOC
|
|
#define ZSTD_DEPS_MALLOC
|
|
|
|
#define ZSTD_malloc(s) ({ (void)(s); NULL; })
|
|
#define ZSTD_free(p) ((void)(p))
|
|
#define ZSTD_calloc(n,s) ({ (void)(n); (void)(s); NULL; })
|
|
|
|
#endif /* ZSTD_DEPS_MALLOC */
|
|
#endif /* ZSTD_DEPS_NEED_MALLOC */
|
|
|
|
/*
|
|
* Provides 64-bit math support.
|
|
* Need:
|
|
* U64 ZSTD_div64(U64 dividend, U32 divisor)
|
|
*/
|
|
#ifdef ZSTD_DEPS_NEED_MATH64
|
|
#ifndef ZSTD_DEPS_MATH64
|
|
#define ZSTD_DEPS_MATH64
|
|
|
|
#include <linux/math64.h>
|
|
|
|
static uint64_t ZSTD_div64(uint64_t dividend, uint32_t divisor) {
|
|
return div_u64(dividend, divisor);
|
|
}
|
|
|
|
#endif /* ZSTD_DEPS_MATH64 */
|
|
#endif /* ZSTD_DEPS_NEED_MATH64 */
|
|
|
|
/*
|
|
* This is only requested when DEBUGLEVEL >= 1, meaning
|
|
* it is disabled in production.
|
|
* Need:
|
|
* assert()
|
|
*/
|
|
#ifdef ZSTD_DEPS_NEED_ASSERT
|
|
#ifndef ZSTD_DEPS_ASSERT
|
|
#define ZSTD_DEPS_ASSERT
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#define assert(x) WARN_ON((x))
|
|
|
|
#endif /* ZSTD_DEPS_ASSERT */
|
|
#endif /* ZSTD_DEPS_NEED_ASSERT */
|
|
|
|
/*
|
|
* This is only requested when DEBUGLEVEL >= 2, meaning
|
|
* it is disabled in production.
|
|
* Need:
|
|
* ZSTD_DEBUG_PRINT()
|
|
*/
|
|
#ifdef ZSTD_DEPS_NEED_IO
|
|
#ifndef ZSTD_DEPS_IO
|
|
#define ZSTD_DEPS_IO
|
|
|
|
#include <linux/printk.h>
|
|
|
|
#define ZSTD_DEBUG_PRINT(...) pr_debug(__VA_ARGS__)
|
|
|
|
#endif /* ZSTD_DEPS_IO */
|
|
#endif /* ZSTD_DEPS_NEED_IO */
|
|
|
|
/*
|
|
* Only requested when MSAN is enabled.
|
|
* Need:
|
|
* intptr_t
|
|
*/
|
|
#ifdef ZSTD_DEPS_NEED_STDINT
|
|
#ifndef ZSTD_DEPS_STDINT
|
|
#define ZSTD_DEPS_STDINT
|
|
|
|
/*
|
|
* The Linux Kernel doesn't provide intptr_t, only uintptr_t, which
|
|
* is an unsigned long.
|
|
*/
|
|
typedef long intptr_t;
|
|
|
|
#endif /* ZSTD_DEPS_STDINT */
|
|
#endif /* ZSTD_DEPS_NEED_STDINT */
|