mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-16 13:34:30 +00:00
98988fc8e9
Import upstream zstd v1.5.5 to expose upstream's QAT integration.
Import from upstream commit 58b3ef79 [0]. This is one commit before the
tag v1.5.5-kernel [1], which is signed with upstream's signing key. The
next patch in the series imports from v1.5.5-kernel, and is included in
the series, rather than just importing directly from v1.5.5-kernel,
because it is a non-trivial patch applied to improve the kernel's
decompression speed. This commit contains 3 backported patches on top of
v1.5.5: Two from the Linux copy of zstd, and one from upstream's `dev`
branch.
In addition to keeping the kernel's copy of zstd up to date, this update
was requested by Intel to expose upstream zstd's external match provider
API to the kernel, which allows QAT to accelerate the LZ match finding
stage.
This commit was generated by:
export ZSTD=/path/to/repo/zstd/
export LINUX=/path/to/repo/linux/
cd "$ZSTD/contrib/linux-kernel"
git checkout v1.5.5-kernel~
make import LINUX="$LINUX"
I tested and benchmarked this commit on x86-64 with gcc-13.2.1 on an
Intel i9-9900K by running my benchmark scripts that benchmark zstd's
performance in btrfs and squashfs compressed filesystems. This commit
improves compression speed, especially for higher compression levels,
and regresses decompression speed. But the decompression speed
regression is addressed by the next patch in the series.
Component, Level, C. time delta, size delta, D. time delta
Btrfs , 1, -1.9%, +0.0%, +9.5%
Btrfs , 3, -5.6%, +0.0%, +7.4%
Btrfs , 5, -4.9%, +0.0%, +5.0%
Btrfs , 7, -5.7%, +0.0%, +5.2%
Btrfs , 9, -5.7%, +0.0%, +4.0%
Squashfs , 1, N/A, 0.0%, +11.6%
I also boot tested with a zstd compressed kernel on i386 and aarch64.
Link: 58b3ef79eb
Link: https://github.com/facebook/zstd/tree/v1.5.5-kernel
Signed-off-by: Nick Terrell <terrelln@fb.com>
103 lines
3.6 KiB
C
103 lines
3.6 KiB
C
/* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */
|
|
/* ******************************************************************
|
|
* debug
|
|
* Part of FSE library
|
|
* Copyright (c) Meta Platforms, Inc. and affiliates.
|
|
*
|
|
* You can contact the author at :
|
|
* - Source repository : https://github.com/Cyan4973/FiniteStateEntropy
|
|
*
|
|
* 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.
|
|
****************************************************************** */
|
|
|
|
|
|
/*
|
|
* The purpose of this header is to enable debug functions.
|
|
* They regroup assert(), DEBUGLOG() and RAWLOG() for run-time,
|
|
* and DEBUG_STATIC_ASSERT() for compile-time.
|
|
*
|
|
* By default, DEBUGLEVEL==0, which means run-time debug is disabled.
|
|
*
|
|
* Level 1 enables assert() only.
|
|
* Starting level 2, traces can be generated and pushed to stderr.
|
|
* The higher the level, the more verbose the traces.
|
|
*
|
|
* It's possible to dynamically adjust level using variable g_debug_level,
|
|
* which is only declared if DEBUGLEVEL>=2,
|
|
* and is a global variable, not multi-thread protected (use with care)
|
|
*/
|
|
|
|
#ifndef DEBUG_H_12987983217
|
|
#define DEBUG_H_12987983217
|
|
|
|
|
|
|
|
/* static assert is triggered at compile time, leaving no runtime artefact.
|
|
* static assert only works with compile-time constants.
|
|
* Also, this variant can only be used inside a function. */
|
|
#define DEBUG_STATIC_ASSERT(c) (void)sizeof(char[(c) ? 1 : -1])
|
|
|
|
|
|
/* DEBUGLEVEL is expected to be defined externally,
|
|
* typically through compiler command line.
|
|
* Value must be a number. */
|
|
#ifndef DEBUGLEVEL
|
|
# define DEBUGLEVEL 0
|
|
#endif
|
|
|
|
|
|
/* recommended values for DEBUGLEVEL :
|
|
* 0 : release mode, no debug, all run-time checks disabled
|
|
* 1 : enables assert() only, no display
|
|
* 2 : reserved, for currently active debug path
|
|
* 3 : events once per object lifetime (CCtx, CDict, etc.)
|
|
* 4 : events once per frame
|
|
* 5 : events once per block
|
|
* 6 : events once per sequence (verbose)
|
|
* 7+: events at every position (*very* verbose)
|
|
*
|
|
* It's generally inconvenient to output traces > 5.
|
|
* In which case, it's possible to selectively trigger high verbosity levels
|
|
* by modifying g_debug_level.
|
|
*/
|
|
|
|
#if (DEBUGLEVEL>=1)
|
|
# define ZSTD_DEPS_NEED_ASSERT
|
|
# include "zstd_deps.h"
|
|
#else
|
|
# ifndef assert /* assert may be already defined, due to prior #include <assert.h> */
|
|
# define assert(condition) ((void)0) /* disable assert (default) */
|
|
# endif
|
|
#endif
|
|
|
|
#if (DEBUGLEVEL>=2)
|
|
# define ZSTD_DEPS_NEED_IO
|
|
# include "zstd_deps.h"
|
|
extern int g_debuglevel; /* the variable is only declared,
|
|
it actually lives in debug.c,
|
|
and is shared by the whole process.
|
|
It's not thread-safe.
|
|
It's useful when enabling very verbose levels
|
|
on selective conditions (such as position in src) */
|
|
|
|
# define RAWLOG(l, ...) { \
|
|
if (l<=g_debuglevel) { \
|
|
ZSTD_DEBUG_PRINT(__VA_ARGS__); \
|
|
} }
|
|
# define DEBUGLOG(l, ...) { \
|
|
if (l<=g_debuglevel) { \
|
|
ZSTD_DEBUG_PRINT(__FILE__ ": " __VA_ARGS__); \
|
|
ZSTD_DEBUG_PRINT(" \n"); \
|
|
} }
|
|
#else
|
|
# define RAWLOG(l, ...) {} /* disabled */
|
|
# define DEBUGLOG(l, ...) {} /* disabled */
|
|
#endif
|
|
|
|
|
|
|
|
#endif /* DEBUG_H_12987983217 */
|