mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-04 08:17:46 +00:00
65d1f5507e
In addition to keeping the kernel's copy of zstd up to date, this update was requested by Intel to expose upstream's APIs that allow QAT to accelerate the LZ match finding stage of Zstd. This patch is imported from the upstream tag v1.5.7-kernel [0], which is signed with upstream's signing key EF8FE99528B52FFD [1]. It was imported from upstream using this command: export ZSTD=/path/to/repo/zstd/ export LINUX=/path/to/repo/linux/ cd "$ZSTD/contrib/linux-kernel" git checkout v1.5.7-kernel make import LINUX="$LINUX" This patch has been tested on x86-64, and has been boot tested with a zstd compressed kernel & initramfs on i386 and aarch64. I benchmarked the patch on x86-64 with gcc-14.2.1 on an Intel i9-9900K by measruing the performance of compressed filesystem reads and writes. Component, Level, Size delta, C. time delta, D. time delta Btrfs , 1, +0.00%, -6.1%, +1.4% Btrfs , 3, +0.00%, -9.8%, +3.0% Btrfs , 5, +0.00%, +1.7%, +1.4% Btrfs , 7, +0.00%, -1.9%, +2.7% Btrfs , 9, +0.00%, -3.4%, +3.7% Btrfs , 15, +0.00%, -0.3%, +3.6% SquashFS , 1, +0.00%, N/A, +1.9% The major changes that impact the kernel use cases for each version are: v1.5.7: https://github.com/facebook/zstd/releases/tag/v1.5.7 * Add zstd_compress_sequences_and_literals() for use by Intel's QAT driver to implement Zstd compression acceleration in the kernel. * Fix an underflow bug in 32-bit builds that can cause data corruption when processing more than 4GB of data with a single `ZSTD_CCtx` object, when an input crosses the 4GB boundry. I don't believe this impacts any current kernel use cases, because the `ZSTD_CCtx` is typically reconstructed between compressions. * Levels 1-4 see 5-10% compression speed improvements for inputs smaller than 128KB. v1.5.6: https://github.com/facebook/zstd/releases/tag/v1.5.6 * Improved compression ratio for the highest compression levels. I don't expect these see much use however, due to their slow speeds. v1.5.5: https://github.com/facebook/zstd/releases/tag/v1.5.5 * Fix a rare corruption bug that can trigger on levels 13 and above. * Improve compression speed of levels 5-11 on incompressible data. v1.5.4: https://github.com/facebook/zstd/releases/tag/v1.5.4 * Improve copmression speed of levels 5-11 on ARM. * Improve dictionary compression speed. Signed-off-by: Nick Terrell <terrelln@fb.com>
121 lines
2.7 KiB
C
121 lines
2.7 KiB
C
/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */
|
|
/*
|
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
|
* 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/limits.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
|
|
|
|
/* intptr_t already provided by ZSTD_DEPS_COMMON */
|
|
|
|
#endif /* ZSTD_DEPS_STDINT */
|
|
#endif /* ZSTD_DEPS_NEED_STDINT */
|