lib: Add support for LZ4-compressed kernel
This patch adds support for extracting LZ4-compressed kernel images, as well as LZ4-compressed ramdisk images in the kernel boot process. This depends on the patch below decompressor: Add LZ4 decompressor module Signed-off-by: Kyungsik Lee <kyungsik.lee@lge.com> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
parent
e944e7f810
commit
cdc837f4d9
|
@ -33,6 +33,7 @@ static const struct filetype_str filetype_str[] = {
|
||||||
[filetype_unknown] = { "unknown", "unkown" },
|
[filetype_unknown] = { "unknown", "unkown" },
|
||||||
[filetype_arm_zimage] = { "arm Linux zImage", "arm-zimage" },
|
[filetype_arm_zimage] = { "arm Linux zImage", "arm-zimage" },
|
||||||
[filetype_lzo_compressed] = { "lzo compressed", "lzo" },
|
[filetype_lzo_compressed] = { "lzo compressed", "lzo" },
|
||||||
|
[filetype_lz4_compressed] = { "lz4 compressed", "lz4" },
|
||||||
[filetype_arm_barebox] = { "arm barebox image", "arm-barebox" },
|
[filetype_arm_barebox] = { "arm barebox image", "arm-barebox" },
|
||||||
[filetype_uimage] = { "U-Boot uImage", "u-boot" },
|
[filetype_uimage] = { "U-Boot uImage", "u-boot" },
|
||||||
[filetype_ubi] = { "UBI image", "ubi" },
|
[filetype_ubi] = { "UBI image", "ubi" },
|
||||||
|
@ -195,6 +196,9 @@ enum filetype file_detect_type(const void *_buf, size_t bufsize)
|
||||||
if (buf8[0] == 0x89 && buf8[1] == 0x4c && buf8[2] == 0x5a &&
|
if (buf8[0] == 0x89 && buf8[1] == 0x4c && buf8[2] == 0x5a &&
|
||||||
buf8[3] == 0x4f)
|
buf8[3] == 0x4f)
|
||||||
return filetype_lzo_compressed;
|
return filetype_lzo_compressed;
|
||||||
|
if (buf8[0] == 0x02 && buf8[1] == 0x21 && buf8[2] == 0x4c &&
|
||||||
|
buf8[3] == 0x18)
|
||||||
|
return filetype_lz4_compressed;
|
||||||
if (buf[0] == be32_to_cpu(0x27051956))
|
if (buf[0] == be32_to_cpu(0x27051956))
|
||||||
return filetype_uimage;
|
return filetype_uimage;
|
||||||
if (buf[0] == 0x23494255)
|
if (buf[0] == 0x23494255)
|
||||||
|
|
|
@ -10,6 +10,7 @@ enum filetype {
|
||||||
filetype_unknown,
|
filetype_unknown,
|
||||||
filetype_arm_zimage,
|
filetype_arm_zimage,
|
||||||
filetype_lzo_compressed,
|
filetype_lzo_compressed,
|
||||||
|
filetype_lz4_compressed,
|
||||||
filetype_arm_barebox,
|
filetype_arm_barebox,
|
||||||
filetype_uimage,
|
filetype_uimage,
|
||||||
filetype_ubi,
|
filetype_ubi,
|
||||||
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
#ifndef DECOMPRESS_UNLZ4_H
|
||||||
|
#define DECOMPRESS_UNLZ4_H
|
||||||
|
|
||||||
|
int decompress_unlz4(unsigned char *inbuf, int len,
|
||||||
|
int(*fill)(void*, unsigned int),
|
||||||
|
int(*flush)(void*, unsigned int),
|
||||||
|
unsigned char *output,
|
||||||
|
int *pos,
|
||||||
|
void(*error)(char *x));
|
||||||
|
#endif
|
|
@ -14,6 +14,10 @@ config BZLIB
|
||||||
bool "include bzip2 uncompression support"
|
bool "include bzip2 uncompression support"
|
||||||
select UNCOMPRESS
|
select UNCOMPRESS
|
||||||
|
|
||||||
|
config LZ4_DECOMPRESS
|
||||||
|
bool "include lz4 uncompression support"
|
||||||
|
select UNCOMPRESS
|
||||||
|
|
||||||
config GENERIC_FIND_NEXT_BIT
|
config GENERIC_FIND_NEXT_BIT
|
||||||
def_bool n
|
def_bool n
|
||||||
|
|
||||||
|
|
|
@ -28,8 +28,10 @@ obj-y += notifier.o
|
||||||
obj-y += copy_file.o
|
obj-y += copy_file.o
|
||||||
obj-y += random.o
|
obj-y += random.o
|
||||||
obj-y += lzo/
|
obj-y += lzo/
|
||||||
|
obj-$(CONFIG_LZ4_DECOMPRESS) += lz4/
|
||||||
obj-y += show_progress.o
|
obj-y += show_progress.o
|
||||||
obj-$(CONFIG_LZO_DECOMPRESS) += decompress_unlzo.o
|
obj-$(CONFIG_LZO_DECOMPRESS) += decompress_unlzo.o
|
||||||
|
obj-$(CONFIG_LZ4_DECOMPRESS) += decompress_unlz4.o
|
||||||
obj-$(CONFIG_PROCESS_ESCAPE_SEQUENCE) += process_escape_sequence.o
|
obj-$(CONFIG_PROCESS_ESCAPE_SEQUENCE) += process_escape_sequence.o
|
||||||
obj-$(CONFIG_UNCOMPRESS) += uncompress.o
|
obj-$(CONFIG_UNCOMPRESS) += uncompress.o
|
||||||
obj-$(CONFIG_BCH) += bch.o
|
obj-$(CONFIG_BCH) += bch.o
|
||||||
|
|
|
@ -0,0 +1,188 @@
|
||||||
|
/*
|
||||||
|
* Wrapper for decompressing LZ4-compressed kernel, initramfs, and initrd
|
||||||
|
*
|
||||||
|
* Copyright (C) 2013, LG Electronics, Kyungsik Lee <kyungsik.lee@lge.com>
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License version 2 as
|
||||||
|
* published by the Free Software Foundation.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifdef STATIC
|
||||||
|
#define PREBOOT
|
||||||
|
#include <linux/decompress/mm.h>
|
||||||
|
#include "lz4/lz4_decompress.c"
|
||||||
|
#else
|
||||||
|
#include <linux/decompress/unlz4.h>
|
||||||
|
#include <malloc.h>
|
||||||
|
#endif
|
||||||
|
#include <linux/types.h>
|
||||||
|
#include <linux/lz4.h>
|
||||||
|
#include <linux/decompress/mm.h>
|
||||||
|
#include <linux/compiler.h>
|
||||||
|
|
||||||
|
#include <asm/unaligned.h>
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Note: Uncompressed chunk size is used in the compressor side
|
||||||
|
* (userspace side for compression).
|
||||||
|
* It is hardcoded because there is not proper way to extract it
|
||||||
|
* from the binary stream which is generated by the preliminary
|
||||||
|
* version of LZ4 tool so far.
|
||||||
|
*/
|
||||||
|
#define LZ4_DEFAULT_UNCOMPRESSED_CHUNK_SIZE (8 << 20)
|
||||||
|
#define ARCHIVE_MAGICNUMBER 0x184C2102
|
||||||
|
|
||||||
|
static inline int unlz4(u8 *input, int in_len,
|
||||||
|
int (*fill) (void *, unsigned int),
|
||||||
|
int (*flush) (void *, unsigned int),
|
||||||
|
u8 *output, int *posp,
|
||||||
|
void (*error) (char *x))
|
||||||
|
{
|
||||||
|
int ret = -1;
|
||||||
|
size_t chunksize = 0;
|
||||||
|
size_t uncomp_chunksize = LZ4_DEFAULT_UNCOMPRESSED_CHUNK_SIZE;
|
||||||
|
u8 *inp;
|
||||||
|
u8 *inp_start;
|
||||||
|
u8 *outp;
|
||||||
|
int size = in_len;
|
||||||
|
#ifdef PREBOOT
|
||||||
|
size_t out_len = get_unaligned_le32(input + in_len);
|
||||||
|
#endif
|
||||||
|
size_t dest_len;
|
||||||
|
|
||||||
|
|
||||||
|
if (output) {
|
||||||
|
outp = output;
|
||||||
|
} else if (!flush) {
|
||||||
|
error("NULL output pointer and no flush function provided");
|
||||||
|
goto exit_0;
|
||||||
|
} else {
|
||||||
|
outp = malloc(uncomp_chunksize);
|
||||||
|
if (!outp) {
|
||||||
|
error("Could not allocate output buffer");
|
||||||
|
goto exit_0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (input && fill) {
|
||||||
|
error("Both input pointer and fill function provided,");
|
||||||
|
goto exit_1;
|
||||||
|
} else if (input) {
|
||||||
|
inp = input;
|
||||||
|
} else if (!fill) {
|
||||||
|
error("NULL input pointer and missing fill function");
|
||||||
|
goto exit_1;
|
||||||
|
} else {
|
||||||
|
inp = malloc(lz4_compressbound(uncomp_chunksize));
|
||||||
|
if (!inp) {
|
||||||
|
error("Could not allocate input buffer");
|
||||||
|
goto exit_1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
inp_start = inp;
|
||||||
|
|
||||||
|
if (posp)
|
||||||
|
*posp = 0;
|
||||||
|
|
||||||
|
if (fill)
|
||||||
|
fill(inp, 4);
|
||||||
|
|
||||||
|
chunksize = get_unaligned_le32(inp);
|
||||||
|
if (chunksize == ARCHIVE_MAGICNUMBER) {
|
||||||
|
inp += 4;
|
||||||
|
size -= 4;
|
||||||
|
} else {
|
||||||
|
error("invalid header");
|
||||||
|
goto exit_2;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (posp)
|
||||||
|
*posp += 4;
|
||||||
|
|
||||||
|
for (;;) {
|
||||||
|
|
||||||
|
if (fill)
|
||||||
|
fill(inp, 4);
|
||||||
|
|
||||||
|
chunksize = get_unaligned_le32(inp);
|
||||||
|
if (chunksize == ARCHIVE_MAGICNUMBER) {
|
||||||
|
inp += 4;
|
||||||
|
size -= 4;
|
||||||
|
if (posp)
|
||||||
|
*posp += 4;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
inp += 4;
|
||||||
|
size -= 4;
|
||||||
|
|
||||||
|
if (posp)
|
||||||
|
*posp += 4;
|
||||||
|
|
||||||
|
if (fill) {
|
||||||
|
if (chunksize > lz4_compressbound(uncomp_chunksize)) {
|
||||||
|
error("chunk length is longer than allocated");
|
||||||
|
goto exit_2;
|
||||||
|
}
|
||||||
|
fill(inp, chunksize);
|
||||||
|
}
|
||||||
|
#ifdef PREBOOT
|
||||||
|
if (out_len >= uncomp_chunksize) {
|
||||||
|
dest_len = uncomp_chunksize;
|
||||||
|
out_len -= dest_len;
|
||||||
|
} else
|
||||||
|
dest_len = out_len;
|
||||||
|
ret = lz4_decompress(inp, &chunksize, outp, dest_len);
|
||||||
|
#else
|
||||||
|
dest_len = uncomp_chunksize;
|
||||||
|
ret = lz4_decompress_unknownoutputsize(inp, chunksize, outp,
|
||||||
|
&dest_len);
|
||||||
|
#endif
|
||||||
|
if (ret < 0) {
|
||||||
|
error("Decoding failed");
|
||||||
|
goto exit_2;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (flush && flush(outp, dest_len) != dest_len)
|
||||||
|
goto exit_2;
|
||||||
|
if (output)
|
||||||
|
outp += dest_len;
|
||||||
|
if (posp)
|
||||||
|
*posp += chunksize;
|
||||||
|
|
||||||
|
size -= chunksize;
|
||||||
|
|
||||||
|
if (size == 0)
|
||||||
|
break;
|
||||||
|
else if (size < 0) {
|
||||||
|
error("data corrupted");
|
||||||
|
goto exit_2;
|
||||||
|
}
|
||||||
|
|
||||||
|
inp += chunksize;
|
||||||
|
if (fill)
|
||||||
|
inp = inp_start;
|
||||||
|
}
|
||||||
|
|
||||||
|
ret = 0;
|
||||||
|
exit_2:
|
||||||
|
if (!input)
|
||||||
|
free(inp_start);
|
||||||
|
exit_1:
|
||||||
|
if (!output)
|
||||||
|
free(outp);
|
||||||
|
exit_0:
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
int decompress_unlz4(unsigned char *buf, int in_len,
|
||||||
|
int(*fill)(void*, unsigned int),
|
||||||
|
int(*flush)(void*, unsigned int),
|
||||||
|
unsigned char *output,
|
||||||
|
int *posp,
|
||||||
|
void(*error)(char *x)
|
||||||
|
)
|
||||||
|
{
|
||||||
|
return unlz4(buf, in_len - 4, fill, flush, output, posp, error);
|
||||||
|
}
|
||||||
|
#define decompress decompress_unlz4
|
|
@ -0,0 +1 @@
|
||||||
|
obj-$(CONFIG_LZ4_DECOMPRESS) += lz4_decompress.o
|
|
@ -38,10 +38,11 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef STATIC
|
#ifndef STATIC
|
||||||
#include <linux/module.h>
|
#include <module.h>
|
||||||
#include <linux/kernel.h>
|
#include <linux/kernel.h>
|
||||||
#endif
|
#endif
|
||||||
#include <linux/lz4.h>
|
#include <linux/lz4.h>
|
||||||
|
#include <linux/string.h>
|
||||||
|
|
||||||
#include <asm/unaligned.h>
|
#include <asm/unaligned.h>
|
||||||
|
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
#include <bunzip2.h>
|
#include <bunzip2.h>
|
||||||
#include <gunzip.h>
|
#include <gunzip.h>
|
||||||
#include <lzo.h>
|
#include <lzo.h>
|
||||||
|
#include <linux/decompress/unlz4.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <filetype.h>
|
#include <filetype.h>
|
||||||
#include <malloc.h>
|
#include <malloc.h>
|
||||||
|
@ -111,6 +112,11 @@ int uncompress(unsigned char *inbuf, int len,
|
||||||
case filetype_lzo_compressed:
|
case filetype_lzo_compressed:
|
||||||
compfn = decompress_unlzo;
|
compfn = decompress_unlzo;
|
||||||
break;
|
break;
|
||||||
|
#endif
|
||||||
|
#ifdef CONFIG_LZ4_DECOMPRESS
|
||||||
|
case filetype_lz4_compressed:
|
||||||
|
compfn = decompress_unlz4;
|
||||||
|
break;
|
||||||
#endif
|
#endif
|
||||||
default:
|
default:
|
||||||
err = asprintf("cannot handle filetype %s", file_type_to_string(ft));
|
err = asprintf("cannot handle filetype %s", file_type_to_string(ft));
|
||||||
|
|
|
@ -289,6 +289,11 @@ cmd_xzmisc = (cat $(filter-out FORCE,$^) | \
|
||||||
xz --check=crc32 --lzma2=dict=1MiB) > $@ || \
|
xz --check=crc32 --lzma2=dict=1MiB) > $@ || \
|
||||||
(rm -f $@ ; false)
|
(rm -f $@ ; false)
|
||||||
|
|
||||||
|
quiet_cmd_lz4 = LZ4 $@
|
||||||
|
cmd_lz4 = (cat $(filter-out FORCE,$^) | \
|
||||||
|
lz4c -l -c1 stdin stdout && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
|
||||||
|
(rm -f $@ ; false)
|
||||||
|
|
||||||
quiet_cmd_disasm = DISASM $@
|
quiet_cmd_disasm = DISASM $@
|
||||||
cmd_disasm = $(OBJDUMP) -d $< > $@
|
cmd_disasm = $(OBJDUMP) -d $< > $@
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue