d97b07c54f
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>
75 lines
1.6 KiB
C
75 lines
1.6 KiB
C
/*
|
|
* decompress.c
|
|
*
|
|
* Detect the decompression method based on magic number
|
|
*/
|
|
|
|
#include <linux/decompress/generic.h>
|
|
|
|
#include <linux/decompress/bunzip2.h>
|
|
#include <linux/decompress/unlzma.h>
|
|
#include <linux/decompress/unxz.h>
|
|
#include <linux/decompress/inflate.h>
|
|
#include <linux/decompress/unlzo.h>
|
|
#include <linux/decompress/unlz4.h>
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/string.h>
|
|
#include <linux/init.h>
|
|
#include <linux/printk.h>
|
|
|
|
#ifndef CONFIG_DECOMPRESS_GZIP
|
|
# define gunzip NULL
|
|
#endif
|
|
#ifndef CONFIG_DECOMPRESS_BZIP2
|
|
# define bunzip2 NULL
|
|
#endif
|
|
#ifndef CONFIG_DECOMPRESS_LZMA
|
|
# define unlzma NULL
|
|
#endif
|
|
#ifndef CONFIG_DECOMPRESS_XZ
|
|
# define unxz NULL
|
|
#endif
|
|
#ifndef CONFIG_DECOMPRESS_LZO
|
|
# define unlzo NULL
|
|
#endif
|
|
#ifndef CONFIG_DECOMPRESS_LZ4
|
|
# define unlz4 NULL
|
|
#endif
|
|
|
|
struct compress_format {
|
|
unsigned char magic[2];
|
|
const char *name;
|
|
decompress_fn decompressor;
|
|
};
|
|
|
|
static const struct compress_format compressed_formats[] __initconst = {
|
|
{ {037, 0213}, "gzip", gunzip },
|
|
{ {037, 0236}, "gzip", gunzip },
|
|
{ {0x42, 0x5a}, "bzip2", bunzip2 },
|
|
{ {0x5d, 0x00}, "lzma", unlzma },
|
|
{ {0xfd, 0x37}, "xz", unxz },
|
|
{ {0x89, 0x4c}, "lzo", unlzo },
|
|
{ {0x02, 0x21}, "lz4", unlz4 },
|
|
{ {0, 0}, NULL, NULL }
|
|
};
|
|
|
|
decompress_fn __init decompress_method(const unsigned char *inbuf, long len,
|
|
const char **name)
|
|
{
|
|
const struct compress_format *cf;
|
|
|
|
if (len < 2)
|
|
return NULL; /* Need at least this much... */
|
|
|
|
pr_debug("Compressed data magic: %#.2x %#.2x\n", inbuf[0], inbuf[1]);
|
|
|
|
for (cf = compressed_formats; cf->name; cf++) {
|
|
if (!memcmp(inbuf, cf->magic, 2))
|
|
break;
|
|
|
|
}
|
|
if (name)
|
|
*name = cf->name;
|
|
return cf->decompressor;
|
|
}
|