crypto: acomp - add support for lzo via scomp

Add scomp backend for lzo compression algorithm.

Signed-off-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

2 files changed, 83 insertions, 15 deletions

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 9950c47c9d27..7ffd418b69f8 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -1589,6 +1589,7 @@ config CRYPTO_DEFLATE
 config CRYPTO_LZO
         tristate "LZO compression algorithm"
         select CRYPTO_ALGAPI
+        select CRYPTO_ACOMP2
         select LZO_COMPRESS
         select LZO_DECOMPRESS
         help
diff --git a/crypto/lzo.c b/crypto/lzo.c
index c3f3dd9a28c5..168df784da84 100644
--- a/crypto/lzo.c
+++ b/crypto/lzo.c
@@ -22,40 +22,55 @@
 #include <linux/vmalloc.h>
 #include <linux/mm.h>
 #include <linux/lzo.h>
+#include <crypto/internal/scompress.h>
 
 struct lzo_ctx {
         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)
 {
         struct lzo_ctx *ctx = crypto_tfm_ctx(tfm);
 
-        ctx->lzo_comp_mem = kmalloc(LZO1X_MEM_COMPRESS,
-                                    GFP_KERNEL | __GFP_NOWARN);
-        if (!ctx->lzo_comp_mem)
-                ctx->lzo_comp_mem = vmalloc(LZO1X_MEM_COMPRESS);
-        if (!ctx->lzo_comp_mem)
+        ctx->lzo_comp_mem = lzo_alloc_ctx(NULL);
+        if (IS_ERR(ctx->lzo_comp_mem))
                 return -ENOMEM;
 
         return 0;
 }
 
+static void lzo_free_ctx(struct crypto_scomp *tfm, void *ctx)
+{
+        kvfree(ctx);
+}
+
 static void lzo_exit(struct crypto_tfm *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,
-                            unsigned int slen, u8 *dst, unsigned int *dlen)
+static int __lzo_compress(const u8 *src, unsigned int slen,
+                          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 */
         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)
                 return -EINVAL;
@@ -64,8 +79,23 @@ static int lzo_compress(struct crypto_tfm *tfm, const u8 *src,
         return 0;
 }
 
-static int lzo_decompress(struct crypto_tfm *tfm, const u8 *src,
-                              unsigned int slen, u8 *dst, unsigned int *dlen)
+static int lzo_compress(struct crypto_tfm *tfm, const u8 *src,
+                        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;
         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,
 
         *dlen = tmp_len;
         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 = {
@@ -88,18 +130,43 @@ static struct crypto_alg alg = {
         .cra_init               = lzo_init,
         .cra_exit               = lzo_exit,
         .cra_u                  = { .compress = {
-        .coa_compress           = lzo_compress,
-        .coa_decompress         = lzo_decompress } }
+        .coa_compress           = lzo_compress,
+        .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)
 {
-        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)
 {
         crypto_unregister_alg(&alg);
+        crypto_unregister_scomp(&scomp);
 }
 
 module_init(lzo_mod_init);