ffe8018c34
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 <-- odd address
At least on s390 this causes a problem:
Certain s390 instructions, especially instructions for loading addresses
(larl) or branch addresses must be on even addresses. The compiler loads
the symbol addresses with the "larl" instruction. This instruction sets
the last bit to 0 and, therefore, for odd size files, the calculated size
is one byte less than it should be:
0000000000540a9c <populate_rootfs>:
540a9c: eb cf f0 78 00 24 stmg %r12,%r15,120(%r15),
540aa2: c0 10 00 01 8a af larl %r1,572000 <__initramfs_start>
540aa8: c0 c0 00 03 e1 2e larl %r12,5bcd04 <initramfs_end>
(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 <holzheu@linux.vnet.ibm.com>
Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Reviewed-by: WANG Cong <xiyou.wangcong@gmail.com>
Acked-by: Michal Marek <mmarek@suse.cz>
Acked-by: "H. Peter Anvin" <hpa@zytor.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Michal Marek <mmarek@suse.cz>
38 lines
1.2 KiB
ArmAsm
38 lines
1.2 KiB
ArmAsm
/*
|
|
initramfs_data includes the compressed binary that is the
|
|
filesystem used for early user space.
|
|
Note: Older versions of "as" (prior to binutils 2.11.90.0.23
|
|
released on 2001-07-14) dit not support .incbin.
|
|
If you are forced to use older binutils than that then the
|
|
following trick can be applied to create the resulting binary:
|
|
|
|
|
|
ld -m elf_i386 --format binary --oformat elf32-i386 -r \
|
|
-T initramfs_data.scr initramfs_data.cpio.gz -o initramfs_data.o
|
|
ld -m elf_i386 -r -o built-in.o initramfs_data.o
|
|
|
|
For including the .init.ramfs sections, see include/asm-generic/vmlinux.lds.
|
|
|
|
The above example is for i386 - the parameters vary from architectures.
|
|
Eventually look up LDFLAGS_BLOB in an older version of the
|
|
arch/$(ARCH)/Makefile to see the flags used before .incbin was introduced.
|
|
|
|
Using .incbin has the advantage over ld that the correct flags are set
|
|
in the ELF header, as required by certain architectures.
|
|
*/
|
|
|
|
#include <linux/stringify.h>
|
|
|
|
.section .init.ramfs,"a"
|
|
__irf_start:
|
|
.incbin __stringify(INITRAMFS_IMAGE)
|
|
__irf_end:
|
|
.section .init.ramfs.info,"a"
|
|
.globl __initramfs_size
|
|
__initramfs_size:
|
|
#ifdef CONFIG_32BIT
|
|
.long __irf_end - __irf_start
|
|
#else
|
|
.quad __irf_end - __irf_start
|
|
#endif
|