Skip to content

m1721: backport new zstd from linux mainline #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
urain39 wants to merge 17 commits into
base: lineage-19.1
Choose a base branch
from
Open

m1721: backport new zstd from linux mainline #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
8747cd9
lib: zstd: clean up Makefile for simpler composite object handling
masahir0y Mar 19, 2018
44c5fbb
lib: zstd: Mark expected switch fall-throughs
GustavoARSilva Jan 25, 2019
3c3eb24
lib/zstd/mem.h: replace __inline by inline
Villemoes Sep 12, 2019
600b89d
lib: Prepare zstd for preboot environment, improve performance
terrelln Jul 30, 2020
231d526
lib: Add zstd support to decompress
terrelln Jul 30, 2020
ead639a
lib: decompress_unzstd: Limit output size
pcercuei Sep 1, 2020
32ce78b
lib/zstd: convert constants to defines
lorddoskias Jan 22, 2021
32c5d46
lib: zstd: Add kernel-specific API
terrelln Sep 11, 2020
7372c09
lib: zstd: Add decompress_sources.h for decompress_unzstd
terrelln Sep 14, 2020
a8389aa
lib: zstd: Upgrade to latest upstream zstd version 1.4.10
terrelln Sep 11, 2020
c6cbd15
lib: zstd: Add cast to silence clang's -Wbitwise-instead-of-logical
nathanchance Oct 21, 2021
4bbbb8c
lib: zstd: Fix unused variable warning
terrelln Nov 16, 2021
6f0a83d
lib: zstd: Don't inline functions in zstd_opt.c
terrelln Nov 16, 2021
3e0b859
lib: zstd: Don't add -O3 to cflags
terrelln Nov 16, 2021
2561c1e
lib/zstd: make compiler happy
urain39 Jul 8, 2022
7bc16e5
m1721: add CONFIG_CRYPTO_ZSTD=y
urain39 Jul 11, 2022
0deb072
crypto/zstd.c: ZSTD_DEF_LEVEL swtich to 1
urain39 Jul 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions arch/arm64/configs/m1721_defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,6 +694,7 @@ CONFIG_CRYPTO_GCM=y
CONFIG_CRYPTO_XCBC=y
CONFIG_CRYPTO_TWOFISH=y
CONFIG_CRYPTO_LZO=y
CONFIG_CRYPTO_ZSTD=y
CONFIG_CRYPTO_ANSI_CPRNG=y
CONFIG_CRYPTO_DEV_QCOM_MSM_QCE=y
CONFIG_CRYPTO_DEV_QCRYPTO=y
Expand Down
30 changes: 15 additions & 15 deletions crypto/zstd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,33 +22,33 @@
#include <linux/zstd.h>


#define ZSTD_DEF_LEVEL 3
#define ZSTD_DEF_LEVEL 1

struct zstd_ctx {
ZSTD_CCtx *cctx;
ZSTD_DCtx *dctx;
zstd_cctx *cctx;
zstd_dctx *dctx;
void *cwksp;
void *dwksp;
};

static ZSTD_parameters zstd_params(void)
static zstd_parameters zstd_params(void)
{
return ZSTD_getParams(ZSTD_DEF_LEVEL, 0, 0);
return zstd_get_params(ZSTD_DEF_LEVEL, 0);
}

static int zstd_comp_init(struct zstd_ctx *ctx)
{
int ret = 0;
const ZSTD_parameters params = zstd_params();
const size_t wksp_size = ZSTD_CCtxWorkspaceBound(params.cParams);
const zstd_parameters params = zstd_params();
const size_t wksp_size = zstd_cctx_workspace_bound(&params.cParams);

ctx->cwksp = vzalloc(wksp_size);
if (!ctx->cwksp) {
ret = -ENOMEM;
goto out;
}

ctx->cctx = ZSTD_initCCtx(ctx->cwksp, wksp_size);
ctx->cctx = zstd_init_cctx(ctx->cwksp, wksp_size);
if (!ctx->cctx) {
ret = -EINVAL;
goto out_free;
Expand All @@ -63,15 +63,15 @@ static int zstd_comp_init(struct zstd_ctx *ctx)
static int zstd_decomp_init(struct zstd_ctx *ctx)
{
int ret = 0;
const size_t wksp_size = ZSTD_DCtxWorkspaceBound();
const size_t wksp_size = zstd_dctx_workspace_bound();

ctx->dwksp = vzalloc(wksp_size);
if (!ctx->dwksp) {
ret = -ENOMEM;
goto out;
}

ctx->dctx = ZSTD_initDCtx(ctx->dwksp, wksp_size);
ctx->dctx = zstd_init_dctx(ctx->dwksp, wksp_size);
if (!ctx->dctx) {
ret = -EINVAL;
goto out_free;
Expand Down Expand Up @@ -135,10 +135,10 @@ static int __zstd_compress(const u8 *src, unsigned int slen,
{
size_t out_len;
struct zstd_ctx *zctx = ctx;
const ZSTD_parameters params = zstd_params();
const zstd_parameters params = zstd_params();

out_len = ZSTD_compressCCtx(zctx->cctx, dst, *dlen, src, slen, params);
if (ZSTD_isError(out_len))
out_len = zstd_compress_cctx(zctx->cctx, dst, *dlen, src, slen, &params);
if (zstd_is_error(out_len))
return -EINVAL;
*dlen = out_len;
return 0;
Expand All @@ -158,8 +158,8 @@ static int __zstd_decompress(const u8 *src, unsigned int slen,
size_t out_len;
struct zstd_ctx *zctx = ctx;

out_len = ZSTD_decompressDCtx(zctx->dctx, dst, *dlen, src, slen);
if (ZSTD_isError(out_len))
out_len = zstd_decompress_dctx(zctx->dctx, dst, *dlen, src, slen);
if (zstd_is_error(out_len))
return -EINVAL;
*dlen = out_len;
return 0;
Expand Down
11 changes: 11 additions & 0 deletions include/linux/decompress/unzstd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef LINUX_DECOMPRESS_UNZSTD_H
#define LINUX_DECOMPRESS_UNZSTD_H

int unzstd(unsigned char *inbuf, long len,
long (*fill)(void*, unsigned long),
long (*flush)(void*, unsigned long),
unsigned char *output,
long *pos,
void (*error_fn)(char *x));
#endif
Loading