Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d97b07c5 authored by Yinghai Lu's avatar Yinghai Lu Committed by Linus Torvalds
Browse files

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: default avatarYinghai 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 38747439

crypto/zlib.c

+4 −4
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static int zlib_compress_update(struct crypto_pcomp *tfm, 
	}



	ret = req->avail_out - stream->avail_out;

	pr_debug("avail_in %u, avail_out %u (consumed %u, produced %u)\n",

	pr_debug("avail_in %lu, avail_out %lu (consumed %lu, produced %u)\n",

		 stream->avail_in, stream->avail_out,

		 req->avail_in - stream->avail_in, ret);

	req->next_in = stream->next_in;
@@ -198,7 +198,7 @@ static int zlib_compress_final(struct crypto_pcomp *tfm, 
	}



	ret = req->avail_out - stream->avail_out;

	pr_debug("avail_in %u, avail_out %u (consumed %u, produced %u)\n",

	pr_debug("avail_in %lu, avail_out %lu (consumed %lu, produced %u)\n",

		 stream->avail_in, stream->avail_out,

		 req->avail_in - stream->avail_in, ret);

	req->next_in = stream->next_in;
@@ -283,7 +283,7 @@ static int zlib_decompress_update(struct crypto_pcomp *tfm, 
	}



	ret = req->avail_out - stream->avail_out;

	pr_debug("avail_in %u, avail_out %u (consumed %u, produced %u)\n",

	pr_debug("avail_in %lu, avail_out %lu (consumed %lu, produced %u)\n",

		 stream->avail_in, stream->avail_out,

		 req->avail_in - stream->avail_in, ret);

	req->next_in = stream->next_in;
@@ -331,7 +331,7 @@ static int zlib_decompress_final(struct crypto_pcomp *tfm, 
	}



	ret = req->avail_out - stream->avail_out;

	pr_debug("avail_in %u, avail_out %u (consumed %u, produced %u)\n",

	pr_debug("avail_in %lu, avail_out %lu (consumed %lu, produced %u)\n",

		 stream->avail_in, stream->avail_out,

		 req->avail_in - stream->avail_in, ret);

	req->next_in = stream->next_in;

fs/isofs/compress.c

+2 −2
Original line number Diff line number Diff line
@@ -158,8 +158,8 @@ static loff_t zisofs_uncompress_block(struct inode *inode, loff_t block_start, 
					       "zisofs: zisofs_inflate returned"

					       " %d, inode = %lu,"

					       " page idx = %d, bh idx = %d,"

					       " avail_in = %d,"

					       " avail_out = %d\n",

					       " avail_in = %ld,"

					       " avail_out = %ld\n",

					       zerr, inode->i_ino, curpage,

					       curbh, stream.avail_in,

					       stream.avail_out);

fs/jffs2/compr_zlib.c

+4 −3
Original line number Diff line number Diff line
@@ -94,11 +94,12 @@ static int jffs2_zlib_compress(unsigned char *data_in, 


	while (def_strm.total_out < *dstlen - STREAM_END_SPACE && def_strm.total_in < *sourcelen) {

		def_strm.avail_out = *dstlen - (def_strm.total_out + STREAM_END_SPACE);

		def_strm.avail_in = min((unsigned)(*sourcelen-def_strm.total_in), def_strm.avail_out);

		jffs2_dbg(1, "calling deflate with avail_in %d, avail_out %d\n",

		def_strm.avail_in = min_t(unsigned long,

			(*sourcelen-def_strm.total_in), def_strm.avail_out);

		jffs2_dbg(1, "calling deflate with avail_in %ld, avail_out %ld\n",

			  def_strm.avail_in, def_strm.avail_out);

		ret = zlib_deflate(&def_strm, Z_PARTIAL_FLUSH);

		jffs2_dbg(1, "deflate returned with avail_in %d, avail_out %d, total_in %ld, total_out %ld\n",

		jffs2_dbg(1, "deflate returned with avail_in %ld, avail_out %ld, total_in %ld, total_out %ld\n",

			  def_strm.avail_in, def_strm.avail_out,

			  def_strm.total_in, def_strm.total_out);

		if (ret != Z_OK) {

include/linux/decompress/bunzip2.h

+4 −4
Original line number Diff line number Diff line 
#ifndef DECOMPRESS_BUNZIP2_H

#define DECOMPRESS_BUNZIP2_H



int bunzip2(unsigned char *inbuf, int len,

	    int(*fill)(void*, unsigned int),

	    int(*flush)(void*, unsigned int),

int bunzip2(unsigned char *inbuf, long len,

	    long (*fill)(void*, unsigned long),

	    long (*flush)(void*, unsigned long),

	    unsigned char *output,

	    int *pos,

	    long *pos,

	    void(*error)(char *x));

#endif

include/linux/decompress/generic.h

+5 −5
Original line number Diff line number Diff line 
#ifndef DECOMPRESS_GENERIC_H

#define DECOMPRESS_GENERIC_H



typedef int (*decompress_fn) (unsigned char *inbuf, int len,

			      int(*fill)(void*, unsigned int),

			      int(*flush)(void*, unsigned int),

typedef int (*decompress_fn) (unsigned char *inbuf, long len,

			      long (*fill)(void*, unsigned long),

			      long (*flush)(void*, unsigned long),

			      unsigned char *outbuf,

			      int *posp,

			      long *posp,

			      void(*error)(char *x));



/* inbuf   - input buffer
@@ -33,7 +33,7 @@ typedef int (*decompress_fn) (unsigned char *inbuf, int len, 




/* Utility routine to detect the decompression method */

decompress_fn decompress_method(const unsigned char *inbuf, int len,

decompress_fn decompress_method(const unsigned char *inbuf, long len,

				const char **name);



#endif