projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e23d54e)
crypto: change LZ4 modules to work with new LZ4 module version
authorSven Schmidt <4sschmid@informatik.uni-hamburg.de>
Fri, 24 Feb 2017 23:01:19 +0000 (15:01 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 25 Feb 2017 01:46:57 +0000 (17:46 -0800)
Update the crypto modules using LZ4 compression as well as the test
cases in testmgr.h to work with the new LZ4 module version.

Link: http://lkml.kernel.org/r/1486321748-19085-4-git-send-email-4sschmid@informatik.uni-hamburg.de
Signed-off-by: Sven Schmidt <4sschmid@informatik.uni-hamburg.de>
Cc: Bongkyu Kim <bongkyu.kim@lge.com>
Cc: Rui Salvaterra <rsalvaterra@gmail.com>
Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: David S. Miller <davem@davemloft.net>
Cc: Anton Vorontsov <anton@enomsg.org>
Cc: Colin Cross <ccross@android.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Tony Luck <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
crypto/lz4.c patch | blob | blame | history
crypto/lz4hc.c patch | blob | blame | history
crypto/testmgr.h patch | blob | blame | history

diff --git a/crypto/lz4.c b/crypto/lz4.c
index 99c1b2cc2976ad31aca9cfef182bf0318b6e95af..71eff9b01b12296405f8d52a10f8427b3cbc5ca6 100644 (file)
--- a/crypto/lz4.c
+++ b/crypto/lz4.c
@@ -66,15 +66,13 @@ static void lz4_exit(struct crypto_tfm *tfm)
 static int __lz4_compress_crypto(const u8 *src, unsigned int slen,
                                 u8 *dst, unsigned int *dlen, void *ctx)
 {
-       size_t tmp_len = *dlen;
-       int err;
+       int out_len = LZ4_compress_default(src, dst,
+               slen, *dlen, ctx);
 
-       err = lz4_compress(src, slen, dst, &tmp_len, ctx);
-
-       if (err < 0)
+       if (!out_len)
                return -EINVAL;
 
-       *dlen = tmp_len;
+       *dlen = out_len;
        return 0;
 }
 
@@ -96,16 +94,13 @@ static int lz4_compress_crypto(struct crypto_tfm *tfm, const u8 *src,
 static int __lz4_decompress_crypto(const u8 *src, unsigned int slen,
                                   u8 *dst, unsigned int *dlen, void *ctx)
 {
-       int err;
-       size_t tmp_len = *dlen;
-       size_t __slen = slen;
+       int out_len = LZ4_decompress_safe(src, dst, slen, *dlen);
 
-       err = lz4_decompress_unknownoutputsize(src, __slen, dst, &tmp_len);
-       if (err < 0)
-               return -EINVAL;
+       if (out_len < 0)
+               return out_len;
 
-       *dlen = tmp_len;
-       return err;
+       *dlen = out_len;
+       return 0;
 }
 
 static int lz4_sdecompress(struct crypto_scomp *tfm, const u8 *src,
diff --git a/crypto/lz4hc.c b/crypto/lz4hc.c
index 75ffc4a3f786c84f867670147e73427c15a20525..03a34a8109c0845440cacd5d21d61daa093bff51 100644 (file)
--- a/crypto/lz4hc.c
+++ b/crypto/lz4hc.c
@@ -65,15 +65,13 @@ static void lz4hc_exit(struct crypto_tfm *tfm)
 static int __lz4hc_compress_crypto(const u8 *src, unsigned int slen,
                                   u8 *dst, unsigned int *dlen, void *ctx)
 {
-       size_t tmp_len = *dlen;
-       int err;
+       int out_len = LZ4_compress_HC(src, dst, slen,
+               *dlen, LZ4HC_DEFAULT_CLEVEL, ctx);
 
-       err = lz4hc_compress(src, slen, dst, &tmp_len, ctx);
-
-       if (err < 0)
+       if (!out_len)
                return -EINVAL;
 
-       *dlen = tmp_len;
+       *dlen = out_len;
        return 0;
 }
 
@@ -97,16 +95,13 @@ static int lz4hc_compress_crypto(struct crypto_tfm *tfm, const u8 *src,
 static int __lz4hc_decompress_crypto(const u8 *src, unsigned int slen,
                                     u8 *dst, unsigned int *dlen, void *ctx)
 {
-       int err;
-       size_t tmp_len = *dlen;
-       size_t __slen = slen;
+       int out_len = LZ4_decompress_safe(src, dst, slen, *dlen);
 
-       err = lz4_decompress_unknownoutputsize(src, __slen, dst, &tmp_len);
-       if (err < 0)
-               return -EINVAL;
+       if (out_len < 0)
+               return out_len;
 
-       *dlen = tmp_len;
-       return err;
+       *dlen = out_len;
+       return 0;
 }
 
 static int lz4hc_sdecompress(struct crypto_scomp *tfm, const u8 *src,
diff --git a/crypto/testmgr.h b/crypto/testmgr.h
index f85e51cf7dcca639873cef179d21066202c7079b..006ecc434351808382b6fbb16c751ca16817c289 100644 (file)
--- a/crypto/testmgr.h
+++ b/crypto/testmgr.h
@@ -34293,61 +34293,123 @@ static struct hash_testvec bfin_crc_tv_template[] = {
 
 static struct comp_testvec lz4_comp_tv_template[] = {
        {
-               .inlen  = 70,
-               .outlen = 45,
-               .input  = "Join us now and share the software "
-                         "Join us now and share the software ",
-               .output = "\xf0\x10\x4a\x6f\x69\x6e\x20\x75"
-                         "\x73\x20\x6e\x6f\x77\x20\x61\x6e"
-                         "\x64\x20\x73\x68\x61\x72\x65\x20"
-                         "\x74\x68\x65\x20\x73\x6f\x66\x74"
-                         "\x77\x0d\x00\x0f\x23\x00\x0b\x50"
-                         "\x77\x61\x72\x65\x20",
+               .inlen  = 255,
+               .outlen = 218,
+               .input  = "LZ4 is lossless compression algorithm, providing"
+                        " compression speed at 400 MB/s per core, scalable "
+                        "with multi-cores CPU. It features an extremely fast "
+                        "decoder, with speed in multiple GB/s per core, "
+                        "typically reaching RAM speed limits on multi-core "
+                        "systems.",
+               .output = "\xf9\x21\x4c\x5a\x34\x20\x69\x73\x20\x6c\x6f\x73\x73"
+                         "\x6c\x65\x73\x73\x20\x63\x6f\x6d\x70\x72\x65\x73\x73"
+                         "\x69\x6f\x6e\x20\x61\x6c\x67\x6f\x72\x69\x74\x68\x6d"
+                         "\x2c\x20\x70\x72\x6f\x76\x69\x64\x69\x6e\x67\x21\x00"
+                         "\xf0\x21\x73\x70\x65\x65\x64\x20\x61\x74\x20\x34\x30"
+                         "\x30\x20\x4d\x42\x2f\x73\x20\x70\x65\x72\x20\x63\x6f"
+                         "\x72\x65\x2c\x20\x73\x63\x61\x6c\x61\x62\x6c\x65\x20"
+                         "\x77\x69\x74\x68\x20\x6d\x75\x6c\x74\x69\x2d\x1a\x00"
+                         "\xf0\x00\x73\x20\x43\x50\x55\x2e\x20\x49\x74\x20\x66"
+                         "\x65\x61\x74\x75\x11\x00\xf2\x0b\x61\x6e\x20\x65\x78"
+                         "\x74\x72\x65\x6d\x65\x6c\x79\x20\x66\x61\x73\x74\x20"
+                         "\x64\x65\x63\x6f\x64\x65\x72\x2c\x3d\x00\x02\x67\x00"
+                         "\x22\x69\x6e\x46\x00\x5a\x70\x6c\x65\x20\x47\x6c\x00"
+                         "\xf0\x00\x74\x79\x70\x69\x63\x61\x6c\x6c\x79\x20\x72"
+                         "\x65\x61\x63\x68\xa7\x00\x33\x52\x41\x4d\x38\x00\x83"
+                         "\x6c\x69\x6d\x69\x74\x73\x20\x6f\x3f\x00\x01\x85\x00"
+                         "\x90\x20\x73\x79\x73\x74\x65\x6d\x73\x2e",
+
        },
 };
 
 static struct comp_testvec lz4_decomp_tv_template[] = {
        {
-               .inlen  = 45,
-               .outlen = 70,
-               .input  = "\xf0\x10\x4a\x6f\x69\x6e\x20\x75"
-                         "\x73\x20\x6e\x6f\x77\x20\x61\x6e"
-                         "\x64\x20\x73\x68\x61\x72\x65\x20"
-                         "\x74\x68\x65\x20\x73\x6f\x66\x74"
-                         "\x77\x0d\x00\x0f\x23\x00\x0b\x50"
-                         "\x77\x61\x72\x65\x20",
-               .output = "Join us now and share the software "
-                         "Join us now and share the software ",
+               .inlen  = 218,
+               .outlen = 255,
+               .input  = "\xf9\x21\x4c\x5a\x34\x20\x69\x73\x20\x6c\x6f\x73\x73"
+                         "\x6c\x65\x73\x73\x20\x63\x6f\x6d\x70\x72\x65\x73\x73"
+                         "\x69\x6f\x6e\x20\x61\x6c\x67\x6f\x72\x69\x74\x68\x6d"
+                         "\x2c\x20\x70\x72\x6f\x76\x69\x64\x69\x6e\x67\x21\x00"
+                         "\xf0\x21\x73\x70\x65\x65\x64\x20\x61\x74\x20\x34\x30"
+                         "\x30\x20\x4d\x42\x2f\x73\x20\x70\x65\x72\x20\x63\x6f"
+                         "\x72\x65\x2c\x20\x73\x63\x61\x6c\x61\x62\x6c\x65\x20"
+                         "\x77\x69\x74\x68\x20\x6d\x75\x6c\x74\x69\x2d\x1a\x00"
+                         "\xf0\x00\x73\x20\x43\x50\x55\x2e\x20\x49\x74\x20\x66"
+                         "\x65\x61\x74\x75\x11\x00\xf2\x0b\x61\x6e\x20\x65\x78"
+                         "\x74\x72\x65\x6d\x65\x6c\x79\x20\x66\x61\x73\x74\x20"
+                         "\x64\x65\x63\x6f\x64\x65\x72\x2c\x3d\x00\x02\x67\x00"
+                         "\x22\x69\x6e\x46\x00\x5a\x70\x6c\x65\x20\x47\x6c\x00"
+                         "\xf0\x00\x74\x79\x70\x69\x63\x61\x6c\x6c\x79\x20\x72"
+                         "\x65\x61\x63\x68\xa7\x00\x33\x52\x41\x4d\x38\x00\x83"
+                         "\x6c\x69\x6d\x69\x74\x73\x20\x6f\x3f\x00\x01\x85\x00"
+                         "\x90\x20\x73\x79\x73\x74\x65\x6d\x73\x2e",
+               .output = "LZ4 is lossless compression algorithm, providing"
+                        " compression speed at 400 MB/s per core, scalable "
+                        "with multi-cores CPU. It features an extremely fast "
+                        "decoder, with speed in multiple GB/s per core, "
+                        "typically reaching RAM speed limits on multi-core "
+                        "systems.",
        },
 };
 
 static struct comp_testvec lz4hc_comp_tv_template[] = {
        {
-               .inlen  = 70,
-               .outlen = 45,
-               .input  = "Join us now and share the software "
-                         "Join us now and share the software ",
-               .output = "\xf0\x10\x4a\x6f\x69\x6e\x20\x75"
-                         "\x73\x20\x6e\x6f\x77\x20\x61\x6e"
-                         "\x64\x20\x73\x68\x61\x72\x65\x20"
-                         "\x74\x68\x65\x20\x73\x6f\x66\x74"
-                         "\x77\x0d\x00\x0f\x23\x00\x0b\x50"
-                         "\x77\x61\x72\x65\x20",
+               .inlen  = 255,
+               .outlen = 216,
+               .input  = "LZ4 is lossless compression algorithm, providing"
+                        " compression speed at 400 MB/s per core, scalable "
+                        "with multi-cores CPU. It features an extremely fast "
+                        "decoder, with speed in multiple GB/s per core, "
+                        "typically reaching RAM speed limits on multi-core "
+                        "systems.",
+               .output = "\xf9\x21\x4c\x5a\x34\x20\x69\x73\x20\x6c\x6f\x73\x73"
+                         "\x6c\x65\x73\x73\x20\x63\x6f\x6d\x70\x72\x65\x73\x73"
+                         "\x69\x6f\x6e\x20\x61\x6c\x67\x6f\x72\x69\x74\x68\x6d"
+                         "\x2c\x20\x70\x72\x6f\x76\x69\x64\x69\x6e\x67\x21\x00"
+                         "\xf0\x21\x73\x70\x65\x65\x64\x20\x61\x74\x20\x34\x30"
+                         "\x30\x20\x4d\x42\x2f\x73\x20\x70\x65\x72\x20\x63\x6f"
+                         "\x72\x65\x2c\x20\x73\x63\x61\x6c\x61\x62\x6c\x65\x20"
+                         "\x77\x69\x74\x68\x20\x6d\x75\x6c\x74\x69\x2d\x1a\x00"
+                         "\xf0\x00\x73\x20\x43\x50\x55\x2e\x20\x49\x74\x20\x66"
+                         "\x65\x61\x74\x75\x11\x00\xf2\x0b\x61\x6e\x20\x65\x78"
+                         "\x74\x72\x65\x6d\x65\x6c\x79\x20\x66\x61\x73\x74\x20"
+                         "\x64\x65\x63\x6f\x64\x65\x72\x2c\x3d\x00\x02\x67\x00"
+                         "\x22\x69\x6e\x46\x00\x5a\x70\x6c\x65\x20\x47\x6c\x00"
+                         "\xf0\x00\x74\x79\x70\x69\x63\x61\x6c\x6c\x79\x20\x72"
+                         "\x65\x61\x63\x68\xa7\x00\x33\x52\x41\x4d\x38\x00\x97"
+                         "\x6c\x69\x6d\x69\x74\x73\x20\x6f\x6e\x85\x00\x90\x20"
+                         "\x73\x79\x73\x74\x65\x6d\x73\x2e",
+
        },
 };
 
 static struct comp_testvec lz4hc_decomp_tv_template[] = {
        {
-               .inlen  = 45,
-               .outlen = 70,
-               .input  = "\xf0\x10\x4a\x6f\x69\x6e\x20\x75"
-                         "\x73\x20\x6e\x6f\x77\x20\x61\x6e"
-                         "\x64\x20\x73\x68\x61\x72\x65\x20"
-                         "\x74\x68\x65\x20\x73\x6f\x66\x74"
-                         "\x77\x0d\x00\x0f\x23\x00\x0b\x50"
-                         "\x77\x61\x72\x65\x20",
-               .output = "Join us now and share the software "
-                         "Join us now and share the software ",
+               .inlen  = 216,
+               .outlen = 255,
+               .input  = "\xf9\x21\x4c\x5a\x34\x20\x69\x73\x20\x6c\x6f\x73\x73"
+                         "\x6c\x65\x73\x73\x20\x63\x6f\x6d\x70\x72\x65\x73\x73"
+                         "\x69\x6f\x6e\x20\x61\x6c\x67\x6f\x72\x69\x74\x68\x6d"
+                         "\x2c\x20\x70\x72\x6f\x76\x69\x64\x69\x6e\x67\x21\x00"
+                         "\xf0\x21\x73\x70\x65\x65\x64\x20\x61\x74\x20\x34\x30"
+                         "\x30\x20\x4d\x42\x2f\x73\x20\x70\x65\x72\x20\x63\x6f"
+                         "\x72\x65\x2c\x20\x73\x63\x61\x6c\x61\x62\x6c\x65\x20"
+                         "\x77\x69\x74\x68\x20\x6d\x75\x6c\x74\x69\x2d\x1a\x00"
+                         "\xf0\x00\x73\x20\x43\x50\x55\x2e\x20\x49\x74\x20\x66"
+                         "\x65\x61\x74\x75\x11\x00\xf2\x0b\x61\x6e\x20\x65\x78"
+                         "\x74\x72\x65\x6d\x65\x6c\x79\x20\x66\x61\x73\x74\x20"
+                         "\x64\x65\x63\x6f\x64\x65\x72\x2c\x3d\x00\x02\x67\x00"
+                         "\x22\x69\x6e\x46\x00\x5a\x70\x6c\x65\x20\x47\x6c\x00"
+                         "\xf0\x00\x74\x79\x70\x69\x63\x61\x6c\x6c\x79\x20\x72"
+                         "\x65\x61\x63\x68\xa7\x00\x33\x52\x41\x4d\x38\x00\x97"
+                         "\x6c\x69\x6d\x69\x74\x73\x20\x6f\x6e\x85\x00\x90\x20"
+                         "\x73\x79\x73\x74\x65\x6d\x73\x2e",
+               .output = "LZ4 is lossless compression algorithm, providing"
+                        " compression speed at 400 MB/s per core, scalable "
+                        "with multi-cores CPU. It features an extremely fast "
+                        "decoder, with speed in multiple GB/s per core, "
+                        "typically reaching RAM speed limits on multi-core "
+                        "systems.",
        },
 };
 
Motorola kernel-slsi