Changeset 9da567b2 in rtems


Ignore:
Timestamp:
Aug 8, 2014, 9:23:14 PM (5 years ago)
Author:
Yinghai Lu <yinghai@…>
Branches:
master
Children:
e315b460
Parents:
a60ac5ca
git-author:
Yinghai Lu <yinghai@…> (08/08/14 21:23:14)
git-committer:
Sebastian Huber <sebastian.huber@…> (07/16/18 05:22:12)
Message:

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@…>
Cc: "H. Peter Anvin" <hpa@…>
Cc: Ingo Molnar <mingo@…>
Cc: Rashika Kheria <rashika.kheria@…>
Cc: Josh Triplett <josh@…>
Cc: Kyungsik Lee <kyungsik.lee@…>
Cc: P J P <ppandit@…>
Cc: Al Viro <viro@…>
Cc: Tetsuo Handa <penguin-kernel@…>
Cc: "Daniel M. Weeks" <dan@…>
Cc: Alexandre Courbot <acourbot@…>
Cc: Jan Beulich <JBeulich@…>
Signed-off-by: Andrew Morton <akpm@…>
Signed-off-by: Linus Torvalds <torvalds@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • cpukit/libfs/src/jffs2/src/compr_zlib.c

    ra60ac5ca r9da567b2  
    7575        while (def_strm->total_out < *dstlen - STREAM_END_SPACE && def_strm->total_in < *sourcelen) {
    7676                def_strm->avail_out = *dstlen - (def_strm->total_out + STREAM_END_SPACE);
    77                 def_strm->avail_in = min((unsigned)(*sourcelen-def_strm->total_in), def_strm->avail_out);
    78                 jffs2_dbg(1, "calling deflate with avail_in %d, avail_out %d\n",
     77                def_strm->avail_in = min_t(unsigned long,
     78                        (*sourcelen-def_strm->total_in), def_strm->avail_out);
     79                jffs2_dbg(1, "calling deflate with avail_in %ld, avail_out %ld\n",
    7980                          def_strm->avail_in, def_strm->avail_out);
    8081                ret = zlib_deflate(def_strm, Z_PARTIAL_FLUSH);
    81                 jffs2_dbg(1, "deflate returned with avail_in %d, avail_out %d, total_in %ld, total_out %ld\n",
     82                jffs2_dbg(1, "deflate returned with avail_in %ld, avail_out %ld, total_in %ld, total_out %ld\n",
    8283                          def_strm->avail_in, def_strm->avail_out,
    8384                          def_strm->total_in, def_strm->total_out);
Note: See TracChangeset for help on using the changeset viewer.