Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-16 09:54:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fs: ubifs: Add support for ZSTD decompression

Browse source 
ZSTD can be a better tradeoff between NAND IO operations and decompression
speed giving a better boot time.

Signed-off-by: Piotr Wojtaszczyk <piotr.wojtaszczyk@timesys.com>
Reviewed-by: Heiko Schocher <hs@denx.de>
This commit is contained in:
Piotr Wojtaszczyk 2024-05-28 17:05:28 +02:00 • committed by Heiko Schocher
parent 65fbdab272
commit fd08324632
2 changed files with 53 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs/ubifs/ubifs-media.h
View file

@ -320,12 +320,14 @@ enum {
* UBIFS_COMPR_NONE: no compression * UBIFS_COMPR_NONE: no compression
* UBIFS_COMPR_LZO: LZO compression * UBIFS_COMPR_LZO: LZO compression
* UBIFS_COMPR_ZLIB: ZLIB compression * UBIFS_COMPR_ZLIB: ZLIB compression
* UBIFS_COMPR_ZSTD: ZSTD compression
* UBIFS_COMPR_TYPES_CNT: count of supported compression types * UBIFS_COMPR_TYPES_CNT: count of supported compression types
*/ */
enum { enum {
UBIFS_COMPR_NONE, UBIFS_COMPR_NONE,
UBIFS_COMPR_LZO, UBIFS_COMPR_LZO,
UBIFS_COMPR_ZLIB, UBIFS_COMPR_ZLIB,
UBIFS_COMPR_ZSTD,
UBIFS_COMPR_TYPES_CNT, UBIFS_COMPR_TYPES_CNT,
}; };

53
fs/ubifs/ubifs.c
View file

@ -26,6 +26,11 @@
#include <linux/err.h> #include <linux/err.h>
#include <linux/lzo.h> #include <linux/lzo.h>
#if IS_ENABLED(CONFIG_ZSTD)
#include <linux/zstd.h>
#include <abuf.h>
#endif
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
/* compress.c */ /* compress.c */
@ -41,6 +46,25 @@ static int gzip_decompress(const unsigned char *in, size_t in_len,
(unsigned long *)out_len, 0, 0); (unsigned long *)out_len, 0, 0);
} }
#if IS_ENABLED(CONFIG_ZSTD)
static int zstd_decompress_wrapper(const unsigned char *in, size_t in_len,
unsigned char *out, size_t *out_len)
{
struct abuf abuf_in, abuf_out;
int ret;
abuf_init_set(&abuf_in, (void *)in, in_len);
abuf_init_set(&abuf_out, (void *)out, *out_len);
ret = zstd_decompress(&abuf_in, &abuf_out);
if (ret < 0)
return ret;
*out_len = ret;
return 0;
}
#endif
/* Fake description object for the "none" compressor */ /* Fake description object for the "none" compressor */
static struct ubifs_compressor none_compr = { static struct ubifs_compressor none_compr = {
.compr_type = UBIFS_COMPR_NONE, .compr_type = UBIFS_COMPR_NONE,
@ -70,8 +94,21 @@ static struct ubifs_compressor zlib_compr = {
.decompress = gzip_decompress, .decompress = gzip_decompress,
}; };
#if IS_ENABLED(CONFIG_ZSTD)
static struct ubifs_compressor zstd_compr = {
.compr_type = UBIFS_COMPR_ZSTD,
#ifndef __UBOOT__
.comp_mutex = &zstd_enc_mutex,
.decomp_mutex = &zstd_dec_mutex,
#endif
.name = "zstd",
.capi_name = "zstd",
.decompress = zstd_decompress_wrapper,
};
#endif
/* All UBIFS compressors */ /* All UBIFS compressors */
struct ubifs_compressor *ubifs_compressors[UBIFS_COMPR_TYPES_CNT]; struct ubifs_compressor *ubifs_compressors[UBIFS_COMPR_TYPES_CNT] = {NULL};
#ifdef __UBOOT__ #ifdef __UBOOT__
@ -165,8 +202,14 @@ int ubifs_decompress(const struct ubifs_info *c, const void *in_buf,
compr = ubifs_compressors[compr_type]; compr = ubifs_compressors[compr_type];
if (unlikely(!compr)) {
ubifs_err(c, "compression type %d is not compiled in", compr_type);
return -EINVAL;
}
if (unlikely(!compr->capi_name)) { if (unlikely(!compr->capi_name)) {
ubifs_err(c, "%s compression is not compiled in", compr->name); ubifs_err(c, "%s compression is not compiled in",
compr->name ? compr->name : "unknown");
return -EINVAL; return -EINVAL;
} }
@ -231,6 +274,12 @@ int __init ubifs_compressors_init(void)
if (err) if (err)
return err; return err;
#if IS_ENABLED(CONFIG_ZSTD)
err = compr_init(&zstd_compr);
if (err)
return err;
#endif
err = compr_init(&none_compr); err = compr_init(&none_compr);
if (err) if (err)
return err; return err;