mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 10:40:15 +02:00 
			
		
		
		
	Updates the kernel's zstd library to v1.5.2, the latest zstd release. The upstream tag it is updated to is `v1.5.2-kernel`, which contains several cherry-picked commits on top of the v1.5.2 release which are required for the kernel update. I will create this tag once the PR is ready to merge, until then reference the temporary upstream branch `v1.5.2-kernel-cherrypicks`. I plan to submit this patch as part of the v6.2 merge window. I've done basic build testing & testing on x86-64, i386, and aarch64. I'm merging these patches into my `zstd-next` branch, which is pulled into `linux-next` for further testing. I've benchmarked BtrFS with zstd compression on a x86-64 machine, and saw these results. Decompression speed is a small win across the board. The lower compression levels 1-4 see both compression speed and compression ratio wins. The higher compression levels see a small compression speed loss and about neutral ratio. I expect the lower compression levels to be used much more heavily than the high compression levels, so this should be a net win. Level CTime DTime Ratio 1 -2.95% -1.1% -0.7% 3 -3.5% -1.2% -0.5% 5 +3.7% -1.0% +0.0% 7 +3.2% -0.9% +0.0% 9 -4.3% -0.8% +0.1% Signed-off-by: Nick Terrell <terrelln@fb.com>
		
			
				
	
	
		
			164 lines
		
	
	
	
		
			4.9 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			164 lines
		
	
	
	
		
			4.9 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.
 | 
						|
 */
 | 
						|
 | 
						|
#include <linux/kernel.h>
 | 
						|
#include <linux/module.h>
 | 
						|
#include <linux/string.h>
 | 
						|
#include <linux/zstd.h>
 | 
						|
 | 
						|
#include "common/zstd_deps.h"
 | 
						|
#include "common/zstd_internal.h"
 | 
						|
 | 
						|
#define ZSTD_FORWARD_IF_ERR(ret)            \
 | 
						|
	do {                                \
 | 
						|
		size_t const __ret = (ret); \
 | 
						|
		if (ZSTD_isError(__ret))    \
 | 
						|
			return __ret;       \
 | 
						|
	} while (0)
 | 
						|
 | 
						|
