| Message ID | 349a78bc53d3620a29cc6105b55985db51aa0a11.1741954523.git.herbert@gondor.apana.org.au (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | crypto: acomp - Add virtual address and folio support | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Guessing tree name failed - patch did not apply |
在 2025/3/14 20:22, Herbert Xu 写道: > Replace the legacy crypto compression interface with the new acomp > interface. > > Remove the compression mutexes and the overallocation for memory > (the offender LZO has been fixed). > > Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> > --- > fs/ubifs/compress.c | 116 ++++++++++++++++++++++++++++---------------- > fs/ubifs/journal.c | 2 +- > fs/ubifs/ubifs.h | 15 +----- > 3 files changed, 77 insertions(+), 56 deletions(-) > > diff --git a/fs/ubifs/compress.c b/fs/ubifs/compress.c > index 0b48cbab8a3d..9046e796876d 100644 > --- a/fs/ubifs/compress.c > +++ b/fs/ubifs/compress.c > @@ -15,7 +15,7 @@ > * decompression. > */ > > -#include <linux/crypto.h> > +#include <crypto/acompress.h> > #include "ubifs.h" > > /* Fake description object for the "none" compressor */ > @@ -26,11 +26,8 @@ static struct ubifs_compressor none_compr = { > }; > > #ifdef CONFIG_UBIFS_FS_LZO > -static DEFINE_MUTEX(lzo_mutex); > - > static struct ubifs_compressor lzo_compr = { > .compr_type = UBIFS_COMPR_LZO, > - .comp_mutex = &lzo_mutex, > .name = "lzo", > .capi_name = "lzo", > }; > @@ -42,13 +39,8 @@ static struct ubifs_compressor lzo_compr = { > #endif > > #ifdef CONFIG_UBIFS_FS_ZLIB > -static DEFINE_MUTEX(deflate_mutex); > -static DEFINE_MUTEX(inflate_mutex); > - > static struct ubifs_compressor zlib_compr = { > .compr_type = UBIFS_COMPR_ZLIB, > - .comp_mutex = &deflate_mutex, > - .decomp_mutex = &inflate_mutex, > .name = "zlib", > .capi_name = "deflate", > }; > @@ -60,13 +52,8 @@ static struct ubifs_compressor zlib_compr = { > #endif > > #ifdef CONFIG_UBIFS_FS_ZSTD > -static DEFINE_MUTEX(zstd_enc_mutex); > -static DEFINE_MUTEX(zstd_dec_mutex); > - > static struct ubifs_compressor zstd_compr = { > .compr_type = UBIFS_COMPR_ZSTD, > - .comp_mutex = &zstd_enc_mutex, > - .decomp_mutex = &zstd_dec_mutex, > .name = "zstd", > .capi_name = "zstd", > }; > @@ -80,6 +67,40 @@ static struct ubifs_compressor zstd_compr = { > /* All UBIFS compressors */ > struct ubifs_compressor *ubifs_compressors[UBIFS_COMPR_TYPES_CNT]; > > +static int ubifs_compress_req(const struct ubifs_info *c, > + struct acomp_req *req, > + void *out_buf, int *out_len) > +{ > + struct crypto_wait wait; > + int in_len = req->slen; > + int err; > + > + crypto_init_wait(&wait); > + acomp_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG, > + crypto_req_done, &wait); > + acomp_request_set_dst_dma(req, out_buf, *out_len); > + err = crypto_acomp_compress(req); > + err = crypto_wait_req(err, &wait); > + *out_len = req->dlen; > + > + if (unlikely(err)) { > + ubifs_warn(c, "cannot compress %d bytes, compressor %s, error %d, leave data uncompressed", > + in_len, > + crypto_acomp_alg_name(crypto_acomp_reqtfm(req)), We get capi_name by 'crypto_acomp_alg_name(crypto_acomp_reqtfm(req))', not compr->name. There are conflicts in patch 2 on the latest mainline version, can you rebase this series so I can do some tests for UBIFS.
On Sat, Mar 15, 2025 at 11:54:43AM +0800, Zhihao Cheng wrote: > > We get capi_name by 'crypto_acomp_alg_name(crypto_acomp_reqtfm(req))', not > compr->name. It should return the same string. > There are conflicts in patch 2 on the latest mainline version, can you > rebase this series so I can do some tests for UBIFS. Thanks for testing! I've just pushed it to git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git acomp So you should be able to pull that to test. Cheers,
在 2025/3/15 12:03, Herbert Xu 写道: > On Sat, Mar 15, 2025 at 11:54:43AM +0800, Zhihao Cheng wrote: >> >> We get capi_name by 'crypto_acomp_alg_name(crypto_acomp_reqtfm(req))', not >> compr->name. > > It should return the same string. The crypto_acomp_alg_name() gets name from compr->cc(the name is initialized by compr->capi_name). I got the following messages after verifying: [ 154.907048] UBIFS warning (ubi0:0 pid 110): ubifs_compress_req.isra.0 [ubifs]: cannot compress 4096 bytes, compressor deflate, error -12, leave data uncompressed The 'deflate' is zlib compressor's capi_name, but we expect it be 'zlib' here. > >> There are conflicts in patch 2 on the latest mainline version, can you >> rebase this series so I can do some tests for UBIFS. > > Thanks for testing! I've just pushed it to > > git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git acomp > > So you should be able to pull that to test. > > Cheers, >
在 2025/3/14 20:22, Herbert Xu 写道: > Replace the legacy crypto compression interface with the new acomp > interface. > > Remove the compression mutexes and the overallocation for memory > (the offender LZO has been fixed). Hi, Herbert. Can you show me which patch fixed the problem in LZO? > > Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> > --- > fs/ubifs/compress.c | 116 ++++++++++++++++++++++++++++---------------- > fs/ubifs/journal.c | 2 +- > fs/ubifs/ubifs.h | 15 +----- > 3 files changed, 77 insertions(+), 56 deletions(-) > [...] > diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h > index 3375bbe0508c..7d0aaf5d2e23 100644 > --- a/fs/ubifs/ubifs.h > +++ b/fs/ubifs/ubifs.h > @@ -124,13 +124,6 @@ > #define OLD_ZNODE_AGE 20 > #define YOUNG_ZNODE_AGE 5 > > -/* > - * Some compressors, like LZO, may end up with more data then the input buffer. > - * So UBIFS always allocates larger output buffer, to be sure the compressor > - * will not corrupt memory in case of worst case compression. > - */ > -#define WORST_COMPR_FACTOR 2 Does LZO guarantee the output data length smaller than input buffer length? Which commit fixed the issue? > - > #ifdef CONFIG_FS_ENCRYPTION > #define UBIFS_CIPHER_BLOCK_SIZE FSCRYPT_CONTENTS_ALIGNMENT > #else
On Sat, Mar 15, 2025 at 01:08:21PM +0800, Zhihao Cheng wrote: > > The crypto_acomp_alg_name() gets name from compr->cc(the name is initialized > by compr->capi_name). > I got the following messages after verifying: > [ 154.907048] UBIFS warning (ubi0:0 pid 110): ubifs_compress_req.isra.0 > [ubifs]: cannot compress 4096 bytes, compressor deflate, error -12, leave > data uncompressed > > The 'deflate' is zlib compressor's capi_name, but we expect it be 'zlib' > here. Sorry I overlooked this difference. I will fold the following patch into the series when I repost. Thanks, diff --git a/fs/ubifs/compress.c b/fs/ubifs/compress.c index 9973a2853de7..8d481c8338c3 100644 --- a/fs/ubifs/compress.c +++ b/fs/ubifs/compress.c @@ -70,7 +70,8 @@ struct ubifs_compressor *ubifs_compressors[UBIFS_COMPR_TYPES_CNT]; static int ubifs_compress_req(const struct ubifs_info *c, struct acomp_req *req, - void *out_buf, int *out_len) + void *out_buf, int *out_len, + const char *compr_name) { struct crypto_wait wait; int in_len = req->slen; @@ -86,9 +87,7 @@ static int ubifs_compress_req(const struct ubifs_info *c, if (unlikely(err)) { ubifs_warn(c, "cannot compress %d bytes, compressor %s, error %d, leave data uncompressed", - in_len, - crypto_acomp_alg_name(crypto_acomp_reqtfm(req)), - err); + in_len, compr_name, err); } else if (in_len - *out_len < UBIFS_MIN_COMPRESS_DIFF) { /* * If the data compressed only slightly, it is better @@ -138,7 +137,7 @@ void ubifs_compress(const struct ubifs_info *c, const void *in_buf, ACOMP_REQUEST_ALLOC(req, compr->cc, GFP_NOFS | __GFP_NOWARN); acomp_request_set_src_dma(req, in_buf, in_len); - err = ubifs_compress_req(c, req, out_buf, out_len); + err = ubifs_compress_req(c, req, out_buf, out_len, compr->name); } if (err) @@ -190,7 +189,7 @@ void ubifs_compress_folio(const struct ubifs_info *c, struct folio *in_folio, ACOMP_REQUEST_ALLOC(req, compr->cc, GFP_NOFS | __GFP_NOWARN); acomp_request_set_src_folio(req, in_folio, in_offset, in_len); - err = ubifs_compress_req(c, req, out_buf, out_len); + err = ubifs_compress_req(c, req, out_buf, out_len, compr->name); } if (err) @@ -206,7 +205,8 @@ void ubifs_compress_folio(const struct ubifs_info *c, struct folio *in_folio, static int ubifs_decompress_req(const struct ubifs_info *c, struct acomp_req *req, - const void *in_buf, int in_len, int *out_len) + const void *in_buf, int in_len, int *out_len, + const char *compr_name) { struct crypto_wait wait; int err; @@ -221,9 +221,7 @@ static int ubifs_decompress_req(const struct ubifs_info *c, if (err) ubifs_err(c, "cannot decompress %d bytes, compressor %s, error %d", - in_len, - crypto_acomp_alg_name(crypto_acomp_reqtfm(req)), - err); + in_len, compr_name, err); acomp_request_free(req); @@ -270,7 +268,8 @@ int ubifs_decompress(const struct ubifs_info *c, const void *in_buf, ACOMP_REQUEST_ALLOC(req, compr->cc, GFP_NOFS | __GFP_NOWARN); acomp_request_set_dst_dma(req, out_buf, *out_len); - return ubifs_decompress_req(c, req, in_buf, in_len, out_len); + return ubifs_decompress_req(c, req, in_buf, in_len, out_len, + compr->name); } } @@ -318,7 +317,8 @@ int ubifs_decompress_folio(const struct ubifs_info *c, const void *in_buf, acomp_request_set_dst_folio(req, out_folio, out_offset, *out_len); - return ubifs_decompress_req(c, req, in_buf, in_len, out_len); + return ubifs_decompress_req(c, req, in_buf, in_len, out_len, + compr->name); } }
On Sat, Mar 15, 2025 at 01:15:09PM +0800, Zhihao Cheng wrote: > > Hi, Herbert. Can you show me which patch fixed the problem in LZO? https://web.git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git/commit/?id=cc47f07234f72cbd8e2c973cdbf2a6730660a463 > Does LZO guarantee the output data length smaller than input buffer length? > Which commit fixed the issue? The guarantee is that the algorithm will not write to the output buffer beyond the specific buffer length. For compression, you may specify a desired output length that is smaller than the input buffer, automatically stopping the compression if the input is incompressible. Cheers,
在 2025/3/14 20:22, Herbert Xu 写道: > Replace the legacy crypto compression interface with the new acomp > interface. > > Remove the compression mutexes and the overallocation for memory > (the offender LZO has been fixed). > > Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> > --- > fs/ubifs/compress.c | 116 ++++++++++++++++++++++++++++---------------- > fs/ubifs/journal.c | 2 +- > fs/ubifs/ubifs.h | 15 +----- > 3 files changed, 77 insertions(+), 56 deletions(-) > Hi, Herbert, I got some warning messages while running xfstests, it looks like the compressor returns error code. [ 397.971086] run fstests generic/103 at 2025-03-15 16:48:29 [ 398.182347] run fstests generic/104 at 2025-03-15 16:48:29 [ 398.396986] run fstests generic/105 at 2025-03-15 16:48:29 [ 398.602640] run fstests generic/106 at 2025-03-15 16:48:29 [ 398.816819] run fstests generic/107 at 2025-03-15 16:48:30 [ 399.032602] run fstests generic/108 at 2025-03-15 16:48:30 [ 399.271669] run fstests generic/109 at 2025-03-15 16:48:30 [ 399.449228] UBIFS (ubi1:0): default file-system created [ 399.449257] UBIFS (ubi1:0): Mounting in unauthenticated mode [ 399.449359] UBIFS (ubi1:0): background thread "ubifs_bgt1_0" started, PID 1703 [ 399.449876] UBIFS (ubi1:0): UBIFS: mounted UBI device 1, volume 0, name "vol_a" [ 399.449882] UBIFS (ubi1:0): LEB size: 129024 bytes (126 KiB), min./max. I/O unit sizes: 2048 bytes/2048 bytes [ 399.449886] UBIFS (ubi1:0): FS size: 220631040 bytes (210 MiB, 1710 LEBs), max 1722 LEBs, journal size 11096064 bytes (10 MiB, 86 LEBs) [ 399.449890] UBIFS (ubi1:0): reserved for root: 4952683 bytes (4836 KiB) [ 399.449892] UBIFS (ubi1:0): media format: w5/r0 (latest is w5/r0), UUID 56E8FEFD-CF25-445D-9159-BE65FC10EC9B, small LPT model [ 399.449904] UBIFS (ubi1:0): full atime support is enabled. [ 400.054087] UBIFS warning (ubi0:0 pid 110): ubifs_compress_req [ubifs]: cannot compress 4096 bytes, compressor zstd, error -22, leave data uncompressed [ 400.055631] UBIFS warning (ubi0:0 pid 110): ubifs_compress_req [ubifs]: cannot compress 4096 bytes, compressor zstd, error -22, leave data uncompressed [ 400.057137] UBIFS warning (ubi0:0 pid 110): ubifs_compress_req [ubifs]: cannot compress 4096 bytes, compressor zstd, error -22, leave data uncompressed [ 400.058760] UBIFS warning (ubi0:0 pid 110): ubifs_compress_req [ubifs]: cannot compress 4096 bytes, compressor zstd, error -22, leave data uncompressed
On Sat, Mar 15, 2025 at 04:58:31PM +0800, Zhihao Cheng wrote: > > Hi, Herbert, I got some warning messages while running xfstests, it looks > like the compressor returns error code. Yes this is expected as incompressible data will now show up as errors since we reduced the output buffer size due to LZO getting fixed. I'll silence that warning. There are no reasons why compression should fail, other than the data being incompressible. Thanks,
在 2025/3/15 17:02, Herbert Xu 写道: > On Sat, Mar 15, 2025 at 04:58:31PM +0800, Zhihao Cheng wrote: >> >> Hi, Herbert, I got some warning messages while running xfstests, it looks >> like the compressor returns error code. > > Yes this is expected as incompressible data will now show up as > errors since we reduced the output buffer size due to LZO getting > fixed. I'll silence that warning. According to the warning message, current compressor is zstd. The output buffer size is limited only for LZO compressor by [1]. ubifs_compress_req [ubifs]: cannot compress 4096 bytes, compressor zstd, error -22, leave data uncompressed [1] https://web.git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git/commit/?id=cc47f07234f72cbd8e2c973cdbf2a6730660a463 > > There are no reasons why compression should fail, other than the > data being incompressible. > > Thanks, >
On Sat, Mar 15, 2025 at 05:08:47PM +0800, Zhihao Cheng wrote: > > According to the warning message, current compressor is zstd. The output > buffer size is limited only for LZO compressor by [1]. Any algorithm can and will produce output longer than the input, if you give it enough output buffer. Previously an output buffer length of 2x the input length was given to all algorithms, meaning that they would all succeed no matter whether the input can be compressed or not. This has now been changed so that incompressible data is not needlessly compressed all the way to the end. In fact we should reduce it further to eliminate the UBIFS_MIN_COMPRESS_DIFF check. I will remove the warning on compression since failures are expected and reduce the output buffer length further to remove the post-compression length check. Thanks,
在 2025/3/15 17:12, Herbert Xu 写道: > On Sat, Mar 15, 2025 at 05:08:47PM +0800, Zhihao Cheng wrote: >> >> According to the warning message, current compressor is zstd. The output >> buffer size is limited only for LZO compressor by [1]. > > Any algorithm can and will produce output longer than the input, > if you give it enough output buffer. > > Previously an output buffer length of 2x the input length was given > to all algorithms, meaning that they would all succeed no matter > whether the input can be compressed or not. > > This has now been changed so that incompressible data is not > needlessly compressed all the way to the end. In fact we should > reduce it further to eliminate the UBIFS_MIN_COMPRESS_DIFF check. Ah, I get it. Thanks for reminding, and I verify that the root cause is the output buffer becomes smaller. > > I will remove the warning on compression since failures are > expected and reduce the output buffer length further to remove > the post-compression length check. > I think we should keep the warning, it would be better to distinguish the different error types.
On Sat, Mar 15, 2025 at 05:27:22PM +0800, Zhihao Cheng wrote: > > I think we should keep the warning, it would be better to distinguish the > different error types. Unfortunately that requires quite a bit of work. If you would like to restore the warning you will need to modify each algorithm implementation to return a consistent error. Right now it's all over the place. Thanks,
On Sat, Mar 15, 2025 at 05:32:27PM +0800, Herbert Xu wrote: > > Unfortunately that requires quite a bit of work. If you would > like to restore the warning you will need to modify each algorithm > implementation to return a consistent error. Right now it's all > over the place. Of course if you really want to keep the warning, then I can just restore the existing worst-case output length so that even incompressible data will succeed. Cheers,
diff --git a/fs/ubifs/compress.c b/fs/ubifs/compress.c index 0b48cbab8a3d..9046e796876d 100644 --- a/fs/ubifs/compress.c +++ b/fs/ubifs/compress.c @@ -15,7 +15,7 @@ * decompression. */ -#include <linux/crypto.h> +#include <crypto/acompress.h> #include "ubifs.h" /* Fake description object for the "none" compressor */ @@ -26,11 +26,8 @@ static struct ubifs_compressor none_compr = { }; #ifdef CONFIG_UBIFS_FS_LZO -static DEFINE_MUTEX(lzo_mutex); - static struct ubifs_compressor lzo_compr = { .compr_type = UBIFS_COMPR_LZO, - .comp_mutex = &lzo_mutex, .name = "lzo", .capi_name = "lzo", }; @@ -42,13 +39,8 @@ static struct ubifs_compressor lzo_compr = { #endif #ifdef CONFIG_UBIFS_FS_ZLIB -static DEFINE_MUTEX(deflate_mutex); -static DEFINE_MUTEX(inflate_mutex); - static struct ubifs_compressor zlib_compr = { .compr_type = UBIFS_COMPR_ZLIB, - .comp_mutex = &deflate_mutex, - .decomp_mutex = &inflate_mutex, .name = "zlib", .capi_name = "deflate", }; @@ -60,13 +52,8 @@ static struct ubifs_compressor zlib_compr = { #endif #ifdef CONFIG_UBIFS_FS_ZSTD -static DEFINE_MUTEX(zstd_enc_mutex); -static DEFINE_MUTEX(zstd_dec_mutex); - static struct ubifs_compressor zstd_compr = { .compr_type = UBIFS_COMPR_ZSTD, - .comp_mutex = &zstd_enc_mutex, - .decomp_mutex = &zstd_dec_mutex, .name = "zstd", .capi_name = "zstd", }; @@ -80,6 +67,40 @@ static struct ubifs_compressor zstd_compr = { /* All UBIFS compressors */ struct ubifs_compressor *ubifs_compressors[UBIFS_COMPR_TYPES_CNT]; +static int ubifs_compress_req(const struct ubifs_info *c, + struct acomp_req *req, + void *out_buf, int *out_len) +{ + struct crypto_wait wait; + int in_len = req->slen; + int err; + + crypto_init_wait(&wait); + acomp_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG, + crypto_req_done, &wait); + acomp_request_set_dst_dma(req, out_buf, *out_len); + err = crypto_acomp_compress(req); + err = crypto_wait_req(err, &wait); + *out_len = req->dlen; + + if (unlikely(err)) { + ubifs_warn(c, "cannot compress %d bytes, compressor %s, error %d, leave data uncompressed", + in_len, + crypto_acomp_alg_name(crypto_acomp_reqtfm(req)), + err); + } else if (in_len - *out_len < UBIFS_MIN_COMPRESS_DIFF) { + /* + * If the data compressed only slightly, it is better + * to leave it uncompressed to improve read speed. + */ + err = -E2BIG; + } + + acomp_request_free(req); + + return err; +} + /** * ubifs_compress - compress data. * @c: UBIFS file-system description object @@ -112,23 +133,14 @@ void ubifs_compress(const struct ubifs_info *c, const void *in_buf, if (in_len < UBIFS_MIN_COMPR_LEN) goto no_compr; - if (compr->comp_mutex) - mutex_lock(compr->comp_mutex); - err = crypto_comp_compress(compr->cc, in_buf, in_len, out_buf, - (unsigned int *)out_len); - if (compr->comp_mutex) - mutex_unlock(compr->comp_mutex); - if (unlikely(err)) { - ubifs_warn(c, "cannot compress %d bytes, compressor %s, error %d, leave data uncompressed", - in_len, compr->name, err); - goto no_compr; + { + ACOMP_REQUEST_ALLOC(req, compr->cc, GFP_NOFS | __GFP_NOWARN); + + acomp_request_set_src_nondma(req, in_buf, in_len); + err = ubifs_compress_req(c, req, out_buf, out_len); } - /* - * If the data compressed only slightly, it is better to leave it - * uncompressed to improve read speed. - */ - if (in_len - *out_len < UBIFS_MIN_COMPRESS_DIFF) + if (err) goto no_compr; return; @@ -139,6 +151,32 @@ void ubifs_compress(const struct ubifs_info *c, const void *in_buf, *compr_type = UBIFS_COMPR_NONE; } +static int ubifs_decompress_req(const struct ubifs_info *c, + struct acomp_req *req, + const void *in_buf, int in_len, int *out_len) +{ + struct crypto_wait wait; + int err; + + crypto_init_wait(&wait); + acomp_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG, + crypto_req_done, &wait); + acomp_request_set_src_dma(req, in_buf, in_len); + err = crypto_acomp_decompress(req); + err = crypto_wait_req(err, &wait); + *out_len = req->dlen; + + if (err) + ubifs_err(c, "cannot decompress %d bytes, compressor %s, error %d", + in_len, + crypto_acomp_alg_name(crypto_acomp_reqtfm(req)), + err); + + acomp_request_free(req); + + return err; +} + /** * ubifs_decompress - decompress data. * @c: UBIFS file-system description object @@ -155,7 +193,6 @@ void ubifs_compress(const struct ubifs_info *c, const void *in_buf, int ubifs_decompress(const struct ubifs_info *c, const void *in_buf, int in_len, void *out_buf, int *out_len, int compr_type) { - int err; struct ubifs_compressor *compr; if (unlikely(compr_type < 0 || compr_type >= UBIFS_COMPR_TYPES_CNT)) { @@ -176,17 +213,12 @@ int ubifs_decompress(const struct ubifs_info *c, const void *in_buf, return 0; } - if (compr->decomp_mutex) - mutex_lock(compr->decomp_mutex); - err = crypto_comp_decompress(compr->cc, in_buf, in_len, out_buf, - (unsigned int *)out_len); - if (compr->decomp_mutex) - mutex_unlock(compr->decomp_mutex); - if (err) - ubifs_err(c, "cannot decompress %d bytes, compressor %s, error %d", - in_len, compr->name, err); + { + ACOMP_REQUEST_ALLOC(req, compr->cc, GFP_NOFS | __GFP_NOWARN); - return err; + acomp_request_set_dst_nondma(req, out_buf, *out_len); + return ubifs_decompress_req(c, req, in_buf, in_len, out_len); + } } /** @@ -199,7 +231,7 @@ int ubifs_decompress(const struct ubifs_info *c, const void *in_buf, static int __init compr_init(struct ubifs_compressor *compr) { if (compr->capi_name) { - compr->cc = crypto_alloc_comp(compr->capi_name, 0, 0); + compr->cc = crypto_alloc_acomp(compr->capi_name, 0, 0); if (IS_ERR(compr->cc)) { pr_err("UBIFS error (pid %d): cannot initialize compressor %s, error %ld", current->pid, compr->name, PTR_ERR(compr->cc)); @@ -218,7 +250,7 @@ static int __init compr_init(struct ubifs_compressor *compr) static void compr_exit(struct ubifs_compressor *compr) { if (compr->capi_name) - crypto_free_comp(compr->cc); + crypto_free_acomp(compr->cc); } /** diff --git a/fs/ubifs/journal.c b/fs/ubifs/journal.c index 36ba79fbd2ff..7629ca9ecfe8 100644 --- a/fs/ubifs/journal.c +++ b/fs/ubifs/journal.c @@ -1625,7 +1625,7 @@ static int truncate_data_node(const struct ubifs_info *c, const struct inode *in int err, dlen, compr_type, out_len, data_size; out_len = le32_to_cpu(dn->size); - buf = kmalloc_array(out_len, WORST_COMPR_FACTOR, GFP_NOFS); + buf = kmalloc(out_len, GFP_NOFS); if (!buf) return -ENOMEM; diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index 3375bbe0508c..7d0aaf5d2e23 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h @@ -124,13 +124,6 @@ #define OLD_ZNODE_AGE 20 #define YOUNG_ZNODE_AGE 5 -/* - * Some compressors, like LZO, may end up with more data then the input buffer. - * So UBIFS always allocates larger output buffer, to be sure the compressor - * will not corrupt memory in case of worst case compression. - */ -#define WORST_COMPR_FACTOR 2 - #ifdef CONFIG_FS_ENCRYPTION #define UBIFS_CIPHER_BLOCK_SIZE FSCRYPT_CONTENTS_ALIGNMENT #else @@ -141,7 +134,7 @@ * How much memory is needed for a buffer where we compress a data node. */ #define COMPRESSED_DATA_NODE_BUF_SZ \ - (UBIFS_DATA_NODE_SZ + UBIFS_BLOCK_SIZE * WORST_COMPR_FACTOR) + (UBIFS_DATA_NODE_SZ + UBIFS_BLOCK_SIZE) /* Maximum expected tree height for use by bottom_up_buf */ #define BOTTOM_UP_HEIGHT 64 @@ -835,16 +828,12 @@ struct ubifs_node_range { * struct ubifs_compressor - UBIFS compressor description structure. * @compr_type: compressor type (%UBIFS_COMPR_LZO, etc) * @cc: cryptoapi compressor handle - * @comp_mutex: mutex used during compression - * @decomp_mutex: mutex used during decompression * @name: compressor name * @capi_name: cryptoapi compressor name */ struct ubifs_compressor { int compr_type; - struct crypto_comp *cc; - struct mutex *comp_mutex; - struct mutex *decomp_mutex; + struct crypto_acomp *cc; const char *name; const char *capi_name; };
Replace the legacy crypto compression interface with the new acomp interface. Remove the compression mutexes and the overallocation for memory (the offender LZO has been fixed). Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> --- fs/ubifs/compress.c | 116 ++++++++++++++++++++++++++++---------------- fs/ubifs/journal.c | 2 +- fs/ubifs/ubifs.h | 15 +----- 3 files changed, 77 insertions(+), 56 deletions(-)