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>
122 lines
2.7 KiB
C
122 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 */
|