Eric Lee / smarc-fsl-linux-kernel

03 Nov, 2017

1 commit

  • e08b18774   initramfs: fix initramfs rebuilds w/ compression after disabling ... Browse Code »

    This is a follow-up to commit 57ddfdaa9a72 ("initramfs: fix disabling of
    initramfs (and its compression)"). This particular commit fixed the use
    case where we build the kernel with an initramfs with no compression,
    and then we build the kernel with no initramfs.

    Now this still left us with the same case as described here:

    http://lkml.kernel.org/r/20170521033337.6197-1-f.fainelli@gmail.com

    not working with initramfs compression. This can be seen by the
    following steps/timestamps:

    https://www.spinics.net/lists/kernel/msg2598153.html

    .initramfs_data.cpio.gz.cmd is correct:

    cmd_usr/initramfs_data.cpio.gz := /bin/bash
    ./scripts/gen_initramfs_list.sh -o usr/initramfs_data.cpio.gz -u 1000 -g 1000 /home/fainelli/work/uclinux-rootfs/romfs /home/fainelli/work/uclinux-rootfs/misc/initramfs.dev

    and was generated the first time we did generate the gzip initramfs, so
    the command has not changed, nor its arguments, so we just don't call
    it, no initramfs cpio is re-generated as a consequence.

    The fix for this problem is just to properly keep track of the
    .initramfs_cpio_data.d file by suffixing it with the compression
    extension. This takes care of properly tracking dependencies such that
    the initramfs get (re)generated any time files are added/deleted etc.

    Link: http://lkml.kernel.org/r/20170930033936.6722-1-f.fainelli@gmail.com
    Fixes: db2aa7fd15e8 ("initramfs: allow again choice of the embedded initramfs compression algorithm")
    Fixes: 9e3596b0c653 ("kbuild: initramfs cleanup, set target from Kconfig")
    Signed-off-by: Florian Fainelli
    Cc: "Francisco Blas Izquierdo Riera (klondike)"
    Cc: Nicholas Piggin
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Florian Fainelli
     

02 Nov, 2017

1 commit

  • b24413180   License cleanup: add SPDX GPL-2.0 license identifier to files with no license ... Browse Code »

    Many source files in the tree are missing licensing information, which
    makes it harder for compliance tools to determine the correct license.

    By default all files without license information are under the default
    license of the kernel, which is GPL version 2.

    Update the files which contain no license information with the 'GPL-2.0'
    SPDX license identifier. The SPDX identifier is a legally binding
    shorthand, which can be used instead of the full boiler plate text.

    This patch is based on work done by Thomas Gleixner and Kate Stewart and
    Philippe Ombredanne.

    How this work was done:

    Patches were generated and checked against linux-4.14-rc6 for a subset of
    the use cases:
    - file had no licensing information it it.
    - file was a */uapi/* one with no licensing information in it,
    - file was a */uapi/* one with existing licensing information,

    Further patches will be generated in subsequent months to fix up cases
    where non-standard license headers were used, and references to license
    had to be inferred by heuristics based on keywords.

    The analysis to determine which SPDX License Identifier to be applied to
    a file was done in a spreadsheet of side by side results from of the
    output of two independent scanners (ScanCode & Windriver) producing SPDX
    tag:value files created by Philippe Ombredanne. Philippe prepared the
    base worksheet, and did an initial spot review of a few 1000 files.

    The 4.13 kernel was the starting point of the analysis with 60,537 files
    assessed. Kate Stewart did a file by file comparison of the scanner
    results in the spreadsheet to determine which SPDX license identifier(s)
    to be applied to the file. She confirmed any determination that was not
    immediately clear with lawyers working with the Linux Foundation.

    Criteria used to select files for SPDX license identifier tagging was:
    - Files considered eligible had to be source code files.
    - Make and config files were included as candidates if they contained >5
    lines of source
    - File already had some variant of a license header in it (even if
    Reviewed-by: Philippe Ombredanne
    Reviewed-by: Thomas Gleixner
    Signed-off-by: Greg Kroah-Hartman

    Greg Kroah-Hartman
     

07 Jul, 2017

2 commits

03 Jun, 2017

1 commit

  • 57ddfdaa9   initramfs: fix disabling of initramfs (and its compression) ... Browse Code »

    Commit db2aa7fd15e8 ("initramfs: allow again choice of the embedded
    initram compression algorithm") introduced the possibility to select the
    initramfs compression algorithm from Kconfig and while this is a nice
    feature it broke the use case described below.

    Here is what my build system does:

    - kernel is initially configured not to have an initramfs included

    - build the user space root file system

    - re-configure the kernel to have an initramfs included
    (CONFIG_INITRAMFS_SOURCE="/path/to/romfs") and set relevant
    CONFIG_INITRAMFS options, in my case, no compression option
    (CONFIG_INITRAMFS_COMPRESSION_NONE)

    - kernel is re-built with these options -> kernel+initramfs image is
    copied

    - kernel is re-built again without these options -> kernel image is
    copied

    Building a kernel without an initramfs means setting this option:

    CONFIG_INITRAMFS_SOURCE="" (and this one only)

    whereas building a kernel with an initramfs means setting these options:

    CONFIG_INITRAMFS_SOURCE="/home/fainelli/work/uclinux-rootfs/romfs /home/fainelli/work/uclinux-rootfs/misc/initramfs.dev"
    CONFIG_INITRAMFS_ROOT_UID=1000
    CONFIG_INITRAMFS_ROOT_GID=1000
    CONFIG_INITRAMFS_COMPRESSION_NONE=y
    CONFIG_INITRAMFS_COMPRESSION=""

    Commit db2aa7fd15e85 ("initramfs: allow again choice of the embedded
    initram compression algorithm") is problematic because
    CONFIG_INITRAMFS_COMPRESSION which is used to determine the
    initramfs_data.cpio extension/compression is a string, and due to how
    Kconfig works it will evaluate in order, how to assign it.

    Setting CONFIG_INITRAMFS_COMPRESSION_NONE with CONFIG_INITRAMFS_SOURCE=""
    cannot possibly work (because of the depends on INITRAMFS_SOURCE!=""
    imposed on CONFIG_INITRAMFS_COMPRESSION ) yet we still get
    CONFIG_INITRAMFS_COMPRESSION assigned to ".gz" because CONFIG_RD_GZIP=y
    is set in my kernel, even when there is no initramfs being built.

    So we basically end-up generating two initramfs_data.cpio* files, one
    without extension, and one with .gz. This causes usr/Makefile to track
    usr/initramfs_data.cpio.gz, and not usr/initramfs_data.cpio anymore,
    that is also largely problematic after 9e3596b0c6539e ("kbuild:
    initramfs cleanup, set target from Kconfig") because we used to track
    all possible initramfs_data files in the $(targets) variable before that
    commit.

    The end result is that the kernel with an initramfs clearly does not
    contain what we expect it to, it has a stale initramfs_data.cpio file
    built into it, and we keep re-generating an initramfs_data.cpio.gz file
    which is not the one that we want to include in the kernel image proper.

    The fix consists in hiding CONFIG_INITRAMFS_COMPRESSION when
    CONFIG_INITRAMFS_SOURCE="". This puts us back in a state to the
    pre-4.10 behavior where we can properly disable and re-enable initramfs
    within the same kernel .config file, and be in control of what
    CONFIG_INITRAMFS_COMPRESSION is set to.

    Fixes: db2aa7fd15e8 ("initramfs: allow again choice of the embedded initram compression algorithm")
    Fixes: 9e3596b0c653 ("kbuild: initramfs cleanup, set target from Kconfig")
    Link: http://lkml.kernel.org/r/20170521033337.6197-1-f.fainelli@gmail.com
    Signed-off-by: Florian Fainelli
    Acked-by: Nicholas Piggin
    Cc: P J P
    Cc: Paul Bolle
    Cc: Michal Marek
    Cc: Daniel Thompson
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Florian Fainelli
     

09 May, 2017

1 commit

  • cff75e0b6   initramfs: provide a way to ignore image provided by bootloader ... Browse Code »

    Many "embedded" architectures provide CMDLINE_FORCE to allow the kernel
    to override the command line provided by an inflexible bootloader.
    However there is currrently no way for the kernel to override the
    initramfs image provided by the bootloader meaning there are still ways
    for bootloaders to make things difficult for us.

    Fix this by introducing INITRAMFS_FORCE which can prevent the kernel
    from loading the bootloader supplied image.

    We use CMDLINE_FORCE (and its friend CMDLINE_EXTEND) to imply that the
    system has an inflexible bootloader. This allow us to avoid presenting
    this config option to users of systems where inflexible bootloaders
    aren't usually a problem.

    Link: http://lkml.kernel.org/r/20170217121940.30126-1-daniel.thompson@linaro.org
    Signed-off-by: Daniel Thompson
    Cc: Al Viro
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Daniel Thompson
     

06 Jan, 2017

2 commits

  • 9e3596b0c   kbuild: initramfs cleanup, set target from Kconfig ... Browse Code »

    Rather than keep a list of all possible compression types in the
    Makefile, set the target explicitly from Kconfig.

    Reviewed-by: Francisco Blas Izquierdo Riera (klondike)
    Signed-off-by: Nicholas Piggin
    Signed-off-by: Linus Torvalds

    Nicholas Piggin
     
  • ae30ab4cd   kbuild: initramfs fix dependency checking for compressed target ... Browse Code »

    When using initramfs compression, the data file compression suffix
    gets quotes pulled in from Kconfig, e.g., initramfs_data.cpio".gz"
    which make does not match a target and causes rebuild.

    Fix this by filtering out quotes from the Kconfig string.

    Fixes: 35e669e1a254 ("initramfs: select builtin initram compression algorithm on KConfig instead of Makefile")
    Reviewed-by: Francisco Blas Izquierdo Riera (klondike)
    Signed-off-by: Nicholas Piggin
    Signed-off-by: Linus Torvalds

    Nicholas Piggin
     

15 Dec, 2016

2 commits

  • db2aa7fd1   initramfs: allow again choice of the embedded initram compression algorithm ... Browse Code »

    Choosing the appropriate compression option when using an embedded
    initramfs can result in significant size differences in the resulting
    data.

    This is caused by avoiding double compression of the initramfs contents.
    For example on my tests, choosing CONFIG_INITRAMFS_COMPRESSION_NONE when
    compressing the kernel using XZ) results in up to 500KiB differences
    (9MiB to 8.5MiB) in the kernel size as the dictionary will not get
    polluted with uncomprensible data and may reuse kernel data too.

    Despite embedding an uncompressed initramfs, a user may want to allow
    for a compressed extra initramfs to be passed using the rd system, for
    example to boot a recovery system. 9ba4bcb645898d ("initramfs: read
    CONFIG_RD_ variables for initramfs compression") broke that behavior by
    making the choice based on CONFIG_RD_* instead of adding
    CONFIG_INITRAMFS_COMPRESSION_LZ4. Saddly, CONFIG_RD_* is also used to
    choose the supported RD compression algorithms by the kernel and a user
    may want to support more than one.

    This patch also reverts commit 3e4e0f0a875 ("initramfs: remove
    "compression mode" choice") restoring back the "compression mode" choice
    and includes the CONFIG_INITRAMFS_COMPRESSION_LZ4 option which was never
    added.

    As a result the following options are added or readed affecting the embedded
    initramfs compression:
    INITRAMFS_COMPRESSION_NONE Do no compression
    INITRAMFS_COMPRESSION_GZIP Compress using gzip
    INITRAMFS_COMPRESSION_BZIP2 Compress using bzip2
    INITRAMFS_COMPRESSION_LZMA Compress using lzma
    INITRAMFS_COMPRESSION_XZ Compress using xz
    INITRAMFS_COMPRESSION_LZO Compress using lzo
    INITRAMFS_COMPRESSION_LZ4 Compress using lz4

    These depend on the corresponding CONFIG_RD_* option being set (except
    NONE which has no dependencies).

    This patch depends on the previous one (the previous version didn't) to
    simplify the way in which the algorithm is chosen and keep backwards
    compatibility with the behaviour introduced by 9ba4bcb645898
    ("initramfs: read CONFIG_RD_ variables for initramfs compression").

    Link: http://lkml.kernel.org/r/57EAD77B.7090607@klondike.es
    Signed-off-by: Francisco Blas Izquierdo Riera (klondike)
    Cc: P J P
    Cc: Paul Bolle
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Francisco Blas Izquierdo Riera (klondike)
     
  • 35e669e1a   initramfs: select builtin initram compression algorithm on KConfig instead of Makefile ... Browse Code »

    Move the current builtin initram compression algorithm selection from
    the Makefile into the INITRAMFS_COMPRESSION variable. This makes
    deciding algorithm precedence easier and would allow for overrides if
    new algorithms want to be tested.

    Link: http://lkml.kernel.org/r/57EAD769.1090401@klondike.es
    Signed-off-by: Francisco Blas Izquierdo Riera (klondike)
    Cc: P J P
    Cc: Paul Bolle
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Francisco Blas Izquierdo Riera (klondike)
     

14 Dec, 2014

1 commit

  • ec72c666f   usr/Kconfig: make initrd compression algorithm selection not expert ... Browse Code »

    The kernel has support for (nearly) every compression algorithm known to
    man, each to handle some particular microscopic niche.

    Unfortunately all of these always get compiled in if you want to support
    INITRDs, and can be only disabled when CONFIG_EXPERT is set.

    I don't see why I need to set EXPERT just to properly configure the initrd
    compression algorithms, and not always include every possible algorithm

    Usually the initrd is just compressed with gzip anyways, at least that's
    true on all distributions I use.

    Remove the dependencies for initrd compression on CONFIG_EXPERT.

    Make the various options just default y, which should be good enough to
    not break any previous configuration.

    Signed-off-by: Andi Kleen
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Andi Kleen
     

07 Jun, 2014

1 commit

  • 3e4e0f0a8   initramfs: remove "compression mode" choice ... Browse Code »

    Commit 9ba4bcb64589 ("initramfs: read CONFIG_RD_ variables for initramfs
    compression") removed the users of the various INITRAMFS_COMPRESSION_*
    Kconfig symbols. So since v3.13 the entire "Built-in initramfs
    compression mode" choice is a set of knobs connected to nothing. The
    entire choice can safely be removed.

    Signed-off-by: Paul Bolle
    Cc: P J P
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Paul Bolle
     

13 Nov, 2013

2 commits

  • 9ba4bcb64   initramfs: read CONFIG_RD_ variables for initramfs compression ... Browse Code »

    When expert configuration option(CONFIG_EXPERT) is enabled, menuconfig
    offers a choice of compression algorithm to compress initial ramfs image;
    This choice is stored into CONFIG_RD_* variables. But usr/Makefile uses
    earlier INITRAMFS_COMPRESSION_* macros to build initial ramfs file. Since
    none of them is defined, resulting 'initramfs_data.cpio' file remains
    un-compressed.

    This patch updates the Makefile to use CONFIG_RD_* variables and adds
    support for LZ4 compression algorithm. Also updates the
    'gen_initramfs_list.sh' script to check whether a selected compression
    command is accessible or not. And fall-back to default gzip(1)
    compression when it is not.

    Signed-off-by: P J P
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    P J P
     
  • c725ee54c   gen_init_cpio: avoid NULL pointer dereference and rework env expanding ... Browse Code »

    getenv() may return NULL if given environment variable does not exist
    which leads to NULL dereference when calling strncat.

    Besides that, the environment variable name was copied to a temporary
    env_var buffer, but this copying can be avoided by simply using the input
    string.

    Lastly, the whole loop can be greatly simplified by using the snprintf
    function instead of the playing with strncat.

    By the way, the current implementation allows a recursive variable
    expansion, as in:

    $ echo 'out ${A} out ' | A='a ${B} a' B=b /tmp/a
    out a b a out

    I'm assuming this is just a side effect and not a conscious decision
    (especially as this may lead to infinite loop), but I didn't want to
    change this behaviour without consulting.

    If the current behaviour is deamed incorrect, I'll be happy to send
    a patch without recursive processing.

    Signed-off-by: Michal Nazarewicz
    Cc: Kees Cook
    Cc: Jiri Kosina
    Cc: Jesper Juhl
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Michal Nazarewicz
     

10 Jul, 2013

1 commit

  • e76e1fdfa   lib: add support for LZ4-compressed kernel ... Browse Code »

    Add support for extracting LZ4-compressed kernel images, as well as
    LZ4-compressed ramdisk images in the kernel boot process.

    Signed-off-by: Kyungsik Lee
    Cc: "H. Peter Anvin"
    Cc: Ingo Molnar
    Cc: Thomas Gleixner
    Cc: Russell King
    Cc: Borislav Petkov
    Cc: Florian Fainelli
    Cc: Yann Collet
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Kyungsik Lee
     

19 Nov, 2012

1 commit

26 Oct, 2012

1 commit

  • 20f1de659   gen_init_cpio: avoid stack overflow when expanding ... Browse Code »

    Fix possible overflow of the buffer used for expanding environment
    variables when building file list.

    In the extremely unlikely case of an attacker having control over the
    environment variables visible to gen_init_cpio, control over the
    contents of the file gen_init_cpio parses, and gen_init_cpio was built
    without compiler hardening, the attacker can gain arbitrary execution
    control via a stack buffer overflow.

    $ cat usr/crash.list
    file foo ${BIG}${BIG}${BIG}${BIG}${BIG}${BIG} 0755 0 0
    $ BIG=$(perl -e 'print "A" x 4096;') ./usr/gen_init_cpio usr/crash.list
    *** buffer overflow detected ***: ./usr/gen_init_cpio terminated

    This also replaces the space-indenting with tabs.

    Patch based on existing fix extracted from grsecurity.

    Signed-off-by: Kees Cook
    Cc: Michal Marek
    Cc: Brad Spengler
    Cc: PaX Team
    Cc:
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Kees Cook
     

01 Jun, 2012

1 commit

  • 0a4dd35c6   kconfig: update compression algorithm info ... Browse Code »

    There have been new compression algorithms added without updating nearby
    relevant descriptive text that refers to (a) the number of compression
    algorithms and (b) the most recent one. Fix these inconsistencies.

    Signed-off-by: Randy Dunlap
    Reported-by:
    Cc: Lasse Collin
    Cc: "H. Peter Anvin"
    Cc: Markus Trippelsdorf
    Cc: Alain Knaff
    Cc: Albin Tonnerre
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Randy Dunlap
     

18 Apr, 2011

1 commit

21 Jan, 2011

1 commit

  • 6a108a14f   kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT ... Browse Code »

    The meaning of CONFIG_EMBEDDED has long since been obsoleted; the option
    is used to configure any non-standard kernel with a much larger scope than
    only small devices.

    This patch renames the option to CONFIG_EXPERT in init/Kconfig and fixes
    references to the option throughout the kernel. A new CONFIG_EMBEDDED
    option is added that automatically selects CONFIG_EXPERT when enabled and
    can be used in the future to isolate options that should only be
    considered for embedded systems (RISC architectures, SLOB, etc).

    Calling the option "EXPERT" more accurately represents its intention: only
    expert users who understand the impact of the configuration changes they
    are making should enable it.

    Reviewed-by: Ingo Molnar
    Acked-by: David Woodhouse
    Signed-off-by: David Rientjes
    Cc: Greg KH
    Cc: "David S. Miller"
    Cc: Jens Axboe
    Cc: Arnd Bergmann
    Cc: Robin Holt
    Cc:
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    David Rientjes
     

14 Jan, 2011

1 commit

  • 3ebe12439   decompressors: add boot-time XZ support ... Browse Code »

    This implements the API defined in which is
    used for kernel, initramfs, and initrd decompression. This patch together
    with the first patch is enough for XZ-compressed initramfs and initrd;
    XZ-compressed kernel will need arch-specific changes.

    The buffering requirements described in decompress_unxz.c are stricter
    than with gzip, so the relevant changes should be done to the
    arch-specific code when adding support for XZ-compressed kernel.
    Similarly, the heap size in arch-specific pre-boot code may need to be
    increased (30 KiB is enough).

    The XZ decompressor needs memmove(), memeq() (memcmp() == 0), and
    memzero() (memset(ptr, 0, size)), which aren't available in all
    arch-specific pre-boot environments. I'm including simple versions in
    decompress_unxz.c, but a cleaner solution would naturally be nicer.

    Signed-off-by: Lasse Collin
    Cc: "H. Peter Anvin"
    Cc: Alain Knaff
    Cc: Albin Tonnerre
    Cc: Phillip Lougher
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Lasse Collin
     

11 Jan, 2011

1 commit

  • 0c05384a5   Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 ... Browse Code »

    * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
    mkuboot.sh: Fail if mkimage is missing
    gen_init_cpio: checkpatch fixes
    gen_init_cpio: Avoid race between call to stat() and call to open()
    modpost: Fix address calculation in reloc_location()
    Make fixdep error handling more explicit
    checksyscalls: Fix stand-alone usage
    modpost: Put .zdebug* section on white list
    kbuild: fix interaction of CONFIG_IKCONFIG and KCONFIG_CONFIG
    kbuild: export linux/{a.out,kvm,kvm_para}.h on headers_install_all
    kbuild: introduce HDR_ARCH_LIST for headers_install_all
    headers_install: check exit status of unifdef
    gen_init_cpio: remove leading `/' from file names
    scripts/genksyms: fix header usage
    fixdep: use hash table instead of a single array

    Linus Torvalds
     

06 Jan, 2011

1 commit

29 Dec, 2010

1 commit

  • 96aebafa6   gen_init_cpio: Avoid race between call to stat() and call to open() ... Browse Code »

    In usr/gen_init_cpio.c::cpio_mkfile() a call to stat() is made based on
    pathname, subsequently the file is open()'ed and then the value of the
    initial stat() call is used to allocate a buffer. This is not safe since
    the file may change between the call to stat() and the call to open().
    Safer to just open() the file and then do fstat() using the filedescriptor
    returned by open.

    Signed-off-by: Jesper Juhl
    Acked-by: Jeff Garzik
    Signed-off-by: Michal Marek

    Jesper Juhl
     

15 Dec, 2010

1 commit

02 Dec, 2010

1 commit

  • 43f901fbc   gen_init_cpio: remove leading `/' from file names ... Browse Code »

    When we extracted the generated cpio archive using "cpio -id" command,
    it complained,

    cpio: Removing leading `/' from member names
    var/run
    cpio: Removing leading `/' from member names
    var/lib
    cpio: Removing leading `/' from member names
    var/lib/misc

    It is worse with the latest "cpio" or "pax", which tries to overwrite
    the host file system with the leading '/'.

    So the leading '/' of file names should be removed. This is consistent
    with the initramfs come with major distributions such as Fedora or
    Debian, etc.

    Signed-off-by: Thomas Chou
    Acked-by: Mike Frysinger
    Signed-off-by: Michal Marek

    Thomas Chou
     

01 Dec, 2010

1 commit

  • 1198c6d45   initramfs: Really fix build break on symbol-prefixed archs ... Browse Code »

    Define the __initramfs_size variable using VMLINUX_SYMBOL() to take care
    of symbol-prefixed architectures, for example, blackfin.

    Signed-off-by: Hendrik Brueckner
    Cc: Mike Frysinger
    Cc: Hendrik Brueckner ,
    Cc: Michal Marek
    Cc: Sam Ravnborg
    Signed-off-by: Andrew Morton
    [mmarek: leave out Makefile change, since d63f6d1 already takes care of the
    SYMBOL_PREFIX define]
    Signed-off-by: Michal Marek

    Hendrik Brueckner
     

31 Oct, 2010

1 commit

  • 96f935934   initramfs: Fix initramfs size for 32-bit arches ... Browse Code »

    Commit ffe8018c3424 ("initramfs: fix initramfs size calculation") broke
    32-bit big-endian arches like (on ARAnyM):

    VFS: Cannot open root device "hda1" or unknown-block(3,1)
    Please append a correct "root=" boot option; here are the available partitions:
    fe80 1059408 nfhd8 (driver?)
    fe81 921600 nfhd8p1 00000000-0000-0000-0000-000000000nfhd8p1
    fe82 137807 nfhd8p2 00000000-0000-0000-0000-000000000nfhd8p2
    0200 3280 fd0 (driver?)
    0201 3280 fd1 (driver?)
    0300 1059408 hda driver: ide-gd
    0301 921600 hda1 00000000-0000-0000-0000-000000000hda1
    0302 137807 hda2 00000000-0000-0000-0000-000000000hda2
    Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(3,1)

    As pointed out by Kerstin Jonsson , this
    is due to CONFIG_32BIT not being defined, so the initramfs size field is
    done as a 64-bit quad. On little-endian (like x86) this doesn matter,
    but on a big-endian machine the 32-bit reads will see the (zero) high
    bits.

    Only mips, s390, and score set CONFIG_32BIT for 32-bit builds, so fix it for
    all other 32-bit arches by inverting the logic and testing for CONFIG_64BIT,
    which should be defined on all 64-bit arches.

    Signed-off-by: Geert Uytterhoeven
    [ I think we should just make it "u64" on all architectures and get
    rid of the whole #ifdef CONFIG_xxBIT - Linus ]
    Signed-off-by: Linus Torvalds

    Geert Uytterhoeven
     

29 Oct, 2010

1 commit

  • c9e2a72ff   Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 ... Browse Code »

    * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
    initramfs: Fix build break on symbol-prefixed archs
    initramfs: fix initramfs size calculation
    initramfs: generalize initramfs_data.xxx.S variants
    scripts/kallsyms: Enable error messages while hush up unnecessary warnings
    scripts/setlocalversion: update comment
    kbuild: Use a single clean rule for kernel and external modules
    kbuild: Do not run make clean in $(srctree)
    scripts/mod/modpost.c: fix commentary accordingly to last changes
    kbuild: Really don't clean bounds.h and asm-offsets.h

    Linus Torvalds
     

29 Sep, 2010

2 commits

  • ffe8018c3   initramfs: fix initramfs size calculation ... Browse Code »

    The size of a built-in initramfs is calculated in init/initramfs.c by
    "__initramfs_end - __initramfs_start". Those symbols are defined in the
    linker script include/asm-generic/vmlinux.lds.h:

    #define INIT_RAM_FS \
    . = ALIGN(PAGE_SIZE); \
    VMLINUX_SYMBOL(__initramfs_start) = .; \
    *(.init.ramfs) \
    VMLINUX_SYMBOL(__initramfs_end) = .;

    If the initramfs file has an odd number of bytes, the "__initramfs_end"
    symbol points to an odd address, for example, the symbols in the
    System.map might look like:

    0000000000572000 T __initramfs_start
    00000000005bcd05 T __initramfs_end :
    540a9c: eb cf f0 78 00 24 stmg %r12,%r15,120(%r15),
    540aa2: c0 10 00 01 8a af larl %r1,572000
    540aa8: c0 c0 00 03 e1 2e larl %r12,5bcd04
    (Instead of 5bcd05)
    ...
    540abe: 1b c1 sr %r12,%r1

    To fix the problem, this patch introduces the global variable
    __initramfs_size, which is calculated in the "usr/initramfs_data.S" file.
    The populate_rootfs() function can then use the start marker of the
    .init.ramfs section and the value of __initramfs_size for loading the
    initramfs. Because the start marker and size is sufficient, the
    __initramfs_end symbol is no longer needed and is removed.

    Signed-off-by: Michael Holzheu
    Signed-off-by: Hendrik Brueckner
    Reviewed-by: WANG Cong
    Acked-by: Michal Marek
    Acked-by: "H. Peter Anvin"
    Cc: Heiko Carstens
    Cc: Martin Schwidefsky
    Signed-off-by: Andrew Morton
    Signed-off-by: Michal Marek

    Hendrik Brueckner
     
  • 6ae64e428   initramfs: generalize initramfs_data.xxx.S variants ... Browse Code »

    Remove initramfs_data.{lzo,lzma,gz,bz2}.S variants and use a common
    implementation in initramfs_data.S. The common implementation expects the
    file name of the initramfs to be defined in INITRAMFS_IMAGE.

    Change the Makefile to set the INITRAMFS_IMAGE define symbol according
    to the selected compression method.

    Signed-off-by: Hendrik Brueckner
    Cc: WANG Cong
    Acked-by: Michal Marek
    Acked-by: "H. Peter Anvin"
    Cc: Hendrik Brueckner
    Cc: Heiko Carstens
    Cc: Martin Schwidefsky
    Signed-off-by: Andrew Morton
    Signed-off-by: Michal Marek

    Hendrik Brueckner
     

23 Aug, 2010

1 commit

28 May, 2010

1 commit

12 Jan, 2010

1 commit

12 Dec, 2009

1 commit

  • 6d87fea4d   gen_init_cpio: fixed fwrite warning ... Browse Code »

    On compilers with security warnings enabled by default, we get:

    usr/gen_init_cpio.c: In function ‘cpio_mkfile’:
    usr/gen_init_cpio.c:357: warning: ignoring return value of ‘fwrite’,
    declared with attribute warn_unused_result

    So check the return value and handle errors accordingly.

    Signed-off-by: Mike Frysinger
    Signed-off-by: Michal Marek

    Mike Frysinger
     

24 Sep, 2009

1 commit

  • c37efa932   Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next: (30 commits)
    Use macros for .data.page_aligned section.
    Use macros for .bss.page_aligned section.
    Use new __init_task_data macro in arch init_task.c files.
    kbuild: Don't define ALIGN and ENTRY when preprocessing linker scripts.
    arm, cris, mips, sparc, powerpc, um, xtensa: fix build with bash 4.0
    kbuild: add static to prototypes
    kbuild: fail build if recordmcount.pl fails
    kbuild: set -fconserve-stack option for gcc 4.5
    kbuild: echo the record_mcount command
    gconfig: disable "typeahead find" search in treeviews
    kbuild: fix cc1 options check to ensure we do not use -fPIC when compiling
    checkincludes.pl: add option to remove duplicates in place
    markup_oops: use modinfo to avoid confusion with underscored module names
    checkincludes.pl: provide usage helper
    checkincludes.pl: close file as soon as we're done with it
    ctags: usability fix
    kernel hacking: move STRIP_ASM_SYMS from General
    gitignore usr/initramfs_data.cpio.bz2 and usr/initramfs_data.cpio.lzma
    kbuild: Check if linker supports the -X option
    kbuild: introduce ld-option
    ...

    Fix trivial conflict in scripts/basic/fixdep.c

    Linus Torvalds
     

23 Sep, 2009

1 commit

20 Sep, 2009

2 commits

01 Apr, 2009

1 commit