static size_t zstd_cctx_init(zstd_cctx *cctx, const zstd_parameters *parameters,
 | 
						|
	unsigned long long pledged_src_size)
 | 
						|
{
 | 
						|
	ZSTD_FORWARD_IF_ERR(ZSTD_CCtx_reset(
 | 
						|
		cctx, ZSTD_reset_session_and_parameters));
 | 
						|
	ZSTD_FORWARD_IF_ERR(ZSTD_CCtx_setPledgedSrcSize(
 | 
						|
		cctx, pledged_src_size));
 | 
						|
	ZSTD_FORWARD_IF_ERR(ZSTD_CCtx_setParameter(
 | 
						|
		cctx, ZSTD_c_windowLog, parameters->cParams.windowLog));
 | 
						|
	ZSTD_FORWARD_IF_ERR(ZSTD_CCtx_setParameter(
 | 
						|
		cctx, ZSTD_c_hashLog, parameters->cParams.hashLog));
 | 
						|
	ZSTD_FORWARD_IF_ERR(ZSTD_CCtx_setParameter(
 | 
						|
		cctx, ZSTD_c_chainLog, parameters->cParams.chainLog));
 | 
						|
	ZSTD_FORWARD_IF_ERR(ZSTD_CCtx_setParameter(
 | 
						|
		cctx, ZSTD_c_searchLog, parameters->cParams.searchLog));
 | 
						|
	ZSTD_FORWARD_IF_ERR(ZSTD_CCtx_setParameter(
 | 
						|
		cctx, ZSTD_c_minMatch, parameters->cParams.minMatch));
 | 
						|
	ZSTD_FORWARD_IF_ERR(ZSTD_CCtx_setParameter(
 | 
						|
		cctx, ZSTD_c_targetLength, parameters->cParams.targetLength));
 | 
						|
	ZSTD_FORWARD_IF_ERR(ZSTD_CCtx_setParameter(
 | 
						|
		cctx, ZSTD_c_strategy, parameters->cParams.strategy));
 | 
						|
	ZSTD_FORWARD_IF_ERR(ZSTD_CCtx_setParameter(
 | 
						|
		cctx, ZSTD_c_contentSizeFlag, parameters->fParams.contentSizeFlag));
 | 
						|
	ZSTD_FORWARD_IF_ERR(ZSTD_CCtx_setParameter(
 | 
						|
		cctx, ZSTD_c_checksumFlag, parameters->fParams.checksumFlag));
 | 
						|
	ZSTD_FORWARD_IF_ERR(ZSTD_CCtx_setParameter(
 | 
						|
		cctx, ZSTD_c_dictIDFlag, !parameters->fParams.noDictIDFlag));
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
int zstd_min_clevel(void)
 | 
						|
{
 | 
						|
	return ZSTD_minCLevel();
 | 
						|
}
 | 
						|
EXPORT_SYMBOL(zstd_min_clevel);
 | 
						|
 | 
						|
int zstd_max_clevel(void)
 | 
						|
{
 | 
						|
	return ZSTD_maxCLevel();
 | 
						|
}
 | 
						|
EXPORT_SYMBOL(zstd_max_clevel);
 | 
						|
 | 
						|
size_t zstd_compress_bound(size_t src_size)
 | 
						|
{
 | 
						|
	return ZSTD_compressBound(src_size);
 | 
						|
}
 | 
						|
EXPORT_SYMBOL(zstd_compress_bound);
 | 
						|
 | 
						|
zstd_parameters zstd_get_params(int level,
 | 
						|
	unsigned long long estimated_src_size)
 | 
						|
{
 | 
						|
	return ZSTD_getParams(level, estimated_src_size, 0);
 | 
						|
}
 | 
						|
EXPORT_SYMBOL(zstd_get_params);
 | 
						|
 | 
						|
size_t zstd_cctx_workspace_bound(const zstd_compression_parameters *cparams)
 | 
						|
{
 | 
						|
	return ZSTD_estimateCCtxSize_usingCParams(*cparams);
 | 
						|
}
 | 
						|
EXPORT_SYMBOL(zstd_cctx_workspace_bound);
 | 
						|
 | 
						|
zstd_cctx *zstd_init_cctx(void *workspace, size_t workspace_size)
 | 
						|
{
 | 
						|
	if (workspace == NULL)
 | 
						|
		return NULL;
 | 
						|
	return ZSTD_initStaticCCtx(workspace, workspace_size);
 | 
						|
}
 | 
						|
EXPORT_SYMBOL(zstd_init_cctx);
 | 
						|
 | 
						|
size_t zstd_compress_cctx(zstd_cctx *cctx, void *dst, size_t dst_capacity,
 | 
						|
	const void *src, size_t src_size, const zstd_parameters *parameters)
 | 
						|
{
 | 
						|
	ZSTD_FORWARD_IF_ERR(zstd_cctx_init(cctx, parameters, src_size));
 | 
						|
	return ZSTD_compress2(cctx, dst, dst_capacity, src, src_size);
 | 
						|
}
 | 
						|
EXPORT_SYMBOL(zstd_compress_cctx);
 | 
						|
 | 
						|
size_t zstd_cstream_workspace_bound(const zstd_compression_parameters *cparams)
 | 
						|
{
 | 
						|
	return ZSTD_estimateCStreamSize_usingCParams(*cparams);
 | 
						|
}
 | 
						|
EXPORT_SYMBOL(zstd_cstream_workspace_bound);
 | 
						|
 | 
						|
zstd_cstream *zstd_init_cstream(const zstd_parameters *parameters,
 | 
						|
	unsigned long long pledged_src_size, void *workspace, size_t workspace_size)
 | 
						|
{
 | 
						|
	zstd_cstream *cstream;
 | 
						|
 | 
						|
	if (workspace == NULL)
 | 
						|
		return NULL;
 | 
						|
 | 
						|
	cstream = ZSTD_initStaticCStream(workspace, workspace_size);
 | 
						|
	if (cstream == NULL)
 | 
						|
		return NULL;
 | 
						|
 | 
						|
	/* 0 means unknown in linux zstd API but means 0 in new zstd API */
 | 
						|
	if (pledged_src_size == 0)
 | 
						|
		pledged_src_size = ZSTD_CONTENTSIZE_UNKNOWN;
 | 
						|
 | 
						|
	if (ZSTD_isError(zstd_cctx_init(cstream, parameters, pledged_src_size)))
 | 
						|
		return NULL;
 | 
						|
 | 
						|
	return cstream;
 | 
						|
}
 | 
						|
EXPORT_SYMBOL(zstd_init_cstream);
 | 
						|
 | 
						|
size_t zstd_reset_cstream(zstd_cstream *cstream,
 | 
						|
	unsigned long long pledged_src_size)
 | 
						|
{
 | 
						|
	if (pledged_src_size == 0)
 | 
						|
		pledged_src_size = ZSTD_CONTENTSIZE_UNKNOWN;
 | 
						|
	ZSTD_FORWARD_IF_ERR( ZSTD_CCtx_reset(cstream, ZSTD_reset_session_only) );
 | 
						|
	ZSTD_FORWARD_IF_ERR( ZSTD_CCtx_setPledgedSrcSize(cstream, pledged_src_size) );
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
EXPORT_SYMBOL(zstd_reset_cstream);
 | 
						|
 | 
						|
size_t zstd_compress_stream(zstd_cstream *cstream, zstd_out_buffer *output,
 | 
						|
	zstd_in_buffer *input)
 | 
						|
{
 | 
						|
	return ZSTD_compressStream(cstream, output, input);
 | 
						|
}
 | 
						|
EXPORT_SYMBOL(zstd_compress_stream);
 | 
						|
 | 
						|
size_t zstd_flush_stream(zstd_cstream *cstream, zstd_out_buffer *output)
 | 
						|
{
 | 
						|
	return ZSTD_flushStream(cstream, output);
 | 
						|
}
 | 
						|
EXPORT_SYMBOL(zstd_flush_stream);
 | 
						|
 | 
						|
size_t zstd_end_stream(zstd_cstream *cstream, zstd_out_buffer *output)
 | 
						|
{
 | 
						|
	return ZSTD_endStream(cstream, output);
 | 
						|
}
 | 
						|
EXPORT_SYMBOL(zstd_end_stream);
 | 
						|
 | 
						|
MODULE_LICENSE("Dual BSD/GPL");
 | 
						|
MODULE_DESCRIPTION("Zstd Compressor");
 |