2009-03-04 10:15:49 +03:00
|
|
|
/*
|
|
|
|
* Cryptographic API.
|
|
|
|
*
|
|
|
|
* Zlib algorithm
|
|
|
|
*
|
|
|
|
* Copyright 2008 Sony Corporation
|
|
|
|
*
|
|
|
|
* Based on deflate.c, which is
|
|
|
|
* Copyright (c) 2003 James Morris <jmorris@intercode.com.au>
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
|
|
* under the terms of the GNU General Public License as published by the Free
|
|
|
|
* Software Foundation; either version 2 of the License, or (at your option)
|
|
|
|
* any later version.
|
|
|
|
*
|
|
|
|
* FIXME: deflate transforms will require up to a total of about 436k of kernel
|
|
|
|
* memory on i386 (390k for compression, the rest for decompression), as the
|
|
|
|
* current zlib kernel code uses a worst case pre-allocation system by default.
|
|
|
|
* This needs to be fixed so that the amount of memory required is properly
|
|
|
|
* related to the winbits and memlevel parameters.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#define pr_fmt(fmt) "%s: " fmt, __func__
|
|
|
|
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/zlib.h>
|
|
|
|
#include <linux/vmalloc.h>
|
|
|
|
#include <linux/interrupt.h>
|
|
|
|
#include <linux/mm.h>
|
|
|
|
#include <linux/net.h>
|
|
|
|
|
|
|
|
#include <crypto/internal/compress.h>
|
|
|
|
|
|
|
|
#include <net/netlink.h>
|
|
|
|
|
|
|
|
|
|
|
|
struct zlib_ctx {
|
|
|
|
struct z_stream_s comp_stream;
|
|
|
|
struct z_stream_s decomp_stream;
|
|
|
|
int decomp_windowBits;
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
static void zlib_comp_exit(struct zlib_ctx *ctx)
|
|
|
|
{
|
|
|
|
struct z_stream_s *stream = &ctx->comp_stream;
|
|
|
|
|
|
|
|
if (stream->workspace) {
|
|
|
|
zlib_deflateEnd(stream);
|
|
|
|
vfree(stream->workspace);
|
|
|
|
stream->workspace = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void zlib_decomp_exit(struct zlib_ctx *ctx)
|
|
|
|
{
|
|
|
|
struct z_stream_s *stream = &ctx->decomp_stream;
|
|
|
|
|
|
|
|
if (stream->workspace) {
|
|
|
|
zlib_inflateEnd(stream);
|
2011-06-29 16:48:41 +04:00
|
|
|
vfree(stream->workspace);
|
2009-03-04 10:15:49 +03:00
|
|
|
stream->workspace = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int zlib_init(struct crypto_tfm *tfm)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void zlib_exit(struct crypto_tfm *tfm)
|
|
|
|
{
|
|
|
|
struct zlib_ctx *ctx = crypto_tfm_ctx(tfm);
|
|
|
|
|
|
|
|
zlib_comp_exit(ctx);
|
|
|
|
zlib_decomp_exit(ctx);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int zlib_compress_setup(struct crypto_pcomp *tfm, void *params,
|
|
|
|
unsigned int len)
|
|
|
|
{
|
|
|
|
struct zlib_ctx *ctx = crypto_tfm_ctx(crypto_pcomp_tfm(tfm));
|
|
|
|
struct z_stream_s *stream = &ctx->comp_stream;
|
|
|
|
struct nlattr *tb[ZLIB_COMP_MAX + 1];
|
zlib: slim down zlib_deflate() workspace when possible
Instead of always creating a huge (268K) deflate_workspace with the
maximum compression parameters (windowBits=15, memLevel=8), allow the
caller to obtain a smaller workspace by specifying smaller parameter
values.
For example, when capturing oops and panic reports to a medium with
limited capacity, such as NVRAM, compression may be the only way to
capture the whole report. In this case, a small workspace (24K works
fine) is a win, whether you allocate the workspace when you need it (i.e.,
during an oops or panic) or at boot time.
I've verified that this patch works with all accepted values of windowBits
(positive and negative), memLevel, and compression level.
Signed-off-by: Jim Keniston <jkenisto@us.ibm.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: David Miller <davem@davemloft.net>
Cc: Chris Mason <chris.mason@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-03-23 02:35:12 +03:00
|
|
|
int window_bits, mem_level;
|
2009-03-04 10:15:49 +03:00
|
|
|
size_t workspacesize;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
ret = nla_parse(tb, ZLIB_COMP_MAX, params, len, NULL);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
zlib_comp_exit(ctx);
|
|
|
|
|
zlib: slim down zlib_deflate() workspace when possible
Instead of always creating a huge (268K) deflate_workspace with the
maximum compression parameters (windowBits=15, memLevel=8), allow the
caller to obtain a smaller workspace by specifying smaller parameter
values.
For example, when capturing oops and panic reports to a medium with
limited capacity, such as NVRAM, compression may be the only way to
capture the whole report. In this case, a small workspace (24K works
fine) is a win, whether you allocate the workspace when you need it (i.e.,
during an oops or panic) or at boot time.
I've verified that this patch works with all accepted values of windowBits
(positive and negative), memLevel, and compression level.
Signed-off-by: Jim Keniston <jkenisto@us.ibm.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: David Miller <davem@davemloft.net>
Cc: Chris Mason <chris.mason@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-03-23 02:35:12 +03:00
|
|
|
window_bits = tb[ZLIB_COMP_WINDOWBITS]
|
|
|
|
? nla_get_u32(tb[ZLIB_COMP_WINDOWBITS])
|
|
|
|
: MAX_WBITS;
|
|
|
|
mem_level = tb[ZLIB_COMP_MEMLEVEL]
|
|
|
|
? nla_get_u32(tb[ZLIB_COMP_MEMLEVEL])
|
|
|
|
: DEF_MEM_LEVEL;
|
|
|
|
|
|
|
|
workspacesize = zlib_deflate_workspacesize(window_bits, mem_level);
|
2010-11-27 11:30:39 +03:00
|
|
|
stream->workspace = vzalloc(workspacesize);
|
2009-03-04 10:15:49 +03:00
|
|
|
if (!stream->workspace)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
ret = zlib_deflateInit2(stream,
|
|
|
|
tb[ZLIB_COMP_LEVEL]
|
|
|
|
? nla_get_u32(tb[ZLIB_COMP_LEVEL])
|
|
|
|
: Z_DEFAULT_COMPRESSION,
|
|
|
|
tb[ZLIB_COMP_METHOD]
|
|
|
|
? nla_get_u32(tb[ZLIB_COMP_METHOD])
|
|
|
|
: Z_DEFLATED,
|
zlib: slim down zlib_deflate() workspace when possible
Instead of always creating a huge (268K) deflate_workspace with the
maximum compression parameters (windowBits=15, memLevel=8), allow the
caller to obtain a smaller workspace by specifying smaller parameter
values.
For example, when capturing oops and panic reports to a medium with
limited capacity, such as NVRAM, compression may be the only way to
capture the whole report. In this case, a small workspace (24K works
fine) is a win, whether you allocate the workspace when you need it (i.e.,
during an oops or panic) or at boot time.
I've verified that this patch works with all accepted values of windowBits
(positive and negative), memLevel, and compression level.
Signed-off-by: Jim Keniston <jkenisto@us.ibm.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: David Miller <davem@davemloft.net>
Cc: Chris Mason <chris.mason@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-03-23 02:35:12 +03:00
|
|
|
window_bits,
|
|
|
|
mem_level,
|
2009-03-04 10:15:49 +03:00
|
|
|
tb[ZLIB_COMP_STRATEGY]
|
|
|
|
? nla_get_u32(tb[ZLIB_COMP_STRATEGY])
|
|
|
|
: Z_DEFAULT_STRATEGY);
|
|
|
|
if (ret != Z_OK) {
|
|
|
|
vfree(stream->workspace);
|
|
|
|
stream->workspace = NULL;
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int zlib_compress_init(struct crypto_pcomp *tfm)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
struct zlib_ctx *dctx = crypto_tfm_ctx(crypto_pcomp_tfm(tfm));
|
|
|
|
struct z_stream_s *stream = &dctx->comp_stream;
|
|
|
|
|
|
|
|
ret = zlib_deflateReset(stream);
|
|
|
|
if (ret != Z_OK)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int zlib_compress_update(struct crypto_pcomp *tfm,
|
|
|
|
struct comp_request *req)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
struct zlib_ctx *dctx = crypto_tfm_ctx(crypto_pcomp_tfm(tfm));
|
|
|
|
struct z_stream_s *stream = &dctx->comp_stream;
|
|
|
|
|
|
|
|
pr_debug("avail_in %u, avail_out %u\n", req->avail_in, req->avail_out);
|
|
|
|
stream->next_in = req->next_in;
|
|
|
|
stream->avail_in = req->avail_in;
|
|
|
|
stream->next_out = req->next_out;
|
|
|
|
stream->avail_out = req->avail_out;
|
|
|
|
|
|
|
|
ret = zlib_deflate(stream, Z_NO_FLUSH);
|
|
|
|
switch (ret) {
|
|
|
|
case Z_OK:
|
|
|
|
break;
|
|
|
|
|
|
|
|
case Z_BUF_ERROR:
|
|
|
|
pr_debug("zlib_deflate could not make progress\n");
|
|
|
|
return -EAGAIN;
|
|
|
|
|
|
|
|
default:
|
|
|
|
pr_debug("zlib_deflate failed %d\n", ret);
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2009-05-27 09:05:02 +04:00
|
|
|
ret = req->avail_out - stream->avail_out;
|
initramfs: support initramfs that is bigger than 2GiB
Now with 64bit bzImage and kexec tools, we support ramdisk that size is
bigger than 2g, as we could put it above 4G.
Found compressed initramfs image could not be decompressed properly. It
turns out that image length is int during decompress detection, and it
will become < 0 when length is more than 2G. Furthermore, during
decompressing len as int is used for inbuf count, that has problem too.
Change len to long, that should be ok as on 32 bit platform long is
32bits.
Tested with following compressed initramfs image as root with kexec.
gzip, bzip2, xz, lzma, lzop, lz4.
run time for populate_rootfs():
size name Nehalem-EX Westmere-EX Ivybridge-EX
9034400256 root_img : 26s 24s 30s
3561095057 root_img.lz4 : 28s 27s 27s
3459554629 root_img.lzo : 29s 29s 28s
3219399480 root_img.gz : 64s 62s 49s
2251594592 root_img.xz : 262s 260s 183s
2226366598 root_img.lzma: 386s 376s 277s
2901482513 root_img.bz2 : 635s 599s
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Rashika Kheria <rashika.kheria@gmail.com>
Cc: Josh Triplett <josh@joshtriplett.org>
Cc: Kyungsik Lee <kyungsik.lee@lge.com>
Cc: P J P <ppandit@redhat.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
Cc: "Daniel M. Weeks" <dan@danweeks.net>
Cc: Alexandre Courbot <acourbot@nvidia.com>
Cc: Jan Beulich <JBeulich@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2014-08-09 01:23:14 +04:00
|
|
|
pr_debug("avail_in %lu, avail_out %lu (consumed %lu, produced %u)\n",
|
2009-03-04 10:15:49 +03:00
|
|
|
stream->avail_in, stream->avail_out,
|
2009-05-27 09:05:02 +04:00
|
|
|
req->avail_in - stream->avail_in, ret);
|
2009-03-04 10:15:49 +03:00
|
|
|
req->next_in = stream->next_in;
|
|
|
|
req->avail_in = stream->avail_in;
|
|
|
|
req->next_out = stream->next_out;
|
|
|
|
req->avail_out = stream->avail_out;
|
2009-05-27 09:05:02 +04:00
|
|
|
return ret;
|
2009-03-04 10:15:49 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static int zlib_compress_final(struct crypto_pcomp *tfm,
|
|
|
|
struct comp_request *req)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
struct zlib_ctx *dctx = crypto_tfm_ctx(crypto_pcomp_tfm(tfm));
|
|
|
|
struct z_stream_s *stream = &dctx->comp_stream;
|
|
|
|
|
|
|
|
pr_debug("avail_in %u, avail_out %u\n", req->avail_in, req->avail_out);
|
|
|
|
stream->next_in = req->next_in;
|
|
|
|
stream->avail_in = req->avail_in;
|
|
|
|
stream->next_out = req->next_out;
|
|
|
|
stream->avail_out = req->avail_out;
|
|
|
|
|
|
|
|
ret = zlib_deflate(stream, Z_FINISH);
|
|
|
|
if (ret != Z_STREAM_END) {
|
|
|
|
pr_debug("zlib_deflate failed %d\n", ret);
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2009-05-27 09:05:02 +04:00
|
|
|
ret = req->avail_out - stream->avail_out;
|
initramfs: support initramfs that is bigger than 2GiB
Now with 64bit bzImage and kexec tools, we support ramdisk that size is
bigger than 2g, as we could put it above 4G.
Found compressed initramfs image could not be decompressed properly. It
turns out that image length is int during decompress detection, and it
will become < 0 when length is more than 2G. Furthermore, during
decompressing len as int is used for inbuf count, that has problem too.
Change len to long, that should be ok as on 32 bit platform long is
32bits.
Tested with following compressed initramfs image as root with kexec.
gzip, bzip2, xz, lzma, lzop, lz4.
run time for populate_rootfs():
size name Nehalem-EX Westmere-EX Ivybridge-EX
9034400256 root_img : 26s 24s 30s
3561095057 root_img.lz4 : 28s 27s 27s
3459554629 root_img.lzo : 29s 29s 28s
3219399480 root_img.gz : 64s 62s 49s
2251594592 root_img.xz : 262s 260s 183s
2226366598 root_img.lzma: 386s 376s 277s
2901482513 root_img.bz2 : 635s 599s
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Rashika Kheria <rashika.kheria@gmail.com>
Cc: Josh Triplett <josh@joshtriplett.org>
Cc: Kyungsik Lee <kyungsik.lee@lge.com>
Cc: P J P <ppandit@redhat.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
Cc: "Daniel M. Weeks" <dan@danweeks.net>
Cc: Alexandre Courbot <acourbot@nvidia.com>
Cc: Jan Beulich <JBeulich@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2014-08-09 01:23:14 +04:00
|
|
|
pr_debug("avail_in %lu, avail_out %lu (consumed %lu, produced %u)\n",
|
2009-03-04 10:15:49 +03:00
|
|
|
stream->avail_in, stream->avail_out,
|
2009-05-27 09:05:02 +04:00
|
|
|
req->avail_in - stream->avail_in, ret);
|
2009-03-04 10:15:49 +03:00
|
|
|
req->next_in = stream->next_in;
|
|
|
|
req->avail_in = stream->avail_in;
|
|
|
|
req->next_out = stream->next_out;
|
|
|
|
req->avail_out = stream->avail_out;
|
2009-05-27 09:05:02 +04:00
|
|
|
return ret;
|
2009-03-04 10:15:49 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int zlib_decompress_setup(struct crypto_pcomp *tfm, void *params,
|
|
|
|
unsigned int len)
|
|
|
|
{
|
|
|
|
struct zlib_ctx *ctx = crypto_tfm_ctx(crypto_pcomp_tfm(tfm));
|
|
|
|
struct z_stream_s *stream = &ctx->decomp_stream;
|
|
|
|
struct nlattr *tb[ZLIB_DECOMP_MAX + 1];
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
ret = nla_parse(tb, ZLIB_DECOMP_MAX, params, len, NULL);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
zlib_decomp_exit(ctx);
|
|
|
|
|
|
|
|
ctx->decomp_windowBits = tb[ZLIB_DECOMP_WINDOWBITS]
|
|
|
|
? nla_get_u32(tb[ZLIB_DECOMP_WINDOWBITS])
|
|
|
|
: DEF_WBITS;
|
|
|
|
|
2011-06-29 16:48:41 +04:00
|
|
|
stream->workspace = vzalloc(zlib_inflate_workspacesize());
|
2009-03-04 10:15:49 +03:00
|
|
|
if (!stream->workspace)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
ret = zlib_inflateInit2(stream, ctx->decomp_windowBits);
|
|
|
|
if (ret != Z_OK) {
|
2011-06-29 16:48:41 +04:00
|
|
|
vfree(stream->workspace);
|
2009-03-04 10:15:49 +03:00
|
|
|
stream->workspace = NULL;
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int zlib_decompress_init(struct crypto_pcomp *tfm)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
struct zlib_ctx *dctx = crypto_tfm_ctx(crypto_pcomp_tfm(tfm));
|
|
|
|
struct z_stream_s *stream = &dctx->decomp_stream;
|
|
|
|
|
|
|
|
ret = zlib_inflateReset(stream);
|
|
|
|
if (ret != Z_OK)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int zlib_decompress_update(struct crypto_pcomp *tfm,
|
|
|
|
struct comp_request *req)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
struct zlib_ctx *dctx = crypto_tfm_ctx(crypto_pcomp_tfm(tfm));
|
|
|
|
struct z_stream_s *stream = &dctx->decomp_stream;
|
|
|
|
|
|
|
|
pr_debug("avail_in %u, avail_out %u\n", req->avail_in, req->avail_out);
|
|
|
|
stream->next_in = req->next_in;
|
|
|
|
stream->avail_in = req->avail_in;
|
|
|
|
stream->next_out = req->next_out;
|
|
|
|
stream->avail_out = req->avail_out;
|
|
|
|
|
|
|
|
ret = zlib_inflate(stream, Z_SYNC_FLUSH);
|
|
|
|
switch (ret) {
|
|
|
|
case Z_OK:
|
|
|
|
case Z_STREAM_END:
|
|
|
|
break;
|
|
|
|
|
|
|
|
case Z_BUF_ERROR:
|
|
|
|
pr_debug("zlib_inflate could not make progress\n");
|
|
|
|
return -EAGAIN;
|
|
|
|
|
|
|
|
default:
|
|
|
|
pr_debug("zlib_inflate failed %d\n", ret);
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2009-05-27 09:05:02 +04:00
|
|
|
ret = req->avail_out - stream->avail_out;
|
initramfs: support initramfs that is bigger than 2GiB
Now with 64bit bzImage and kexec tools, we support ramdisk that size is
bigger than 2g, as we could put it above 4G.
Found compressed initramfs image could not be decompressed properly. It
turns out that image length is int during decompress detection, and it
will become < 0 when length is more than 2G. Furthermore, during
decompressing len as int is used for inbuf count, that has problem too.
Change len to long, that should be ok as on 32 bit platform long is
32bits.
Tested with following compressed initramfs image as root with kexec.
gzip, bzip2, xz, lzma, lzop, lz4.
run time for populate_rootfs():
size name Nehalem-EX Westmere-EX Ivybridge-EX
9034400256 root_img : 26s 24s 30s
3561095057 root_img.lz4 : 28s 27s 27s
3459554629 root_img.lzo : 29s 29s 28s
3219399480 root_img.gz : 64s 62s 49s
2251594592 root_img.xz : 262s 260s 183s
2226366598 root_img.lzma: 386s 376s 277s
2901482513 root_img.bz2 : 635s 599s
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Rashika Kheria <rashika.kheria@gmail.com>
Cc: Josh Triplett <josh@joshtriplett.org>
Cc: Kyungsik Lee <kyungsik.lee@lge.com>
Cc: P J P <ppandit@redhat.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
Cc: "Daniel M. Weeks" <dan@danweeks.net>
Cc: Alexandre Courbot <acourbot@nvidia.com>
Cc: Jan Beulich <JBeulich@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2014-08-09 01:23:14 +04:00
|
|
|
pr_debug("avail_in %lu, avail_out %lu (consumed %lu, produced %u)\n",
|
2009-03-04 10:15:49 +03:00
|
|
|
stream->avail_in, stream->avail_out,
|
2009-05-27 09:05:02 +04:00
|
|
|
req->avail_in - stream->avail_in, ret);
|
2009-03-04 10:15:49 +03:00
|
|
|
req->next_in = stream->next_in;
|
|
|
|
req->avail_in = stream->avail_in;
|
|
|
|
req->next_out = stream->next_out;
|
|
|
|
req->avail_out = stream->avail_out;
|
2009-05-27 09:05:02 +04:00
|
|
|
return ret;
|
2009-03-04 10:15:49 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static int zlib_decompress_final(struct crypto_pcomp *tfm,
|
|
|
|
struct comp_request *req)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
struct zlib_ctx *dctx = crypto_tfm_ctx(crypto_pcomp_tfm(tfm));
|
|
|
|
struct z_stream_s *stream = &dctx->decomp_stream;
|
|
|
|
|
|
|
|
pr_debug("avail_in %u, avail_out %u\n", req->avail_in, req->avail_out);
|
|
|
|
stream->next_in = req->next_in;
|
|
|
|
stream->avail_in = req->avail_in;
|
|
|
|
stream->next_out = req->next_out;
|
|
|
|
stream->avail_out = req->avail_out;
|
|
|
|
|
|
|
|
if (dctx->decomp_windowBits < 0) {
|
|
|
|
ret = zlib_inflate(stream, Z_SYNC_FLUSH);
|
|
|
|
/*
|
|
|
|
* Work around a bug in zlib, which sometimes wants to taste an
|
|
|
|
* extra byte when being used in the (undocumented) raw deflate
|
|
|
|
* mode. (From USAGI).
|
|
|
|
*/
|
|
|
|
if (ret == Z_OK && !stream->avail_in && stream->avail_out) {
|
|
|
|
const void *saved_next_in = stream->next_in;
|
|
|
|
u8 zerostuff = 0;
|
|
|
|
|
|
|
|
stream->next_in = &zerostuff;
|
|
|
|
stream->avail_in = 1;
|
|
|
|
ret = zlib_inflate(stream, Z_FINISH);
|
|
|
|
stream->next_in = saved_next_in;
|
|
|
|
stream->avail_in = 0;
|
|
|
|
}
|
|
|
|
} else
|
|
|
|
ret = zlib_inflate(stream, Z_FINISH);
|
|
|
|
if (ret != Z_STREAM_END) {
|
|
|
|
pr_debug("zlib_inflate failed %d\n", ret);
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2009-05-27 09:05:02 +04:00
|
|
|
ret = req->avail_out - stream->avail_out;
|
initramfs: support initramfs that is bigger than 2GiB
Now with 64bit bzImage and kexec tools, we support ramdisk that size is
bigger than 2g, as we could put it above 4G.
Found compressed initramfs image could not be decompressed properly. It
turns out that image length is int during decompress detection, and it
will become < 0 when length is more than 2G. Furthermore, during
decompressing len as int is used for inbuf count, that has problem too.
Change len to long, that should be ok as on 32 bit platform long is
32bits.
Tested with following compressed initramfs image as root with kexec.
gzip, bzip2, xz, lzma, lzop, lz4.
run time for populate_rootfs():
size name Nehalem-EX Westmere-EX Ivybridge-EX
9034400256 root_img : 26s 24s 30s
3561095057 root_img.lz4 : 28s 27s 27s
3459554629 root_img.lzo : 29s 29s 28s
3219399480 root_img.gz : 64s 62s 49s
2251594592 root_img.xz : 262s 260s 183s
2226366598 root_img.lzma: 386s 376s 277s
2901482513 root_img.bz2 : 635s 599s
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Rashika Kheria <rashika.kheria@gmail.com>
Cc: Josh Triplett <josh@joshtriplett.org>
Cc: Kyungsik Lee <kyungsik.lee@lge.com>
Cc: P J P <ppandit@redhat.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
Cc: "Daniel M. Weeks" <dan@danweeks.net>
Cc: Alexandre Courbot <acourbot@nvidia.com>
Cc: Jan Beulich <JBeulich@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2014-08-09 01:23:14 +04:00
|
|
|
pr_debug("avail_in %lu, avail_out %lu (consumed %lu, produced %u)\n",
|
2009-03-04 10:15:49 +03:00
|
|
|
stream->avail_in, stream->avail_out,
|
2009-05-27 09:05:02 +04:00
|
|
|
req->avail_in - stream->avail_in, ret);
|
2009-03-04 10:15:49 +03:00
|
|
|
req->next_in = stream->next_in;
|
|
|
|
req->avail_in = stream->avail_in;
|
|
|
|
req->next_out = stream->next_out;
|
|
|
|
req->avail_out = stream->avail_out;
|
2009-05-27 09:05:02 +04:00
|
|
|
return ret;
|
2009-03-04 10:15:49 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static struct pcomp_alg zlib_alg = {
|
|
|
|
.compress_setup = zlib_compress_setup,
|
|
|
|
.compress_init = zlib_compress_init,
|
|
|
|
.compress_update = zlib_compress_update,
|
|
|
|
.compress_final = zlib_compress_final,
|
|
|
|
.decompress_setup = zlib_decompress_setup,
|
|
|
|
.decompress_init = zlib_decompress_init,
|
|
|
|
.decompress_update = zlib_decompress_update,
|
|
|
|
.decompress_final = zlib_decompress_final,
|
|
|
|
|
|
|
|
.base = {
|
|
|
|
.cra_name = "zlib",
|
|
|
|
.cra_flags = CRYPTO_ALG_TYPE_PCOMPRESS,
|
|
|
|
.cra_ctxsize = sizeof(struct zlib_ctx),
|
|
|
|
.cra_module = THIS_MODULE,
|
|
|
|
.cra_init = zlib_init,
|
|
|
|
.cra_exit = zlib_exit,
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
static int __init zlib_mod_init(void)
|
|
|
|
{
|
|
|
|
return crypto_register_pcomp(&zlib_alg);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void __exit zlib_mod_fini(void)
|
|
|
|
{
|
|
|
|
crypto_unregister_pcomp(&zlib_alg);
|
|
|
|
}
|
|
|
|
|
|
|
|
module_init(zlib_mod_init);
|
|
|
|
module_exit(zlib_mod_fini);
|
|
|
|
|
|
|
|
MODULE_LICENSE("GPL");
|
|
|
|
MODULE_DESCRIPTION("Zlib Compression Algorithm");
|
|
|
|
MODULE_AUTHOR("Sony Corporation");
|