mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2024-12-29 17:22:07 +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>
114 lines
3.2 KiB
C
114 lines
3.2 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.
|
|
*/
|
|
|
|
#ifndef ZSTD_PORTABILITY_MACROS_H
|
|
#define ZSTD_PORTABILITY_MACROS_H
|
|
|
|
/*
|
|
* This header file contains macro definitions to support portability.
|
|
* This header is shared between C and ASM code, so it MUST only
|
|
* contain macro definitions. It MUST not contain any C code.
|
|
*
|
|
* This header ONLY defines macros to detect platforms/feature support.
|
|
*
|
|
*/
|
|
|
|
|
|
/* compat. with non-clang compilers */
|
|
#ifndef __has_attribute
|
|
#define __has_attribute(x) 0
|
|
#endif
|
|
|
|
/* compat. with non-clang compilers */
|
|
#ifndef __has_builtin
|
|
# define __has_builtin(x) 0
|
|
#endif
|
|
|
|
/* compat. with non-clang compilers */
|
|
#ifndef __has_feature
|
|
# define __has_feature(x) 0
|
|
#endif
|
|
|
|
/* detects whether we are being compiled under msan */
|
|
|
|
/* detects whether we are being compiled under asan */
|
|
|
|
/* detects whether we are being compiled under dfsan */
|
|
|
|
/* Mark the internal assembly functions as hidden */
|
|
#ifdef __ELF__
|
|
# define ZSTD_HIDE_ASM_FUNCTION(func) .hidden func
|
|
#else
|
|
# define ZSTD_HIDE_ASM_FUNCTION(func)
|
|
#endif
|
|
|
|
/* Enable runtime BMI2 dispatch based on the CPU.
|
|
* Enabled for clang & gcc >=4.8 on x86 when BMI2 isn't enabled by default.
|
|
*/
|
|
#ifndef DYNAMIC_BMI2
|
|
#if ((defined(__clang__) && __has_attribute(__target__)) \
|
|
|| (defined(__GNUC__) \
|
|
&& (__GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)))) \
|
|
&& (defined(__x86_64__) || defined(_M_X64)) \
|
|
&& !defined(__BMI2__)
|
|
# define DYNAMIC_BMI2 1
|
|
#else
|
|
# define DYNAMIC_BMI2 0
|
|
#endif
|
|
#endif
|
|
|
|
/*
|
|
* Only enable assembly for GNUC compatible compilers,
|
|
* because other platforms may not support GAS assembly syntax.
|
|
*
|
|
* Only enable assembly for Linux / MacOS, other platforms may
|
|
* work, but they haven't been tested. This could likely be
|
|
* extended to BSD systems.
|
|
*
|
|
* Disable assembly when MSAN is enabled, because MSAN requires
|
|
* 100% of code to be instrumented to work.
|
|
*/
|
|
#define ZSTD_ASM_SUPPORTED 1
|
|
|
|
/*
|
|
* Determines whether we should enable assembly for x86-64
|
|
* with BMI2.
|
|
*
|
|
* Enable if all of the following conditions hold:
|
|
* - ASM hasn't been explicitly disabled by defining ZSTD_DISABLE_ASM
|
|
* - Assembly is supported
|
|
* - We are compiling for x86-64 and either:
|
|
* - DYNAMIC_BMI2 is enabled
|
|
* - BMI2 is supported at compile time
|
|
*/
|
|
#define ZSTD_ENABLE_ASM_X86_64_BMI2 0
|
|
|
|
/*
|
|
* For x86 ELF targets, add .note.gnu.property section for Intel CET in
|
|
* assembly sources when CET is enabled.
|
|
*
|
|
* Additionally, any function that may be called indirectly must begin
|
|
* with ZSTD_CET_ENDBRANCH.
|
|
*/
|
|
#if defined(__ELF__) && (defined(__x86_64__) || defined(__i386__)) \
|
|
&& defined(__has_include)
|
|
# if __has_include(<cet.h>)
|
|
# include <cet.h>
|
|
# define ZSTD_CET_ENDBRANCH _CET_ENDBR
|
|
# endif
|
|
#endif
|
|
|
|
#ifndef ZSTD_CET_ENDBRANCH
|
|
# define ZSTD_CET_ENDBRANCH
|
|
#endif
|
|
|
|
#endif /* ZSTD_PORTABILITY_MACROS_H */
|