From: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
To: Sven Schmidt <4sschmid@informatik.uni-hamburg.de>
Cc: akpm@linux-foundation.org, bongkyu.kim@lge.com,
sergey.senozhatsky@gmail.com, gregkh@linuxfoundation.org,
linux-kernel@vger.kernel.org,
Herbert Xu <herbert@gondor.apana.org.au>,
linux-crypto@vger.kernel.org
Subject: Re: [PATCH 1/3] crypto: Change lz4 modules to work with new lz4 compressor module version
Date: Thu, 22 Dec 2016 22:25:16 +0900 [thread overview]
Message-ID: <20161222132516.GB413@tigerII.localdomain> (raw)
In-Reply-To: <1482259992-16680-2-git-send-email-4sschmid@informatik.uni-hamburg.de>
Cc Herbert and linux-crypto on this
https://marc.info/?l=linux-kernel&m=148226084823926
On (12/20/16 19:53), Sven Schmidt wrote:
>
> This patch updates the crypto modules using LZ4 compression to work with the
> new LZ4 kernel module version.
>
> Signed-off-by: Sven Schmidt <4sschmid@informatik.uni-hamburg.de>
> ---
> crypto/lz4.c | 93 +++++++--------------------------------------------------
> crypto/lz4hc.c | 94 +++++++---------------------------------------------------
> 2 files changed, 22 insertions(+), 165 deletions(-)
>
> diff --git a/crypto/lz4.c b/crypto/lz4.c
> index 99c1b2c..9fa217e 100644
> --- a/crypto/lz4.c
> +++ b/crypto/lz4.c
> @@ -23,53 +23,36 @@
> #include <linux/crypto.h>
> #include <linux/vmalloc.h>
> #include <linux/lz4.h>
> -#include <crypto/internal/scompress.h>
>
> struct lz4_ctx {
> void *lz4_comp_mem;
> };
>
> -static void *lz4_alloc_ctx(struct crypto_scomp *tfm)
> -{
> - void *ctx;
> -
> - ctx = vmalloc(LZ4_MEM_COMPRESS);
> - if (!ctx)
> - return ERR_PTR(-ENOMEM);
> -
> - return ctx;
> -}
> -
> static int lz4_init(struct crypto_tfm *tfm)
> {
> struct lz4_ctx *ctx = crypto_tfm_ctx(tfm);
>
> - ctx->lz4_comp_mem = lz4_alloc_ctx(NULL);
> - if (IS_ERR(ctx->lz4_comp_mem))
> + ctx->lz4_comp_mem = vmalloc(LZ4_MEM_COMPRESS);
> + if (!ctx->lz4_comp_mem)
> return -ENOMEM;
>
> return 0;
> }
>
> -static void lz4_free_ctx(struct crypto_scomp *tfm, void *ctx)
> -{
> - vfree(ctx);
> -}
> -
> static void lz4_exit(struct crypto_tfm *tfm)
> {
> struct lz4_ctx *ctx = crypto_tfm_ctx(tfm);
> -
> - lz4_free_ctx(NULL, ctx->lz4_comp_mem);
> + vfree(ctx->lz4_comp_mem);
> }
>
> -static int __lz4_compress_crypto(const u8 *src, unsigned int slen,
> - u8 *dst, unsigned int *dlen, void *ctx)
> +static int lz4_compress_crypto(struct crypto_tfm *tfm, const u8 *src,
> + unsigned int slen, u8 *dst, unsigned int *dlen)
> {
> + struct lz4_ctx *ctx = crypto_tfm_ctx(tfm);
> size_t tmp_len = *dlen;
> int err;
>
> - err = lz4_compress(src, slen, dst, &tmp_len, ctx);
> + err = LZ4_compress_default(src, dst, slen, tmp_len, ctx->lz4_comp_mem);
>
> if (err < 0)
> return -EINVAL;
> @@ -78,29 +61,14 @@ static int __lz4_compress_crypto(const u8 *src, unsigned int slen,
> return 0;
> }
>
> -static int lz4_scompress(struct crypto_scomp *tfm, const u8 *src,
> - unsigned int slen, u8 *dst, unsigned int *dlen,
> - void *ctx)
> -{
> - return __lz4_compress_crypto(src, slen, dst, dlen, ctx);
> -}
> -
> -static int lz4_compress_crypto(struct crypto_tfm *tfm, const u8 *src,
> - unsigned int slen, u8 *dst, unsigned int *dlen)
> -{
> - struct lz4_ctx *ctx = crypto_tfm_ctx(tfm);
> -
> - return __lz4_compress_crypto(src, slen, dst, dlen, ctx->lz4_comp_mem);
> -}
> -
> -static int __lz4_decompress_crypto(const u8 *src, unsigned int slen,
> - u8 *dst, unsigned int *dlen, void *ctx)
> +static int lz4_decompress_crypto(struct crypto_tfm *tfm, const u8 *src,
> + unsigned int slen, u8 *dst, unsigned int *dlen)
> {
> int err;
> size_t tmp_len = *dlen;
> size_t __slen = slen;
>
> - err = lz4_decompress_unknownoutputsize(src, __slen, dst, &tmp_len);
> + err = LZ4_decompress_safe(src, dst, __slen, tmp_len);
> if (err < 0)
> return -EINVAL;
>
> @@ -108,20 +76,6 @@ static int __lz4_decompress_crypto(const u8 *src, unsigned int slen,
> return err;
> }
>
> -static int lz4_sdecompress(struct crypto_scomp *tfm, const u8 *src,
> - unsigned int slen, u8 *dst, unsigned int *dlen,
> - void *ctx)
> -{
> - return __lz4_decompress_crypto(src, slen, dst, dlen, NULL);
> -}
> -
> -static int lz4_decompress_crypto(struct crypto_tfm *tfm, const u8 *src,
> - unsigned int slen, u8 *dst,
> - unsigned int *dlen)
> -{
> - return __lz4_decompress_crypto(src, slen, dst, dlen, NULL);
> -}
> -
> static struct crypto_alg alg_lz4 = {
> .cra_name = "lz4",
> .cra_flags = CRYPTO_ALG_TYPE_COMPRESS,
> @@ -135,39 +89,14 @@ static struct crypto_alg alg_lz4 = {
> .coa_decompress = lz4_decompress_crypto } }
> };
>
> -static struct scomp_alg scomp = {
> - .alloc_ctx = lz4_alloc_ctx,
> - .free_ctx = lz4_free_ctx,
> - .compress = lz4_scompress,
> - .decompress = lz4_sdecompress,
> - .base = {
> - .cra_name = "lz4",
> - .cra_driver_name = "lz4-scomp",
> - .cra_module = THIS_MODULE,
> - }
> -};
> -
> static int __init lz4_mod_init(void)
> {
> - int ret;
> -
> - ret = crypto_register_alg(&alg_lz4);
> - if (ret)
> - return ret;
> -
> - ret = crypto_register_scomp(&scomp);
> - if (ret) {
> - crypto_unregister_alg(&alg_lz4);
> - return ret;
> - }
> -
> - return ret;
> + return crypto_register_alg(&alg_lz4);
> }
>
> static void __exit lz4_mod_fini(void)
> {
> crypto_unregister_alg(&alg_lz4);
> - crypto_unregister_scomp(&scomp);
> }
>
> module_init(lz4_mod_init);
> diff --git a/crypto/lz4hc.c b/crypto/lz4hc.c
> index 75ffc4a..aa1265c 100644
> --- a/crypto/lz4hc.c
> +++ b/crypto/lz4hc.c
> @@ -22,53 +22,37 @@
> #include <linux/crypto.h>
> #include <linux/vmalloc.h>
> #include <linux/lz4.h>
> -#include <crypto/internal/scompress.h>
>
> struct lz4hc_ctx {
> void *lz4hc_comp_mem;
> };
>
> -static void *lz4hc_alloc_ctx(struct crypto_scomp *tfm)
> -{
> - void *ctx;
> -
> - ctx = vmalloc(LZ4HC_MEM_COMPRESS);
> - if (!ctx)
> - return ERR_PTR(-ENOMEM);
> -
> - return ctx;
> -}
> -
> static int lz4hc_init(struct crypto_tfm *tfm)
> {
> struct lz4hc_ctx *ctx = crypto_tfm_ctx(tfm);
>
> - ctx->lz4hc_comp_mem = lz4hc_alloc_ctx(NULL);
> - if (IS_ERR(ctx->lz4hc_comp_mem))
> + ctx->lz4hc_comp_mem = vmalloc(LZ4HC_MEM_COMPRESS);
> + if (!ctx->lz4hc_comp_mem)
> return -ENOMEM;
>
> return 0;
> }
>
> -static void lz4hc_free_ctx(struct crypto_scomp *tfm, void *ctx)
> -{
> - vfree(ctx);
> -}
> -
> static void lz4hc_exit(struct crypto_tfm *tfm)
> {
> struct lz4hc_ctx *ctx = crypto_tfm_ctx(tfm);
>
> - lz4hc_free_ctx(NULL, ctx->lz4hc_comp_mem);
> + vfree(ctx->lz4hc_comp_mem);
> }
>
> -static int __lz4hc_compress_crypto(const u8 *src, unsigned int slen,
> - u8 *dst, unsigned int *dlen, void *ctx)
> +static int lz4hc_compress_crypto(struct crypto_tfm *tfm, const u8 *src,
> + unsigned int slen, u8 *dst, unsigned int *dlen)
> {
> + struct lz4hc_ctx *ctx = crypto_tfm_ctx(tfm);
> size_t tmp_len = *dlen;
> int err;
>
> - err = lz4hc_compress(src, slen, dst, &tmp_len, ctx);
> + err = LZ4_compress_HC(src, dst, slen, tmp_len, LZ4HC_DEFAULT_CLEVEL, ctx->lz4hc_comp_mem);
>
> if (err < 0)
> return -EINVAL;
> @@ -77,31 +61,14 @@ static int __lz4hc_compress_crypto(const u8 *src, unsigned int slen,
> return 0;
> }
>
> -static int lz4hc_scompress(struct crypto_scomp *tfm, const u8 *src,
> - unsigned int slen, u8 *dst, unsigned int *dlen,
> - void *ctx)
> -{
> - return __lz4hc_compress_crypto(src, slen, dst, dlen, ctx);
> -}
> -
> -static int lz4hc_compress_crypto(struct crypto_tfm *tfm, const u8 *src,
> - unsigned int slen, u8 *dst,
> - unsigned int *dlen)
> -{
> - struct lz4hc_ctx *ctx = crypto_tfm_ctx(tfm);
> -
> - return __lz4hc_compress_crypto(src, slen, dst, dlen,
> - ctx->lz4hc_comp_mem);
> -}
> -
> -static int __lz4hc_decompress_crypto(const u8 *src, unsigned int slen,
> - u8 *dst, unsigned int *dlen, void *ctx)
> +static int lz4hc_decompress_crypto(struct crypto_tfm *tfm, const u8 *src,
> + unsigned int slen, u8 *dst, unsigned int *dlen)
> {
> int err;
> size_t tmp_len = *dlen;
> size_t __slen = slen;
>
> - err = lz4_decompress_unknownoutputsize(src, __slen, dst, &tmp_len);
> + err = LZ4_decompress_safe(src, dst, __slen, (int)tmp_len);
> if (err < 0)
> return -EINVAL;
>
> @@ -109,20 +76,6 @@ static int __lz4hc_decompress_crypto(const u8 *src, unsigned int slen,
> return err;
> }
>
> -static int lz4hc_sdecompress(struct crypto_scomp *tfm, const u8 *src,
> - unsigned int slen, u8 *dst, unsigned int *dlen,
> - void *ctx)
> -{
> - return __lz4hc_decompress_crypto(src, slen, dst, dlen, NULL);
> -}
> -
> -static int lz4hc_decompress_crypto(struct crypto_tfm *tfm, const u8 *src,
> - unsigned int slen, u8 *dst,
> - unsigned int *dlen)
> -{
> - return __lz4hc_decompress_crypto(src, slen, dst, dlen, NULL);
> -}
> -
> static struct crypto_alg alg_lz4hc = {
> .cra_name = "lz4hc",
> .cra_flags = CRYPTO_ALG_TYPE_COMPRESS,
> @@ -136,39 +89,14 @@ static struct crypto_alg alg_lz4hc = {
> .coa_decompress = lz4hc_decompress_crypto } }
> };
>
> -static struct scomp_alg scomp = {
> - .alloc_ctx = lz4hc_alloc_ctx,
> - .free_ctx = lz4hc_free_ctx,
> - .compress = lz4hc_scompress,
> - .decompress = lz4hc_sdecompress,
> - .base = {
> - .cra_name = "lz4hc",
> - .cra_driver_name = "lz4hc-scomp",
> - .cra_module = THIS_MODULE,
> - }
> -};
> -
> static int __init lz4hc_mod_init(void)
> {
> - int ret;
> -
> - ret = crypto_register_alg(&alg_lz4hc);
> - if (ret)
> - return ret;
> -
> - ret = crypto_register_scomp(&scomp);
> - if (ret) {
> - crypto_unregister_alg(&alg_lz4hc);
> - return ret;
> - }
> -
> - return ret;
> + return crypto_register_alg(&alg_lz4hc);
> }
>
> static void __exit lz4hc_mod_fini(void)
> {
> crypto_unregister_alg(&alg_lz4hc);
> - crypto_unregister_scomp(&scomp);
> }
>
> module_init(lz4hc_mod_init);
> --
> 2.1.4
>
next prev parent reply other threads:[~2016-12-22 13:25 UTC|newest]
Thread overview: 103+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-20 18:53 [PATCH 0/3] Update LZ4 compressor module Sven Schmidt
2016-12-20 18:53 ` [PATCH 1/3] crypto: Change lz4 modules to work with new lz4 compressor module version Sven Schmidt
2016-12-21 5:25 ` kbuild test robot
2016-12-22 13:25 ` Sergey Senozhatsky [this message]
2016-12-20 18:53 ` [PATCH 2/3] fs/pstore: fs/squashfs: Change lz4 compressor functions to work with new version Sven Schmidt
2016-12-21 5:16 ` kbuild test robot
2016-12-21 5:18 ` kbuild test robot
2016-12-22 13:21 ` Sergey Senozhatsky
2016-12-22 15:31 ` Sven Schmidt
2016-12-22 15:36 ` Sergey Senozhatsky
2016-12-22 13:27 ` Sergey Senozhatsky
2016-12-20 18:53 ` [PATCH 3/3] lib: Update LZ4 compressor module based on LZ4 v1.7.2 Sven Schmidt
2016-12-20 19:52 ` Joe Perches
2016-12-21 20:04 ` Sven Schmidt
2016-12-22 17:31 ` Greg KH
2016-12-22 18:39 ` Sven Schmidt
2016-12-21 7:09 ` kbuild test robot
2016-12-22 17:29 ` [PATCH 0/3] Update LZ4 compressor module Greg KH
2016-12-22 18:35 ` Sven Schmidt
2016-12-23 20:53 ` Greg KH
2017-01-07 16:55 ` [PATCH v2 0/4] " Sven Schmidt
2017-01-07 16:55 ` [PATCH v2 1/4] lib: Update LZ4 compressor module based on LZ4 v1.7.2 Sven Schmidt
2017-01-08 11:22 ` Greg KH
2017-01-10 9:32 ` Sven Schmidt
2017-01-10 9:59 ` Greg KH
2017-01-08 11:25 ` Greg KH
2017-01-08 11:33 ` Rui Salvaterra
2017-01-10 9:21 ` Sven Schmidt
2017-01-10 10:00 ` Greg KH
2017-01-10 10:50 ` Willy Tarreau
2017-01-07 16:55 ` [PATCH v2 2/4] lib/decompress_unlz4: Change module to work with new LZ4 module version Sven Schmidt
2017-01-08 11:23 ` Greg KH
2017-01-07 16:55 ` [PATCH v2 3/4] crypto: Change LZ4 modules " Sven Schmidt
2017-01-07 16:55 ` [PATCH v2 4/4] fs/pstore: fs/squashfs: Change usage of LZ4 to comply " Sven Schmidt
2017-01-07 21:33 ` Kees Cook
2017-01-10 9:45 ` Sven Schmidt
2017-01-21 15:09 ` [PATCH v3 0/4] Update LZ4 compressor module Sven Schmidt
2017-01-21 15:09 ` [PATCH 1/4] lib: " Sven Schmidt
2017-01-21 15:56 ` kbuild test robot
2017-01-21 16:16 ` kbuild test robot
2017-01-21 17:38 ` kbuild test robot
2017-01-22 11:05 ` Greg KH
2017-01-21 15:09 ` [PATCH 2/4] lib/decompress_unlz4: Change module to work with new LZ4 module version Sven Schmidt
2017-01-21 15:09 ` [PATCH 3/4] crypto: Change LZ4 modules " Sven Schmidt
2017-01-21 15:09 ` [PATCH 4/4] fs/pstore: fs/squashfs: Change usage of LZ4 to work with new LZ4 version Sven Schmidt
2017-01-22 19:35 ` [PATCH v4 0/4] Update LZ4 compressor module Sven Schmidt
2017-01-22 19:35 ` [PATCH v4 1/4] lib: " Sven Schmidt
2017-01-24 0:23 ` Andrew Morton
2017-01-24 16:48 ` Sven Schmidt
2017-01-22 19:35 ` [PATCH v4 2/4] lib/decompress_unlz4: Change module to work with new LZ4 module version Sven Schmidt
2017-01-22 19:35 ` [PATCH v4 3/4] crypto: Change LZ4 modules " Sven Schmidt
2017-01-22 19:35 ` [PATCH v4 4/4] fs/pstore: fs/squashfs: Change usage of LZ4 to work with new LZ4 version Sven Schmidt
2017-01-26 7:57 ` [PATCH v5 0/5] Update LZ4 compressor module Sven Schmidt
2017-01-26 7:57 ` [PATCH v5 1/5] lib: " Sven Schmidt
2017-01-26 7:57 ` [PATCH v5 2/5] lib/decompress_unlz4: Change module to work with new LZ4 module version Sven Schmidt
2017-01-26 7:57 ` [PATCH v5 3/5] crypto: Change LZ4 modules " Sven Schmidt
2017-01-26 7:57 ` [PATCH v5 4/5] fs/pstore: fs/squashfs: Change usage of LZ4 to work with new LZ4 version Sven Schmidt
2017-01-26 7:57 ` [PATCH v5 5/5] lib/lz4: Remove back-compat wrappers Sven Schmidt
2017-01-26 9:19 ` [PATCH v5 0/5] Update LZ4 compressor module Eric Biggers
2017-01-26 14:15 ` Sven Schmidt
2017-01-27 22:01 ` [PATCH v6 " Sven Schmidt
2017-01-27 22:02 ` [PATCH v6 1/5] lib: " Sven Schmidt
2017-01-31 22:27 ` Jonathan Corbet
2017-02-01 20:18 ` Sven Schmidt
2017-01-27 22:02 ` [PATCH v6 2/5] lib/decompress_unlz4: Change module to work with new LZ4 module version Sven Schmidt
2017-01-27 22:02 ` [PATCH v6 3/5] crypto: Change LZ4 modules " Sven Schmidt
2017-01-27 22:02 ` [PATCH v6 4/5] fs/pstore: fs/squashfs: Change usage of LZ4 to work with new LZ4 version Sven Schmidt
2017-01-27 22:02 ` [PATCH v6 5/5] lib/lz4: Remove back-compat wrappers Sven Schmidt
2017-02-05 19:09 ` [PATCH v7 0/5] Update LZ4 compressor module Sven Schmidt
2017-02-05 19:09 ` [PATCH v7 1/5] lib: " Sven Schmidt
2017-02-05 19:09 ` [PATCH v7 2/5] lib/decompress_unlz4: Change module to work with new LZ4 module version Sven Schmidt
2017-02-05 19:09 ` [PATCH v7 3/5] crypto: Change LZ4 modules " Sven Schmidt
2017-02-05 19:09 ` [PATCH v7 4/5] fs/pstore: fs/squashfs: Change usage of LZ4 to work with new LZ4 version Sven Schmidt
2017-02-05 19:09 ` [PATCH v7 5/5] lib/lz4: Remove back-compat wrappers Sven Schmidt
2017-02-08 23:31 ` [PATCH v7 0/5] Update LZ4 compressor module Minchan Kim
2017-02-09 0:24 ` Eric Biggers
2017-02-09 5:24 ` Eric Biggers
2017-02-09 11:05 ` Sven Schmidt
2017-02-09 18:20 ` Eric Biggers
2017-02-10 0:14 ` Minchan Kim
2017-02-09 11:02 ` Sven Schmidt
2017-02-09 18:29 ` Eric Biggers
2017-02-10 3:57 ` David Miller
2017-02-09 10:56 ` Sven Schmidt
2017-02-10 0:13 ` Minchan Kim
2017-02-12 11:16 ` Sven Schmidt
2017-02-12 11:16 ` [PATCH] lz4: fix performance regressions Sven Schmidt
2017-02-12 13:05 ` Willy Tarreau
2017-02-12 15:20 ` Sven Schmidt
2017-02-12 21:41 ` Willy Tarreau
2017-02-13 11:53 ` Sven Schmidt
2017-02-13 13:37 ` Willy Tarreau
2017-02-12 23:38 ` Eric Biggers
2017-02-14 10:33 ` Sven Schmidt
2017-02-13 0:03 ` [PATCH v7 0/5] Update LZ4 compressor module Minchan Kim
2017-02-13 12:08 ` Sven Schmidt
2017-02-15 7:29 ` Minchan Kim
2017-02-15 18:16 ` [PATCH v8 " Sven Schmidt
2017-02-15 18:16 ` [PATCH v8 1/5] lib: " Sven Schmidt
2017-02-15 18:16 ` [PATCH v8 2/5] lib/decompress_unlz4: Change module to work with new LZ4 module version Sven Schmidt
2017-02-15 18:16 ` [PATCH v8 3/5] crypto: Change LZ4 modules " Sven Schmidt
2017-02-15 18:16 ` [PATCH v8 4/5] fs/pstore: fs/squashfs: Change usage of LZ4 to work with new LZ4 version Sven Schmidt
2017-02-15 18:16 ` [PATCH v8 5/5] lib/lz4: Remove back-compat wrappers Sven Schmidt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161222132516.GB413@tigerII.localdomain \
--to=sergey.senozhatsky@gmail.com \
--cc=4sschmid@informatik.uni-hamburg.de \
--cc=akpm@linux-foundation.org \
--cc=bongkyu.kim@lge.com \
--cc=gregkh@linuxfoundation.org \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).