Commit ac9d2c4b authored by Giovanni Cabiddu's avatar Giovanni Cabiddu Committed by Herbert Xu

crypto: acomp - add support for lzo via scomp

Add scomp backend for lzo compression algorithm.
Signed-off-by: default avatarGiovanni Cabiddu <giovanni.cabiddu@intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 1ab53a77
...@@ -1589,6 +1589,7 @@ config CRYPTO_DEFLATE ...@@ -1589,6 +1589,7 @@ config CRYPTO_DEFLATE
config CRYPTO_LZO config CRYPTO_LZO
tristate "LZO compression algorithm" tristate "LZO compression algorithm"
select CRYPTO_ALGAPI select CRYPTO_ALGAPI
select CRYPTO_ACOMP2
select LZO_COMPRESS select LZO_COMPRESS
select LZO_DECOMPRESS select LZO_DECOMPRESS
help help
......
...@@ -22,40 +22,55 @@ ...@@ -22,40 +22,55 @@
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/lzo.h> #include <linux/lzo.h>
#include <crypto/internal/scompress.h>
struct lzo_ctx { struct lzo_ctx {
void *lzo_comp_mem; void *lzo_comp_mem;
}; };
static void *lzo_alloc_ctx(struct crypto_scomp *tfm)
{
void *ctx;
ctx = kmalloc(LZO1X_MEM_COMPRESS, GFP_KERNEL | __GFP_NOWARN);
if (!ctx)
ctx = vmalloc(LZO1X_MEM_COMPRESS);
if (!ctx)
return ERR_PTR(-ENOMEM);
return ctx;
}
static int lzo_init(struct crypto_tfm *tfm) static int lzo_init(struct crypto_tfm *tfm)
{ {
struct lzo_ctx *ctx = crypto_tfm_ctx(tfm); struct lzo_ctx *ctx = crypto_tfm_ctx(tfm);
ctx->lzo_comp_mem = kmalloc(LZO1X_MEM_COMPRESS, ctx->lzo_comp_mem = lzo_alloc_ctx(NULL);
GFP_KERNEL | __GFP_NOWARN); if (IS_ERR(ctx->lzo_comp_mem))
if (!ctx->lzo_comp_mem)
ctx->lzo_comp_mem = vmalloc(LZO1X_MEM_COMPRESS);
if (!ctx->lzo_comp_mem)
return -ENOMEM; return -ENOMEM;
return 0; return 0;
} }
static void lzo_free_ctx(struct crypto_scomp *tfm, void *ctx)
{
kvfree(ctx);
}
static void lzo_exit(struct crypto_tfm *tfm) static void lzo_exit(struct crypto_tfm *tfm)
{ {
struct lzo_ctx *ctx = crypto_tfm_ctx(tfm); struct lzo_ctx *ctx = crypto_tfm_ctx(tfm);
kvfree(ctx->lzo_comp_mem); lzo_free_ctx(NULL, ctx->lzo_comp_mem);
} }
static int lzo_compress(struct crypto_tfm *tfm, const u8 *src, static int __lzo_compress(const u8 *src, unsigned int slen,
unsigned int slen, u8 *dst, unsigned int *dlen) u8 *dst, unsigned int *dlen, void *ctx)
{ {
struct lzo_ctx *ctx = crypto_tfm_ctx(tfm);
size_t tmp_len = *dlen; /* size_t(ulong) <-> uint on 64 bit */ size_t tmp_len = *dlen; /* size_t(ulong) <-> uint on 64 bit */
int err; int err;
err = lzo1x_1_compress(src, slen, dst, &tmp_len, ctx->lzo_comp_mem); err = lzo1x_1_compress(src, slen, dst, &tmp_len, ctx);
if (err != LZO_E_OK) if (err != LZO_E_OK)
return -EINVAL; return -EINVAL;
...@@ -64,8 +79,23 @@ static int lzo_compress(struct crypto_tfm *tfm, const u8 *src, ...@@ -64,8 +79,23 @@ static int lzo_compress(struct crypto_tfm *tfm, const u8 *src,
return 0; return 0;
} }
static int lzo_decompress(struct crypto_tfm *tfm, const u8 *src, static int lzo_compress(struct crypto_tfm *tfm, const u8 *src,
unsigned int slen, u8 *dst, unsigned int *dlen) unsigned int slen, u8 *dst, unsigned int *dlen)
{
struct lzo_ctx *ctx = crypto_tfm_ctx(tfm);
return __lzo_compress(src, slen, dst, dlen, ctx->lzo_comp_mem);
}
static int lzo_scompress(struct crypto_scomp *tfm, const u8 *src,
unsigned int slen, u8 *dst, unsigned int *dlen,
void *ctx)
{
return __lzo_compress(src, slen, dst, dlen, ctx);
}
static int __lzo_decompress(const u8 *src, unsigned int slen,
u8 *dst, unsigned int *dlen)
{ {
int err; int err;
size_t tmp_len = *dlen; /* size_t(ulong) <-> uint on 64 bit */ size_t tmp_len = *dlen; /* size_t(ulong) <-> uint on 64 bit */
...@@ -77,7 +107,19 @@ static int lzo_decompress(struct crypto_tfm *tfm, const u8 *src, ...@@ -77,7 +107,19 @@ static int lzo_decompress(struct crypto_tfm *tfm, const u8 *src,
*dlen = tmp_len; *dlen = tmp_len;
return 0; return 0;
}
static int lzo_decompress(struct crypto_tfm *tfm, const u8 *src,
unsigned int slen, u8 *dst, unsigned int *dlen)
{
return __lzo_decompress(src, slen, dst, dlen);
}
static int lzo_sdecompress(struct crypto_scomp *tfm, const u8 *src,
unsigned int slen, u8 *dst, unsigned int *dlen,
void *ctx)
{
return __lzo_decompress(src, slen, dst, dlen);
} }
static struct crypto_alg alg = { static struct crypto_alg alg = {
...@@ -88,18 +130,43 @@ static struct crypto_alg alg = { ...@@ -88,18 +130,43 @@ static struct crypto_alg alg = {
.cra_init = lzo_init, .cra_init = lzo_init,
.cra_exit = lzo_exit, .cra_exit = lzo_exit,
.cra_u = { .compress = { .cra_u = { .compress = {
.coa_compress = lzo_compress, .coa_compress = lzo_compress,
.coa_decompress = lzo_decompress } } .coa_decompress = lzo_decompress } }
};
static struct scomp_alg scomp = {
.alloc_ctx = lzo_alloc_ctx,
.free_ctx = lzo_free_ctx,
.compress = lzo_scompress,
.decompress = lzo_sdecompress,
.base = {
.cra_name = "lzo",
.cra_driver_name = "lzo-scomp",
.cra_module = THIS_MODULE,
}
}; };
static int __init lzo_mod_init(void) static int __init lzo_mod_init(void)
{ {
return crypto_register_alg(&alg); int ret;
ret = crypto_register_alg(&alg);
if (ret)
return ret;
ret = crypto_register_scomp(&scomp);
if (ret) {
crypto_unregister_alg(&alg);
return ret;
}
return ret;
} }
static void __exit lzo_mod_fini(void) static void __exit lzo_mod_fini(void)
{ {
crypto_unregister_alg(&alg); crypto_unregister_alg(&alg);
crypto_unregister_scomp(&scomp);
} }
module_init(lzo_mod_init); module_init(lzo_mod_init);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment