ELF Relocatable x86 bzImage (V2)
Subsystems (4)
PATCH 11/12 i386: Implement CONFIG_PHYSICAL_ALIGN
In reply to Vivek Goyalo Now CONFIG_PHYSICAL_START is being replaced with CONFIG_PHYSICAL_ALIGN. Hardcoding the kernel physical start value creates a problem in relocatable kernel context due to boot loader limitations. For ex, if somebody compiles a relocatable kernel to be run from address 4MB, but this kernel will run from location 1MB as grub loads the kernel at physical address 1MB. Kernel thinks that I am a relocatable kernel and I should run from the address I have been loaded at. So somebody wanting to run kernel from 4MB alignment location (for improved performance regions) can't do that.
o Hence, Eric proposed that probably CONFIG_PHYSICAL_ALIGN will make more sense in relocatable kernel context. At run time kernel will move itself to a physical addr location which meets user specified alignment restrictions.
---
arch/i386/Kconfig | 33 ++++++++++++++++++--------------- arch/i386/boot/compressed/head.S | 26 ++++++++++++++------------ arch/i386/boot/compressed/misc.c | 7 ++++--- arch/i386/kernel/vmlinux.lds.S | 3 ++- include/asm-i386/boot.h | 6 +++++- 5 files changed, 43 insertions(+), 32 deletions(-)
arch/i386/Kconfig renamed from arch/i386/Kconfig~i386-implement-config-physical-align-option +18 -15
@@ -785,23 +785,26 @@ config RELOCATABLE must live at a different physical address than the primary kernel. -config PHYSICAL_START - hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP) - - default "0x1000000" if CRASH_DUMP +config PHYSICAL_ALIGN + hex "Alignment value to which kernel should be aligned" default "0x100000" + range 0x2000 0x400000 help - This gives the physical address where the kernel is loaded. Normally - for regular kernels this value is 0x100000 (1MB). But in the case - of kexec on panic the fail safe kernel needs to run at a different - address than the panic-ed kernel. This option is used to set the load - address for kernels used to capture crash dump on being kexec'ed - after panic. The default value for crash dump kernels is - 0x1000000 (16MB). This can also be set based on the "X" value as - specified in the "crashkernel=YM@XM" command line boot parameter - passed to the panic-ed kernel. Typically this parameter is set as - crashkernel=64M@16M. Please take a look at - Documentation/kdump/kdump.txt for more details about crash dumps. + This value puts the alignment restrictions on physical address + where kernel is loaded and run from. Kernel is compiled for an + address which meets above alignment restriction. + + If bootloader loads the kernel at a non-aligned address and + CONFIG_RELOCATABLE is set, kernel will move itself to nearest + address aligned to above value and run from there. + + If bootloader loads the kernel at a non-aligned address and + CONFIG_RELOCATABLE is not set, kernel will ignore the run time + load address and decompress itself to the address it has been + compiled for and run from there. The address for which kernel is + compiled already meets above alignment restrictions. Hence the + end result is that kernel runs from a physical address meeting + above alignment restrictions. Don't change this unless you know what you are doing.
include/asm-i386/boot.h renamed from include/asm-i386/boot.h~i386-implement-config-physical-align-option +5 -1
@@ -12,4 +12,8 @@#define EXTENDED_VGA 0xfffe/* 80x50 mode */ #define ASK_VGA 0xfffd/* ask for it at bootup */ -#endif +/* Physical address where kenrel should be loaded. */ +#define LOAD_PHYSICAL_ADDR ((0x100000 + CONFIG_PHYSICAL_ALIGN - 1) \ + & ~(CONFIG_PHYSICAL_ALIGN - 1)) + +#endif /* _LINUX_BOOT_H */
arch/i386/kernel/vmlinux.lds.S renamed from arch/i386/kernel/vmlinux.lds.S~i386-implement-config-physical-align-option +2 -1
@@ -9,6 +9,7 @@ #include <asm/thread_info.h> #include <asm/page.h> #include <asm/cache.h> +#include <asm/boot.h> OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386") OUTPUT_ARCH(i386)
@@ -22,7 +23,7 @@ PHDRS { } SECTIONS { - . = LOAD_OFFSET + CONFIG_PHYSICAL_START; + . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR; phys_startup_32 = startup_32 - LOAD_OFFSET; /* read-only */ .text : AT(ADDR(.text) - LOAD_OFFSET) {
arch/i386/boot/compressed/head.S renamed from arch/i386/boot/compressed/head.S~i386-implement-config-physical-align-option +14 -12
@@ -26,6 +26,7 @@ #include <linux/linkage.h> #include <asm/segment.h> #include <asm/page.h> +#include <asm/boot.h> .section ".text.head" .globl startup_32
@@ -52,17 +53,17 @@ startup_32: 1: popl %ebp subl $1b, %ebp -/* Compute the delta between where we were compiled to run at - * and where the code will actually run at. +/* %ebp contains the address we are loaded at by the boot loader and %ebx + * contains the address where we should move the kernel image temporarily + * for safe in-place decompression. */ - /* Start with the delta to where the kernel will run at. If we are - * a relocatable kernel this is the delta to our load address otherwise - * this is the delta to CONFIG_PHYSICAL start. - */ + #ifdef CONFIG_RELOCATABLE - movl %ebp, %ebx + movl %ebp, %ebx + addl $(CONFIG_PHYSICAL_ALIGN - 1), %ebx + andl $(~(CONFIG_PHYSICAL_ALIGN - 1)), %ebx #else - movl $(CONFIG_PHYSICAL_START - startup_32), %ebx + movl $LOAD_PHYSICAL_ADDR, %ebx #endif /* Replace the compressed data size with the uncompressed size */
@@ -94,9 +95,10 @@ startup_32: /* Compute the kernel start address. */ #ifdef CONFIG_RELOCATABLE - leal startup_32(%ebp), %ebp + addl $(CONFIG_PHYSICAL_ALIGN - 1), %ebp + andl $(~(CONFIG_PHYSICAL_ALIGN - 1)), %ebp #else - movl $CONFIG_PHYSICAL_START, %ebp + movl $LOAD_PHYSICAL_ADDR, %ebp #endif /*
@@ -150,8 +152,8 @@ relocated: * and where it was actually loaded. */ movl %ebp, %ebx - subl $CONFIG_PHYSICAL_START, %ebx - + subl $LOAD_PHYSICAL_ADDR, %ebx + jz 2f /* Nothing to be done if loaded at compiled addr. */ /* * Process relocations. */
arch/i386/boot/compressed/misc.c renamed from arch/i386/boot/compressed/misc.c~i386-implement-config-physical-align-option +4 -3
@@ -15,6 +15,7 @@#include <linux/screen_info.h> #include <asm/io.h> #include <asm/page.h> +#include <asm/boot.h> /* WARNING!! * This code is compiled with -fPIC and it is relocated dynamically
@@ -361,12 +362,12 @@ asmlinkage void decompress_kernel(void * insize = input_len; inptr =0 ; -if (((u32 )output -CONFIG_PHYSICAL_START ) &0x3fffff ) -error ("Destination address not 4M aligned" ); +if ((u32 )output & (CONFIG_PHYSICAL_ALIGN -1 )) +error ("Destination address not CONFIG_PHYSICAL_ALIGN aligned" );if (end > ((-__PAGE_OFFSET-(512 <<20 )-1 ) &0x7fffffff ))error ("Destination address too large" );#ifndef CONFIG_RELOCATABLE -if ((u32 )output !=CONFIG_PHYSICAL_START ) +if ((u32 )output !=LOAD_PHYSICAL_ADDR )error ("Wrong destination address" );#endif
_
PATCH 8/12 elf: Add ELFOSABI_STANDALONE to elf.h
In reply to Vivek Goyalo Add ELFOSABI_STANDALONE definition to elf.h
---
include/linux/elf.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
include/linux/elf.h renamed from include/linux/elf.h~elf-Add-ELFOSABI_STANDALONE-to-elf.h +3 -2
@@ -338,8 +338,9 @@ typedef struct elf64_shdr {#define EV_CURRENT 1#define EV_NUM 2 -#define ELFOSABI_NONE 0 -#define ELFOSABI_LINUX 3 +#define ELFOSABI_NONE 0 +#define ELFOSABI_LINUX 3 +#define ELFOSABI_STANDALONE 255#ifndef ELF_OSABI #define ELF_OSABI ELFOSABI_NONE
_
PATCH 4/12 i386: define __pa_symbol()
In reply to Vivek GoyalOn x86_64 we have to be careful with calculating the physical address of kernel symbols. Both because of compiler odditities and because the symbols live in a different range of the virtual address space.
Having a defintition of __pa_symbol that works on both x86_64 and i386 simplifies writing code that works for both x86_64 and i386 that has these kinds of dependencies.
So this patch adds the trivial i386 __pa_symbol definition.
Added assembly magic similar to RELOC_HIDE as suggested by Andi Kleen. Just picked it up from x86_64.
---
include/asm-i386/page.h | 6 ++++++ 1 file changed, 6 insertions(+)
include/asm-i386/page.h renamed from include/asm-i386/page.h~i386-define-__pa_symbol +6 -0
@@ -124,6 +124,12 @@ extern int page_is_ram(unsigned long pag#define VMALLOC_RESERVE ((unsigned long)__VMALLOC_RESERVE)#define MAXMEM (-__PAGE_OFFSET-__VMALLOC_RESERVE)#define __pa (x) ((unsigned long)(x)-PAGE_OFFSET) +/* __pa_symbol should be used for C visible symbols. +This seems to be the official gcc blessed way to do such arithmetic. */ +#define __pa_symbol (x) \ + ({unsigned long v; \ + asm("" : "=r" (v) : "0" (x)); \ + __pa(v); })#define __va (x) ((void *)((unsigned long)(x)+PAGE_OFFSET))#define pfn_to_kaddr (pfn) __va((pfn) << PAGE_SHIFT)#ifdef CONFIG_FLATMEM
_
PATCH 1/12 i386: Distinguish absolute symbols
In reply to Vivek GoyalLd knows about 2 kinds of symbols, absolute and section relative. Section relative symbols symbols change value when a section is moved and absolute symbols do not.
Currently in the linker script we have several labels marking the beginning and ending of sections that are outside of sections, making them absolute symbols. Having a mixture of absolute and section relative symbols refereing to the same data is currently harmless but it is confusing.
This must be done carefully as newer revs of ld do not place symbols that appear in sections without data and instead ld makes those symbols global :(
My ultimate goal is to build a relocatable kernel. The safest and least intrusive technique is to generate relocation entries so the kernel can be relocated at load time. The only penalty would be an increase in the size of the kernel binary. The problem is that if absolute and relocatable symbols are not properly specified absolute symbols will be relocated or section relative symbols won't be, which is fatal.
The practical motivation is that when generating kernels that will run from a reserved area for analyzing what caused a kernel panic, it is simpler if you don't need to hard code the physical memory location they will run at, especially for the distributions.
---
arch/i386/kernel/vmlinux.lds.S | 109 ++++++++++++++++++++------------------ include/asm-generic/vmlinux.lds.h | 4 - 2 files changed, 60 insertions(+), 53 deletions(-)
arch/i386/kernel/vmlinux.lds.S renamed from arch/i386/kernel/vmlinux.lds.S~i386-vmlinux.lds.S-Distinguish-absolute-symbols +58 -51
@@ -24,31 +24,32 @@ SECTIONS . = __KERNEL_START; phys_startup_32 = startup_32 - LOAD_OFFSET; /* read-only */ - _text = .; /* Text and read-only data */ .text : AT(ADDR(.text) - LOAD_OFFSET) { + _text = .; /* Text and read-only data */ *(.text) SCHED_TEXT LOCK_TEXT KPROBES_TEXT *(.fixup) *(.gnu.warning) - } :text = 0x9090 - - _etext = .; /* End of text section */ + _etext = .; /* End of text section */ + } :text = 0x9090 . = ALIGN(16); /* Exception table */ - __start___ex_table = .; - __ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) { *(__ex_table) } - __stop___ex_table = .; + __ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) { + __start___ex_table = .; + *(__ex_table) + __stop___ex_table = .; + } RODATA . = ALIGN(4); - __tracedata_start = .; .tracedata : AT(ADDR(.tracedata) - LOAD_OFFSET) { + __tracedata_start = .; *(.tracedata) + __tracedata_end = .; } - __tracedata_end = .; /* writeable */ .data : AT(ADDR(.data) - LOAD_OFFSET) { /* Data */
@@ -57,10 +58,12 @@ SECTIONS } :data . = ALIGN(4096); - __nosave_begin = .; - .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) { *(.data.nosave) } - . = ALIGN(4096); - __nosave_end = .; + .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) { + __nosave_begin = .; + *(.data.nosave) + . = ALIGN(4096); + __nosave_end = .; + } . = ALIGN(4096); .data.page_aligned : AT(ADDR(.data.page_aligned) - LOAD_OFFSET) {
@@ -74,8 +77,10 @@ SECTIONS /* rarely changed data like cpu maps */ . = ALIGN(32); - .data.read_mostly : AT(ADDR(.data.read_mostly) - LOAD_OFFSET) { *(.data.read_mostly) } - _edata = .; /* End of data section */ + .data.read_mostly : AT(ADDR(.data.read_mostly) - LOAD_OFFSET) { + *(.data.read_mostly) + _edata = .; /* End of data section */ + } #ifdef CONFIG_STACK_UNWIND . = ALIGN(4);
@@ -93,39 +98,41 @@ SECTIONS /* might get freed after init */ . = ALIGN(4096); - __smp_alt_begin = .; - __smp_alt_instructions = .; .smp_altinstructions : AT(ADDR(.smp_altinstructions) - LOAD_OFFSET) { + __smp_alt_begin = .; + __smp_alt_instructions = .; *(.smp_altinstructions) + __smp_alt_instructions_end = .; } - __smp_alt_instructions_end = .; . = ALIGN(4); - __smp_locks = .; .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) { + __smp_locks = .; *(.smp_locks) + __smp_locks_end = .; } - __smp_locks_end = .; .smp_altinstr_replacement : AT(ADDR(.smp_altinstr_replacement) - LOAD_OFFSET) { *(.smp_altinstr_replacement) + . = ALIGN(4096); + __smp_alt_end = .; } - . = ALIGN(4096); - __smp_alt_end = .; /* will be freed after init */ . = ALIGN(4096); /* Init code and data */ - __init_begin = .; .init.text : AT(ADDR(.init.text) - LOAD_OFFSET) { + __init_begin = .; _sinittext = .; *(.init.text) _einittext = .; } .init.data : AT(ADDR(.init.data) - LOAD_OFFSET) { *(.init.data) } . = ALIGN(16); - __setup_start = .; - .init.setup : AT(ADDR(.init.setup) - LOAD_OFFSET) { *(.init.setup) } - __setup_end = .; - __initcall_start = .; + .init.setup : AT(ADDR(.init.setup) - LOAD_OFFSET) { + __setup_start = .; + *(.init.setup) + __setup_end = .; + } .initcall.init : AT(ADDR(.initcall.init) - LOAD_OFFSET) { + __initcall_start = .; *(.initcall1.init) *(.initcall2.init) *(.initcall3.init)
@@ -133,20 +140,20 @@ SECTIONS *(.initcall5.init) *(.initcall6.init) *(.initcall7.init) + __initcall_end = .; } - __initcall_end = .; - __con_initcall_start = .; .con_initcall.init : AT(ADDR(.con_initcall.init) - LOAD_OFFSET) { + __con_initcall_start = .; *(.con_initcall.init) + __con_initcall_end = .; } - __con_initcall_end = .; SECURITY_INIT . = ALIGN(4); - __alt_instructions = .; .altinstructions : AT(ADDR(.altinstructions) - LOAD_OFFSET) { + __alt_instructions = .; *(.altinstructions) + __alt_instructions_end = .; } - __alt_instructions_end = .; .altinstr_replacement : AT(ADDR(.altinstr_replacement) - LOAD_OFFSET) { *(.altinstr_replacement) }
@@ -155,32 +162,32 @@ SECTIONS .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) { *(.exit.text) } .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) { *(.exit.data) } . = ALIGN(4096); - __initramfs_start = .; - .init.ramfs : AT(ADDR(.init.ramfs) - LOAD_OFFSET) { *(.init.ramfs) } - __initramfs_end = .; + .init.ramfs : AT(ADDR(.init.ramfs) - LOAD_OFFSET) { + __initramfs_start = .; + *(.init.ramfs) + __initramfs_end = .; + } . = ALIGN(L1_CACHE_BYTES); - __per_cpu_start = .; - .data.percpu : AT(ADDR(.data.percpu) - LOAD_OFFSET) { *(.data.percpu) } - __per_cpu_end = .; + .data.percpu : AT(ADDR(.data.percpu) - LOAD_OFFSET) { + __per_cpu_start = .; + *(.data.percpu) + __per_cpu_end = .; + } . = ALIGN(4096); - __init_end = .; /* freed after init ends here */ - __bss_start = .; /* BSS */ - .bss.page_aligned : AT(ADDR(.bss.page_aligned) - LOAD_OFFSET) { - *(.bss.page_aligned) - } .bss : AT(ADDR(.bss) - LOAD_OFFSET) { + __init_end = .; + __bss_start = .; /* BSS */ + *(.bss.page_aligned) *(.bss) + . = ALIGN(4); + __bss_stop = .; + _end = . ; + /* This is where the kernel creates the early boot page tables */ + . = ALIGN(4096); + pg0 = . ; } - . = ALIGN(4); - __bss_stop = .; - - _end = . ; - - /* This is where the kernel creates the early boot page tables */ - . = ALIGN(4096); - pg0 = .; /* Sections to be discarded */ /DISCARD/ : {
include/asm-generic/vmlinux.lds.h renamed from include/asm-generic/vmlinux.lds.h~i386-vmlinux.lds.S-Distinguish-absolute-symbols +2 -2
@@ -11,8 +11,8 @@#define RODATA \ . = ALIGN(4096); \ - __start_rodata = .; \ .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \ + VMLINUX_SYMBOL(__start_rodata) = .; \ *(.rodata) *(.rodata.*) \ *(__vermagic)/* Kernel version magic */ \ } \
@@ -124,8 +124,8 @@ VMLINUX_SYMBOL(__start___param) = .; \ *(__param ) \ VMLINUX_SYMBOL(__stop___param) = .; \ + VMLINUX_SYMBOL(__end_rodata) = .; \ } \ - __end_rodata = .; \ . = ALIGN(4096);#define SECURITY_INIT \
_
PATCH 9/12 kallsyms: Generate relocatable symbols
In reply to Vivek GoyalPrint the addresses of non-absolute symbols relative to _text so that ld will generate relocations. Allowing a relocatable kernel to relocate them. We can't actually use the symbol names because kallsyms includes static symbols that are not exported from their object files.
Add the _text symbol definitions to the architectures which don't define it otherwise linker will fail.
---
arch/h8300/kernel/vmlinux.lds.S | 1 + arch/m68knommu/kernel/vmlinux.lds.S | 1 + arch/powerpc/kernel/vmlinux.lds.S | 1 + arch/ppc/kernel/vmlinux.lds.S | 1 + arch/sparc/kernel/vmlinux.lds.S | 1 + arch/sparc64/kernel/vmlinux.lds.S | 1 + arch/v850/kernel/vmlinux.lds.S | 1 + scripts/kallsyms.c | 20 +++++++++++++++++--- 8 files changed, 24 insertions(+), 3 deletions(-)
scripts/kallsyms.c renamed from scripts/kallsyms.c~kallsyms.c-Generate-relocatable-symbols +17 -3
@@ -43,7 +43,7 @@ struct sym_entry {static struct sym_entry *table;static unsigned int table_size, table_cnt; -static unsigned long long _stext, _etext, _sinittext, _einittext, _sextratext, _eextratext; +static unsigned long long _text, _stext, _etext, _sinittext, _einittext, _sextratext, _eextratext;static int all_symbols =0 ;static char symbol_prefix_char ='\0' ;
@@ -91,7 +91,9 @@ static int read_symbol(FILE *in, struct sym++;/* Ignore most absolute/undefined (?) symbols. */ -if (strcmp (sym,"_stext" ) ==0 ) +if (strcmp (sym,"_text" ) ==0 ) + _text = s->addr; +else if (strcmp (sym,"_stext" ) ==0 ) _stext = s->addr;else if (strcmp (sym,"_etext" ) ==0 ) _etext = s->addr;
@@ -265,9 +267,21 @@ static void write_src(void)printf (".data\n" ); +/* Provide proper symbols relocatability by their '_text' +* relativeness. The symbol names cannot be used to construct +* normal symbol references as the list of symbols contains +* symbols that are declared static and are private to their +* .o files. This prevents .tmp_kallsyms.o or any other +* object from referencing them. +*/ output_label ("kallsyms_addresses" );for (i =0 ; i < table_cnt; i++) { -printf ("\tPTR\t%#llx\n" , table[i].addr); +if (toupper (table[i].sym[0 ]) !='A' ) { +printf ("\tPTR\t_text + %#llx\n" , + table[i].addr - _text); + }else { +printf ("\tPTR\t%#llx\n" , table[i].addr); + } }printf ("\n" );
arch/h8300/kernel/vmlinux.lds.S renamed from arch/h8300/kernel/vmlinux.lds.S~kallsyms.c-Generate-relocatable-symbols +1 -0
@@ -70,6 +70,7 @@ SECTIONS #endif .text : { + _text = .; #if defined(CONFIG_ROMKERNEL) *(.int_redirect) #endif
arch/m68knommu/kernel/vmlinux.lds.S renamed from arch/m68knommu/kernel/vmlinux.lds.S~kallsyms.c-Generate-relocatable-symbols +1 -0
@@ -60,6 +60,7 @@ SECTIONS { #endif .text : { + _text = .; _stext = . ; *(.text) SCHED_TEXT
arch/powerpc/kernel/vmlinux.lds.S renamed from arch/powerpc/kernel/vmlinux.lds.S~kallsyms.c-Generate-relocatable-symbols +1 -0
@@ -33,6 +33,7 @@ SECTIONS /* Text and gots */ .text : { + _text = .; *(.text .text.*) SCHED_TEXT LOCK_TEXT
arch/ppc/kernel/vmlinux.lds.S renamed from arch/ppc/kernel/vmlinux.lds.S~kallsyms.c-Generate-relocatable-symbols +1 -0
@@ -31,6 +31,7 @@ SECTIONS .plt : { *(.plt) } .text : { + _text = .; *(.text) SCHED_TEXT LOCK_TEXT
arch/sparc64/kernel/vmlinux.lds.S renamed from arch/sparc64/kernel/vmlinux.lds.S~kallsyms.c-Generate-relocatable-symbols +1 -0
@@ -13,6 +13,7 @@ SECTIONS . = 0x4000; .text 0x0000000000404000 : { + _text = .; *(.text) SCHED_TEXT LOCK_TEXT
arch/sparc/kernel/vmlinux.lds.S renamed from arch/sparc/kernel/vmlinux.lds.S~kallsyms.c-Generate-relocatable-symbols +1 -0
@@ -11,6 +11,7 @@ SECTIONS . = 0x10000 + SIZEOF_HEADERS; .text 0xf0004000 : { + _text = .; *(.text) SCHED_TEXT LOCK_TEXT
arch/v850/kernel/vmlinux.lds.S renamed from arch/v850/kernel/vmlinux.lds.S~kallsyms.c-Generate-relocatable-symbols +1 -0
@@ -90,6 +90,7 @@ /* Kernel text segment, and some constant data areas. */ #define TEXT_CONTENTS \ + _text = .; \ __stext = . ; \ *(.text) \ SCHED_TEXT \
_
PATCH 5/12 i386 setup.c: Reserve kernel memory starting from _text
In reply to Vivek GoyalCurrently when we are reserving the memory the kernel text resides in we start at __PHYSICAL_START which happens to be correct but not very obvious. In addition when we start relocating the kernel __PHYSICAL_START is the wrong value, as it is an absolute symbol that does not get relocated.
By starting the reservation at __pa_symbol(_text) the code is clearer and will be correct when relocated.
---
arch/i386/kernel/setup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/i386/kernel/setup.c renamed from arch/i386/kernel/setup.c~i386-setup.c-Reserve-kernel-memory-starting-from-_text +2 -2
@@ -1119,8 +1119,8 @@ void __init setup_bootmem_allocator(void* the (very unlikely) case of us accidentally initializing the * bootmem allocator with an invalid RAM area. */ -reserve_bootmem (__PHYSICAL_START, (PFN_PHYS (min_low_pfn) + - bootmap_size +PAGE_SIZE -1 ) - (__PHYSICAL_START)); +reserve_bootmem (__pa_symbol (_text), (PFN_PHYS (min_low_pfn) + + bootmap_size +PAGE_SIZE -1 ) -__pa_symbol (_text));/* * reserve physical page 0 - it's a special BIOS page on many boxes,
_
cover ELF Relocatable x86 bzImage (V2)
Hi,
Eric biederman implemented the relocatable kernel support for x86 and x86_64 and posted the patches for comments almost two months back.
http://marc.theaimsgroup.com/?l=linux-kernel&m=115443019026302&w=2
We have been testing the patches in RHEL kernels since then and things are looking up. I think this is the time that patches can be included in -mm and get more testing done and get rest of the issues sorted out.
Eric is currently held up with other things, so I have taken his patches and forward ported to 2.6.18-git19. Did some minor cleanups and fixed a couple of bugs as faced in our testing. I have also accomodated the review comments received last time.
Currently this patch series is only for i386. I will be posting the patches for x86_64 later.
Following is a brief account of changes I have done since last time.
o Forward ported the patches to 2.6.18-git19
o Replaced CONFIG_PHYSICAL_START with CONFIG_PHYSICAL_ALIGN
o Added a patch to prevent section relative symbols becoming absolute for sections with zero size.
o Dropped support for serial output debugging in decompressor code for the time being as per the discussion last time.
o Added symbol _text to few architectures so that compilation does not break
o Fix a typo in config option (CONFIG_RELOCTABLE). It was causing wrong pice of code to be executed and second kernel was stomping over first kernel's data.
o Modified __pa_symbol() definition as per Andi's comment.
o Put --emit-relocs undef #ifdef, so that relocation sections are not retained of CONFIG_RELOCATABLE is not set.
o Made symbol _end_rodata also section relative.
o Align .data section to 4K address otherwise data segment is loaded at a non-4K aligned boundary and kexec-tools do the check.
Following is the text from Eric's last post to refresh memory that why do we need a relocatable kernel.
The problem:
We can't always run the kernel at 1MB or 2MB, and so people who need different addresses must build multiple kernels. The bzImage format can't even represent loading a kernel at other than it's default address. With kexec on panic now starting to be used by distros having a kernel not running at the default load address is starting to become common.
The goal of this patch series is to build kernels that are relocatable at run time, and to extend the bzImage format to make it capable of expressing a relocatable kernel.
In extending the bzImage format I am replacing the existing unused bootsector with an ELF header. To express what is going on the ELF header will have type ET_DYN. Just like the kernel loading an ET_DYN executable bootloaders are not expected to process relocations. But the executable may be shifted in the address space so long as it's alignment requirements are met.
The i386 kernel is built to process relocations generated with --emit-relocs (after vmlinux.lds.S) has been fixed up to sort out static and dynamic relocations.
Thanks
Vivek
PATCH 7/12 Make linux/elf.h safe to be included in assembly files
The motivation for this is that currently we have 512 bytes at the begining of a bzImage that are unused now that we don't have a bootsector there. I plan on putting an ELF header there, and generating it by hand with assebmly data directives to be minimally disrutptive to the current build process.
To do that I need the elf magic constants available to my assembly code.
---
include/linux/elf.h | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-)
include/linux/elf.h renamed from include/linux/elf.h~Make-linux-elf.h-safe-to-be-included-in-assembly-files +21 -1
@@ -1,9 +1,11 @@#ifndef _LINUX_ELF_H#define _LINUX_ELF_H +#include <linux/elf-em.h> + +#ifndef __ASSEMBLY__#include <linux/types.h> #include <linux/auxvec.h> -#include <linux/elf-em.h> #include <asm/elf.h> #ifndef elf_read_implies_exec
@@ -30,6 +32,8 @@ typedef __u32 Elf64_Word;typedef __u64 Elf64_Xword ;typedef __s64 Elf64_Sxword ; +#endif /* __ASSEMBLY__ */ +/* These constants are for the segment types stored in the image headers */ #define PT_NULL 0#define PT_LOAD 1
@@ -97,6 +101,8 @@ typedef __s64 Elf64_Sxword;#define STT_COMMON 5#define STT_TLS 6 +#ifndef __ASSEMBLY__ +#define ELF_ST_BIND (x) ((x) >> 4)#define ELF_ST_TYPE (x) (((unsigned int) x) & 0xf)#define ELF32_ST_BIND (x) ELF_ST_BIND(x)
@@ -204,12 +210,16 @@ typedef struct elf64_hdr {Elf64_Half e_shstrndx; } Elf64_Ehdr; +#endif /* __ASSEMBLY__ */ +/* These constants define the permissions on sections in the program header, p_flags. */ #define PF_R 0x4#define PF_W 0x2#define PF_X 0x1 +#ifndef __ASSEMBLY__ + typedef struct elf32_phdr{ Elf32_Word p_type; Elf32_Off p_offset;
@@ -232,6 +242,8 @@ typedef struct elf64_phdr { Elf64_Xword p_align; /* Segment alignment, file & memory */ } Elf64_Phdr; +#endif /* __ASSEMBLY__ */ +/* sh_type */ #define SHT_NULL 0#define SHT_PROGBITS 1
@@ -265,6 +277,8 @@ typedef struct elf64_phdr {#define SHN_ABS 0xfff1#define SHN_COMMON 0xfff2#define SHN_HIRESERVE 0xffff + +#ifndef __ASSEMBLY__ typedef struct { Elf32_Word sh_name;
@@ -292,6 +306,8 @@ typedef struct elf64_shdr { Elf64_Xword sh_entsize; /* Entry size if section holds table */ } Elf64_Shdr; +#endif /* __ASSEMBLY__ */ +#define EI_MAG0 0/* e_ident[] indexes */ #define EI_MAG1 1#define EI_MAG2 2
@@ -338,6 +354,8 @@ typedef struct elf64_shdr {#define NT_PRXFPREG 0x46e62b7f/* copied from gdb5.1/include/elf/common.h */ +#ifndef __ASSEMBLY__ + /* Note header in a PT_NOTE section */ typedef struct elf32_note { Elf32_Word n_namesz; /* Name size */
@@ -368,5 +386,7 @@ extern Elf64_Dyn _DYNAMIC [];#endif +#endif /* __ASSEMBLY__ */ +#endif /* _LINUX_ELF_H */
_
PATCH 3/12 i386: Force section size to be non-zero to prevent a symbol becoming absolute
In reply to Vivek Goyalo Relocation patches for i386, moved the symbols in vmlinux.lds.S inside sections so that these symbols become section relative and are no more absolute. If these symbols become absolute, its bad as they are not relocated if kernel is not loaded at the address it has been compiled for.
o Ironically, just moving the symbols inside the section does not gurantee that symbols inside will not become absolute. Recent versions of linkers, do some optimization, and if section size is zero, it gets rid of the section and makes any defined symbol as absolute.
o This leads to a failure while second kernel is booting. arch/i386/alternative.c frees any pages present between __smp_alt_begin and __smp_alt_end. In my case size of section .smp_altinstructions is zero and symbol __smpt_alt_begin becomes absolute and is not relocated and system crashes while it is trying to free the memory starting from __smp_alt_begin.
o This issue is being fixed by the linker guys and they are making sure that linker does not get rid of an empty section if there is any section relative symbol defined in it. But we need to fix it at kernel level too so that people using the linker version without fix, are not affected.
o One of the possible solutions is that force the section size to be non zero to make sure these symbols don't become absolute. This patch implements that.
---
arch/i386/kernel/vmlinux.lds.S | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
arch/i386/kernel/vmlinux.lds.S renamed from arch/i386/kernel/vmlinux.lds.S~i386-reloc-non-zero-size-section +15 -0
@@ -40,6 +40,7 @@ SECTIONS __start___ex_table = .; *(__ex_table) __stop___ex_table = .; + LONG(0) } RODATA
@@ -49,6 +50,7 @@ SECTIONS __tracedata_start = .; *(.tracedata) __tracedata_end = .; + LONG(0) } /* writeable */
@@ -64,6 +66,7 @@ SECTIONS *(.data.nosave) . = ALIGN(4096); __nosave_end = .; + LONG(0) } . = ALIGN(4096);
@@ -81,6 +84,7 @@ SECTIONS .data.read_mostly : AT(ADDR(.data.read_mostly) - LOAD_OFFSET) { *(.data.read_mostly) _edata = .; /* End of data section */ + LONG(0) } #ifdef CONFIG_STACK_UNWIND
@@ -89,6 +93,7 @@ SECTIONS __start_unwind = .; *(.eh_frame) __end_unwind = .; + LONG(0) } #endif
@@ -104,17 +109,20 @@ SECTIONS __smp_alt_instructions = .; *(.smp_altinstructions) __smp_alt_instructions_end = .; + LONG(0) } . = ALIGN(4); .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) { __smp_locks = .; *(.smp_locks) __smp_locks_end = .; + LONG(0) } .smp_altinstr_replacement : AT(ADDR(.smp_altinstr_replacement) - LOAD_OFFSET) { *(.smp_altinstr_replacement) . = ALIGN(4096); __smp_alt_end = .; + LONG(0) } /* will be freed after init */
@@ -124,6 +132,7 @@ SECTIONS _sinittext = .; *(.init.text) _einittext = .; + LONG(0) } .init.data : AT(ADDR(.init.data) - LOAD_OFFSET) { *(.init.data) } . = ALIGN(16);
@@ -131,6 +140,7 @@ SECTIONS __setup_start = .; *(.init.setup) __setup_end = .; + LONG(0) } .initcall.init : AT(ADDR(.initcall.init) - LOAD_OFFSET) { __initcall_start = .;
@@ -142,11 +152,13 @@ SECTIONS *(.initcall6.init) *(.initcall7.init) __initcall_end = .; + LONG(0) } .con_initcall.init : AT(ADDR(.con_initcall.init) - LOAD_OFFSET) { __con_initcall_start = .; *(.con_initcall.init) __con_initcall_end = .; + LONG(0) } SECURITY_INIT . = ALIGN(4);
@@ -154,6 +166,7 @@ SECTIONS __alt_instructions = .; *(.altinstructions) __alt_instructions_end = .; + LONG(0) } .altinstr_replacement : AT(ADDR(.altinstr_replacement) - LOAD_OFFSET) { *(.altinstr_replacement)
@@ -167,12 +180,14 @@ SECTIONS __initramfs_start = .; *(.init.ramfs) __initramfs_end = .; + LONG(0) } . = ALIGN(L1_CACHE_BYTES); .data.percpu : AT(ADDR(.data.percpu) - LOAD_OFFSET) { __per_cpu_start = .; *(.data.percpu) __per_cpu_end = .; + LONG(0) } . = ALIGN(4096); /* freed after init ends here */
_
PATCH 12/12 i386 boot: Add an ELF header to bzImage
In reply to Vivek GoyalIncreasingly the cobbled together boot protocol that is bzImage does not have the flexibility to deal with booting in new situations.
Now that we no longer support the bootsector loader we have 512 bytes at the very start of a bzImage that we can use for other things.
Placing an ELF header there allows us to retain a single binary for all of x86 while at the same time describing things that bzImage does not allow us to describe.
The existing bugger off code for warning if we attempt to boot from the bootsector is kept but the error message is made more terse so we have a little more room to play with.
---
arch/i386/boot/Makefile | 2 arch/i386/boot/bootsect.S | 94 ++++++++++++++++++ arch/i386/boot/tools/build.c | 214 ++++++++++++++++++++++++++++++++++++++----- include/linux/elf_boot.h | 19 +++ 4 files changed, 301 insertions(+), 28 deletions(-)
arch/i386/boot/bootsect.S renamed from arch/i386/boot/bootsect.S~i386-boot-Add-an-ELF-header-to-bzImage +91 -3
@@ -13,6 +13,12 @@ * */ +#include <linux/version.h> +#include <linux/utsrelease.h> +#include <linux/compile.h> +#include <linux/elf.h> +#include <linux/elf_boot.h> +#include <asm/page.h> #include <asm/boot.h> SETUPSECTS = 4 /* default nr of setup-sectors */
@@ -42,10 +48,92 @@ SWAP_DEV = 0 /* SWAP_DEV is now writte .global _start _start: +ehdr: + # e_ident is carefully crafted so if this is treated + # as an x86 bootsector you will execute through + # e_ident and then print the bugger off message. + # The 1 stores to bx+di is unfortunate it is + # unlikely to affect the ability to print + # a message and you aren't supposed to be booting a + # bzImage directly from a floppy anyway. + + # e_ident + .byte ELFMAG0, ELFMAG1, ELFMAG2, ELFMAG3 + .byte ELFCLASS32, ELFDATA2LSB, EV_CURRENT, ELFOSABI_STANDALONE + .byte 0xeb, 0x3d, 0, 0, 0, 0, 0, 0 +#ifndef CONFIG_RELOCATABLE + .word ET_EXEC # e_type +#else + .word ET_DYN # e_type +#endif + .word EM_386 # e_machine + .int 1 # e_version + .int LOAD_PHYSICAL_ADDR # e_entry + .int phdr - _start # e_phoff + .int 0 # e_shoff + .int 0 # e_flags + .word e_ehdr - ehdr # e_ehsize + .word e_phdr1 - phdr # e_phentsize + .word (e_phdr - phdr)/(e_phdr1 - phdr) # e_phnum + .word 40 # e_shentsize + .word 0 # e_shnum + .word 0 # e_shstrndx +e_ehdr: +.org 71 +normalize: # Normalize the start address jmpl $BOOTSEG, $start2 +.org 80 +phdr: + .int PT_LOAD # p_type + .int (SETUPSECTS+1)*512 # p_offset + .int LOAD_PHYSICAL_ADDR + __PAGE_OFFSET # p_vaddr + .int LOAD_PHYSICAL_ADDR # p_paddr + .int SYSSIZE*16 # p_filesz + .int 0 # p_memsz + .int PF_R | PF_W | PF_X # p_flags + .int CONFIG_PHYSICAL_ALIGN # p_align +e_phdr1: + + .int PT_NOTE # p_type + .int b_note - _start # p_offset + .int 0 # p_vaddr + .int 0 # p_paddr + .int e_note - b_note # p_filesz + .int 0 # p_memsz + .int 0 # p_flags + .int 0 # p_align +e_phdr: + +.macro note name, type + .balign 4 + .int 2f - 1f # n_namesz + .int 4f - 3f # n_descsz + .int \type # n_type + .balign 4 +1: .asciz "\name" +2: .balign 4 +3: +.endm +.macro enote +4: .balign 4 +.endm + + .balign 4 +b_note: + note ELF_NOTE_BOOT, EIN_PROGRAM_NAME + .asciz "Linux" + enote + note ELF_NOTE_BOOT, EIN_PROGRAM_VERSION + .asciz UTS_RELEASE + enote + note ELF_NOTE_BOOT, EIN_ARGUMENT_STYLE + .asciz "Linux" + enote +e_note: + start2: movw %cs, %ax movw %ax, %ds
@@ -78,11 +166,11 @@ die: bugger_off_msg: - .ascii "Direct booting from floppy is no longer supported.\r\n" - .ascii "Please use a boot loader program instead.\r\n" + .ascii "Booting linux without a boot loader is no longer supported.\r\n" .ascii "\n" - .ascii "Remove disk and press any key to reboot . . .\r\n" + .ascii "Press any key to reboot . . .\r\n" .byte 0 +ebugger_off_msg: # Kernel attributes; used by setup
arch/i386/boot/Makefile renamed from arch/i386/boot/Makefile~i386-boot-Add-an-ELF-header-to-bzImage +1 -1
@@ -43,7 +43,7 @@ $(obj)/bzImage: BUILDFLAGS := -b quiet_cmd_image = BUILD $@ cmd_image = $(obj)/tools/build $(BUILDFLAGS) $(obj)/bootsect $(obj)/setup \ - $(obj)/vmlinux.bin $(ROOT_DEV) > $@ + $(obj)/vmlinux.bin $(ROOT_DEV) vmlinux > $@ $(obj)/zImage $(obj)/bzImage: $(obj)/bootsect $(obj)/setup \ $(obj)/vmlinux.bin $(obj)/tools/build FORCE
arch/i386/boot/tools/build.c renamed from arch/i386/boot/tools/build.c~i386-boot-Add-an-ELF-header-to-bzImage +190 -24
269 lines not on this page · raw message
include/linux/elf_boot.h new file +19 -0
@@ -0,0 +1,19 @@ +#ifndef ELF_BOOT_H +#define ELF_BOOT_H + +/* Elf notes to help bootloaders identify what program they are booting. +*/ + +/* Standardized Elf image notes for booting... The name for all of these is ELFBoot */ +#define ELF_NOTE_BOOT "ELFBoot" + +#define EIN_PROGRAM_NAME 0x00000001 +/* The program in this ELF file */ +#define EIN_PROGRAM_VERSION 0x00000002 +/* The version of the program in this ELF file */ +#define EIN_PROGRAM_CHECKSUM 0x00000003 +/* ip style checksum of the memory image. */ +#define EIN_ARGUMENT_STYLE 0x00000004 +/* String identifying argument passing style */ + +#endif /* ELF_BOOT_H */
_
PATCH 6/12 i386: CONFIG_PHYSICAL_START cleanup
In reply to Vivek GoyalDefining __PHYSICAL_START and __KERNEL_START in asm-i386/page.h works but it triggers a full kernel rebuild for the silliest of reasons. This modifies the users to directly use CONFIG_PHYSICAL_START and linux/config.h which prevents the full rebuild problem, which makes the code much more maintainer and hopefully user friendly.
---
arch/i386/boot/compressed/head.S | 7 +++---- arch/i386/boot/compressed/misc.c | 8 ++++---- arch/i386/kernel/vmlinux.lds.S | 3 ++- include/asm-i386/page.h | 3 --- 4 files changed, 9 insertions(+), 12 deletions(-)
arch/i386/boot/compressed/head.S renamed from arch/i386/boot/compressed/head.S~i386-CONFIG_PHYSICAL_START-cleanup +3 -4
@@ -25,7 +25,6 @@ #include <linux/linkage.h> #include <asm/segment.h> -#include <asm/page.h> .globl startup_32
@@ -75,7 +74,7 @@ startup_32: popl %esi # discard address popl %esi # real mode pointer xorl %ebx,%ebx - ljmp $(__BOOT_CS), $__PHYSICAL_START + ljmp $(__BOOT_CS), $CONFIG_PHYSICAL_START /* * We come here, if we were loaded high.
@@ -100,7 +99,7 @@ startup_32: popl %ecx # lcount popl %edx # high_buffer_start popl %eax # hcount - movl $__PHYSICAL_START,%edi + movl $CONFIG_PHYSICAL_START,%edi cli # make sure we don't get interrupted ljmp $(__BOOT_CS), $0x1000 # and jump to the move routine
@@ -125,5 +124,5 @@ move_routine_start: movsl movl %ebx,%esi # Restore setup pointer xorl %ebx,%ebx - ljmp $(__BOOT_CS), $__PHYSICAL_START + ljmp $(__BOOT_CS), $CONFIG_PHYSICAL_START move_routine_end:
arch/i386/boot/compressed/misc.c renamed from arch/i386/boot/compressed/misc.c~i386-CONFIG_PHYSICAL_START-cleanup +4 -4
@@ -9,11 +9,11 @@* High loaded stuff by Hans Lermen & Werner Almesberger, Feb. 1996 */ +#include <linux/config.h> #include <linux/linkage.h> #include <linux/vmalloc.h> #include <linux/screen_info.h> #include <asm/io.h> -#include <asm/page.h> /* * gzip declarations
@@ -303,7 +303,7 @@ static void setup_normal_output_buffer(v#else if ((RM_ALT_MEM_K >RM_EXT_MEM_K ?RM_ALT_MEM_K :RM_EXT_MEM_K ) <1024 )error ("Less than 2MB of memory" );#endif - output_data = (unsigned char *)__PHYSICAL_START;/* Normally Points to 1M */ + output_data = (unsigned char *)CONFIG_PHYSICAL_START ;/* Normally Points to 1M */ free_mem_end_ptr = (long )real_mode; }
@@ -326,8 +326,8 @@ static void setup_output_buffer_if_we_ru low_buffer_size = low_buffer_end -LOW_BUFFER_START ; high_loaded =1 ; free_mem_end_ptr = (long )high_buffer_start; -if ( (__PHYSICAL_START + low_buffer_size) > ((ulg )high_buffer_start)) { - high_buffer_start = (uch *)(__PHYSICAL_START + low_buffer_size); +if ( (CONFIG_PHYSICAL_START + low_buffer_size) > ((ulg )high_buffer_start)) { + high_buffer_start = (uch *)(CONFIG_PHYSICAL_START + low_buffer_size); mv->hcount =0 ;/* say: we need not to move high_buffer */ }else mv->hcount =-1 ;
arch/i386/kernel/vmlinux.lds.S renamed from arch/i386/kernel/vmlinux.lds.S~i386-CONFIG_PHYSICAL_START-cleanup +2 -1
@@ -4,6 +4,7 @@ #define LOAD_OFFSET __PAGE_OFFSET +#include <linux/config.h> #include <asm-generic/vmlinux.lds.h> #include <asm/thread_info.h> #include <asm/page.h>
@@ -21,7 +22,7 @@ PHDRS { } SECTIONS { - . = __KERNEL_START; + . = LOAD_OFFSET + CONFIG_PHYSICAL_START; phys_startup_32 = startup_32 - LOAD_OFFSET; /* read-only */ .text : AT(ADDR(.text) - LOAD_OFFSET) {
include/asm-i386/page.h renamed from include/asm-i386/page.h~i386-CONFIG_PHYSICAL_START-cleanup +0 -3
@@ -112,12 +112,9 @@ extern int page_is_ram(unsigned long pag#ifdef __ASSEMBLY__#define __PAGE_OFFSET CONFIG_PAGE_OFFSET -#define __PHYSICAL_START CONFIG_PHYSICAL_START#else #define __PAGE_OFFSET ((unsigned long)CONFIG_PAGE_OFFSET) -#define __PHYSICAL_START ((unsigned long)CONFIG_PHYSICAL_START)#endif -#define __KERNEL_START (__PAGE_OFFSET + __PHYSICAL_START)#define PAGE_OFFSET ((unsigned long)__PAGE_OFFSET)
_
PATCH 2/12 i386: align data section to 4K boundary
In reply to Vivek Goyalo Currently there is no specific alignment restriction in linker script and in some cases it can be placed non 4K aligned addresses. This fails kexec which checks that segment to be loaded is page aligned.
o I guess, it does not harm data segment to be 4K aligned.
---
arch/i386/kernel/vmlinux.lds.S | 1 + 1 file changed, 1 insertion(+)
arch/i386/kernel/vmlinux.lds.S renamed from arch/i386/kernel/vmlinux.lds.S~i386-force-data-section-to-4K-aligned +1 -0
@@ -52,6 +52,7 @@ SECTIONS } /* writeable */ + . = ALIGN(4096); .data : AT(ADDR(.data) - LOAD_OFFSET) { /* Data */ *(.data) CONSTRUCTORS
_
PATCH 10/12 i386: Relocatable kernel support
In reply to Vivek GoyalThis patch modifies the x86 kernel so that if CONFIG_RELOCATABLE is selected it will be able to be loaded at any 4K aligned address below 1G. The technique used is to compile the decompressor with -fPIC and modify it so the decompressor is fully relocatable. For the main kernel relocations are generated. Resulting in a kernel that is relocatable with no runtime overhead and no need to modify the source code.
A reserved 32bit word in the parameters has been assigned to serve as a stack so we figure out where are running.
---
arch/i386/Kconfig | 12 arch/i386/Makefile | 4 arch/i386/boot/compressed/Makefile | 22 + arch/i386/boot/compressed/head.S | 190 +++++++---- arch/i386/boot/compressed/misc.c | 267 ++++++++-------- arch/i386/boot/compressed/relocs.c | 563 ++++++++++++++++++++++++++++++++++ arch/i386/boot/compressed/vmlinux.lds | 43 ++ arch/i386/boot/compressed/vmlinux.scr | 3 arch/i386/boot/setup.S | 29 + include/linux/screen_info.h | 3 10 files changed, 920 insertions(+), 216 deletions(-)
arch/i386/boot/compressed/head.S renamed from arch/i386/boot/compressed/head.S~i386-Relocatable-kernel-support +120 -70
@@ -25,9 +25,11 @@ #include <linux/linkage.h> #include <asm/segment.h> +#include <asm/page.h> +.section ".text.head" .globl startup_32 - + startup_32: cld cli
@@ -36,93 +38,141 @@ startup_32: movl %eax,%es movl %eax,%fs movl %eax,%gs + movl %eax,%ss - lss stack_start,%esp - xorl %eax,%eax -1: incl %eax # check that A20 really IS enabled - movl %eax,0x000000 # loop forever if it isn't - cmpl %eax,0x100000 - je 1b +/* Calculate the delta between where we were compiled to run + * at and where we were actually loaded at. This can only be done + * with a short local call on x86. Nothing else will tell us what + * address we are running at. The reserved chunk of the real-mode + * data at 0x34-0x3f are used as the stack for this calculation. + * Only 4 bytes are needed. + */ + leal 0x40(%esi), %esp + call 1f +1: popl %ebp + subl $1b, %ebp + +/* Compute the delta between where we were compiled to run at + * and where the code will actually run at. + */ + /* Start with the delta to where the kernel will run at. If we are + * a relocatable kernel this is the delta to our load address otherwise + * this is the delta to CONFIG_PHYSICAL start. + */ +#ifdef CONFIG_RELOCATABLE + movl %ebp, %ebx +#else + movl $(CONFIG_PHYSICAL_START - startup_32), %ebx +#endif + + /* Replace the compressed data size with the uncompressed size */ + subl input_len(%ebp), %ebx + movl output_len(%ebp), %eax + addl %eax, %ebx + /* Add 8 bytes for every 32K input block */ + shrl $12, %eax + addl %eax, %ebx + /* Add 32K + 18 bytes of extra slack */ + addl $(32768 + 18), %ebx + /* Align on a 4K boundary */ + addl $4095, %ebx + andl $~4095, %ebx + +/* Copy the compressed kernel to the end of our buffer + * where decompression in place becomes safe. + */ + pushl %esi + leal _end(%ebp), %esi + leal _end(%ebx), %edi + movl $(_end - startup_32), %ecx + std + rep + movsb + cld + popl %esi + +/* Compute the kernel start address. + */ +#ifdef CONFIG_RELOCATABLE + leal startup_32(%ebp), %ebp +#else + movl $CONFIG_PHYSICAL_START, %ebp +#endif /* - * Initialize eflags. Some BIOS's leave bits like NT set. This would - * confuse the debugger if this code is traced. - * XXX - best to initialize before switching to protected mode. + * Jump to the relocated address. */ - pushl $0 - popfl + leal relocated(%ebx), %eax + jmp *%eax +.section ".text" +relocated: + /* * Clear BSS */ xorl %eax,%eax - movl $_edata,%edi - movl $_end,%ecx + leal _edata(%ebx),%edi + leal _end(%ebx), %ecx subl %edi,%ecx cld rep stosb + +/* + * Setup the stack for the decompressor + */ + leal stack_end(%ebx), %esp + /* * Do the decompression, and jump to the new kernel.. */ - subl $16,%esp # place for structure on the stack - movl %esp,%eax + movl output_len(%ebx), %eax + pushl %eax + pushl %ebp # output address + movl input_len(%ebx), %eax + pushl %eax # input_len + leal input_data(%ebx), %eax + pushl %eax # input_data + leal _end(%ebx), %eax + pushl %eax # end of the image as third argument pushl %esi # real mode pointer as second arg - pushl %eax # address of structure as first arg call decompress_kernel - orl %eax,%eax - jnz 3f - popl %esi # discard address - popl %esi # real mode pointer - xorl %ebx,%ebx - ljmp $(__BOOT_CS), $CONFIG_PHYSICAL_START + addl $20, %esp + popl %ecx + +#if CONFIG_RELOCATABLE +/* Find the address of the relocations. + */ + movl %ebp, %edi + addl %ecx, %edi + +/* Calculate the delta between where vmlinux was compiled to run + * and where it was actually loaded. + */ + movl %ebp, %ebx + subl $CONFIG_PHYSICAL_START, %ebx /* - * We come here, if we were loaded high. - * We need to move the move-in-place routine down to 0x1000 - * and then start it with the buffer addresses in registers, - * which we got from the stack. - */ -3: - movl $move_routine_start,%esi - movl $0x1000,%edi - movl $move_routine_end,%ecx - subl %esi,%ecx - addl $3,%ecx - shrl $2,%ecx - cld - rep - movsl + * Process relocations. + */ - popl %esi # discard the address - popl %ebx # real mode pointer - popl %esi # low_buffer_start - popl %ecx # lcount - popl %edx # high_buffer_start - popl %eax # hcount - movl $CONFIG_PHYSICAL_START,%edi - cli # make sure we don't get interrupted - ljmp $(__BOOT_CS), $0x1000 # and jump to the move routine - -/* - * Routine (template) for moving the decompressed kernel in place, - * if we were high loaded. This _must_ PIC-code ! - */ -move_routine_start: - movl %ecx,%ebp - shrl $2,%ecx - rep - movsl - movl %ebp,%ecx - andl $3,%ecx - rep - movsb - movl %edx,%esi - movl %eax,%ecx # NOTE: rep movsb won't move if %ecx == 0 - addl $3,%ecx - shrl $2,%ecx - rep - movsl - movl %ebx,%esi # Restore setup pointer +1: subl $4, %edi + movl 0(%edi), %ecx + testl %ecx, %ecx + jz 2f + addl %ebx, -__PAGE_OFFSET(%ebx, %ecx) + jmp 1b +2: +#endif + +/* + * Jump to the decompressed kernel. + */ xorl %ebx,%ebx - ljmp $(__BOOT_CS), $CONFIG_PHYSICAL_START -move_routine_end: + jmp *%ebp + +.bss +.balign 4 +stack: + .fill 4096, 1, 0 +stack_end:
arch/i386/boot/compressed/Makefile renamed from arch/i386/boot/compressed/Makefile~i386-Relocatable-kernel-support +18 -4
@@ -7,19 +7,33 @@ targets := vmlinux vmlinux.bin vmlinux.bin.gz head.o misc.o piggy.o EXTRA_AFLAGS := -traditional -LDFLAGS_vmlinux := -Ttext $(IMAGE_OFFSET) -e startup_32 +LDFLAGS_vmlinux := -T +CFLAGS_misc.o += -fPIC +hostprogs-y := relocs -$(obj)/vmlinux: $(obj)/head.o $(obj)/misc.o $(obj)/piggy.o FORCE +$(obj)/vmlinux: $(src)/vmlinux.lds $(obj)/head.o $(obj)/misc.o $(obj)/piggy.o FORCE $(call if_changed,ld) @: $(obj)/vmlinux.bin: vmlinux FORCE $(call if_changed,objcopy) -$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE +quiet_cmd_relocs = RELOCS $@ + cmd_relocs = $(obj)/relocs $< > $@ +$(obj)/vmlinux.relocs: vmlinux $(obj)/relocs FORCE + $(call if_changed,relocs) + +vmlinux.bin.all-y := $(obj)/vmlinux.bin +vmlinux.bin.all-$(CONFIG_RELOCATABLE) += $(obj)/vmlinux.relocs +quiet_cmd_relocbin = BUILD $@ + cmd_relocbin = cat $(filter-out FORCE,$^) > $@ +$(obj)/vmlinux.bin.all: $(vmlinux.bin.all-y) FORCE + $(call if_changed,relocbin) + +$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin.all FORCE $(call if_changed,gzip) LDFLAGS_piggy.o := -r --format binary --oformat elf32-i386 -T -$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.gz FORCE +$(obj)/piggy.o: $(src)/vmlinux.scr $(obj)/vmlinux.bin.gz FORCE $(call if_changed,ld)
arch/i386/boot/compressed/misc.c renamed from arch/i386/boot/compressed/misc.c~i386-Relocatable-kernel-support +136 -131
333 lines not on this page · raw message
arch/i386/boot/compressed/relocs.c new file +563 -0
563 lines not on this page · raw message
arch/i386/boot/compressed/vmlinux.lds new file +43 -0
43 lines not on this page · raw message
arch/i386/boot/compressed/vmlinux.scr renamed from arch/i386/boot/compressed/vmlinux.scr~i386-Relocatable-kernel-support +2 -1
@@ -1,9 +1,10 @@ SECTIONS { - .data : { + .data.compressed : { input_len = .; LONG(input_data_end - input_data) input_data = .; *(.data) + output_len = . - 4; input_data_end = .; } }
arch/i386/boot/setup.S renamed from arch/i386/boot/setup.S~i386-Relocatable-kernel-support +21 -8
@@ -588,11 +588,6 @@ rmodeswtch_normal: call default_switch rmodeswtch_end: -# we get the code32 start address and modify the below 'jmpi' -# (loader may have changed it) - movl %cs:code32_start, %eax - movl %eax, %cs:code32 - # Now we move the system to its rightful place ... but we check if we have a # big-kernel. In that case we *must* not move it ... testb $LOADED_HIGH, %cs:loadflags
@@ -788,11 +783,12 @@ a20_err_msg: a20_done: #endif /* CONFIG_X86_VOYAGER */ -# set up gdt and idt +# set up gdt and idt and 32bit start address lidt idt_48 # load idt with 0,0 xorl %eax, %eax # Compute gdt_base movw %ds, %ax # (Convert %ds:gdt to a linear ptr) shll $4, %eax + addl %eax, code32 addl $gdt, %eax movl %eax, (gdt_48+2) lgdt gdt_48 # load gdt with whatever is
@@ -851,9 +847,26 @@ flush_instr: # Manual, Mixing 16-bit and 32-bit code, page 16-6) .byte 0x66, 0xea # prefix + jmpi-opcode -code32: .long 0x1000 # will be set to 0x100000 - # for big kernels +code32: .long startup_32 # will be set to %cs+startup_32 .word __BOOT_CS +.code32 +startup_32: + movl $(__BOOT_DS), %eax + movl %eax, %ds + movl %eax, %es + movl %eax, %fs + movl %eax, %gs + movl %eax, %ss + + xorl %eax, %eax +1: incl %eax # check that A20 really IS enabled + movl %eax, 0x00000000 # loop forever if it isn't + cmpl %eax, 0x00100000 + je 1b + + # Jump to the 32bit entry point + jmpl *(code32_start - start + (DELTA_INITSEG << 4))(%esi) +.code16 # Here's a bunch of information about your current kernel.. kernel_version: .ascii UTS_RELEASE
arch/i386/Kconfig renamed from arch/i386/Kconfig~i386-Relocatable-kernel-support +12 -0
@@ -773,6 +773,18 @@ config CRASH_DUMP PHYSICAL_START. For more details see Documentation/kdump/kdump.txt +config RELOCATABLE + bool "Build a relocatable kernel" + help + This build a kernel image that retains relocation information + so it can be loaded someplace besides the default 1MB. + The relocations tend to the kernel binary about 10% larger, + but are discarded at runtime. + + One use is for the kexec on panic case where the recovery kernel + must live at a different physical address than the primary + kernel. + config PHYSICAL_START hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP)
arch/i386/Makefile renamed from arch/i386/Makefile~i386-Relocatable-kernel-support +3 -1
@@ -26,7 +26,9 @@ endif LDFLAGS := -m elf_i386 OBJCOPYFLAGS := -O binary -R .note -R .comment -S -LDFLAGS_vmlinux := +ifdef CONFIG_RELOCATABLE +LDFLAGS_vmlinux := --emit-relocs +endif CHECKFLAGS += -D__i386__ CFLAGS += -pipe -msoft-float
include/linux/screen_info.h renamed from include/linux/screen_info.h~i386-Relocatable-kernel-support +2 -1
@@ -42,7 +42,8 @@ struct screen_info {u16 pages;/* 0x32 */ u16 vesa_attributes;/* 0x34 */ u32 capabilities;/* 0x36 */ -/* 0x3a -- 0x3f reserved for future expansion */ +/* 0x3a -- 0x3b reserved for future expansion */ +/* 0x3c -- 0x3f micro stack for relocatable kernels */ };extern struct screen_info screen_info;
_
Re: [PATCH 6/12] i386: CONFIG_PHYSICAL_START cleanup
In reply to Vivek Goyalarch/i386/boot/compressed/misc.c 2006-10-02 14:33:44.000000000 -0400 line 15
Quoted 11 lines · Vivek Goyal
diff -puN
arch/i386/boot/compressed/misc.c~i386-CONFIG_PHYSICAL_START-cleanuparch/i386/boot/compressed/misc.carch/i386/boot/compressed/misc.c 2006-10-02 14:33:44.000000000 -0400 renamed from arch/i386/boot/compressed/misc.c~i386-CONFIG_PHYSICAL_START-cleanup 2006-10-02 13:17:58.000000000 -0400 +1
-0@@ -9,11 +9,11 @@ * High loaded stuff by Hans Lermen & Werner Almesberger, Feb. 1996 */ +#include <linux/config.h> #include <linux/linkage.h> #include <linux/vmalloc.h> #include <linux/screen_info.h>
Isn't config.h implicitly included everywhere by the build system now? I don't think this is needed.
-- Dave
Re: [PATCH 6/12] i386: CONFIG_PHYSICAL_START cleanup
Quoted 8 lines · Dave Hansen
Quoted 7 lines · Vivek Goyal
diff -puN
arch/i386/boot/compressed/misc.c~i386-CONFIG_PHYSICAL_START-cleanuparch/i386/boot/compressed/misc.carch/i386/boot/compressed/misc.c 2006-10-02 14:33:44.000000000 -0400 renamed from arch/i386/boot/compressed/misc.c~i386-CONFIG_PHYSICAL_START-cleanup 2006-10-02 13:17:58.000000000 -0400 +0
-0@@ -9,11 +9,11 @@ * High loaded stuff by Hans Lermen & Werner Almesberger, Feb. 1996 */
Quoted 8 lines
arch/i386/boot/compressed/misc.c 2006-10-02 14:33:44.000000000 -0400 line 15
Quoted 4 lines
arch/i386/boot/compressed/misc.c 2006-10-02 14:33:44.000000000 -0400 renamed from arch/i386/boot/compressed/misc.c~i386-CONFIG_PHYSICAL_START-cleanup 2006-10-02 13:17:58.000000000 -0400 +1
-0+#include <linux/config.h> #include <linux/linkage.h> #include <linux/vmalloc.h> #include <linux/screen_info.h>Isn't
config.himplicitly included everywhere by the build system now? I don't think this is needed.
You are right. I will get rid of it.
-Vivek
Re: [PATCH 6/12] i386: CONFIG_PHYSICAL_START cleanup
In reply to Dave HansenQuoted 12 lines · Dave Hansen
Quoted 1 line · Vivek Goyal
diff -puN
arch/i386/boot/compressed/misc.c~i386-CONFIG_PHYSICAL_START-cleanup
arch/i386/boot/compressed/misc.cQuoted 1 line
---
linux-2.6.18-git17/arch/i386/boot/compressed/misc.c~i386-CONFIG_PHYSICAL_START-cleanup
2006-10-02 13:17:58.000000000 -0400Quoted 1 line
+++
linux-2.6.18-git17-root/arch/i386/boot/compressed/misc.c2006-10-0214:33:44.000000000 -0400
Quoted 4 lines
arch/i386/boot/compressed/misc.c renamed from arch/i386/boot/compressed/misc.c~i386-CONFIG_PHYSICAL_START-cleanup +0
-0@@ -9,11 +9,11 @@* High loaded stuff by Hans Lermen & Werner Almesberger, Feb. 1996 */
Quoted 7 lines
arch/i386/boot/compressed/misc.c line 15
Quoted 4 lines
arch/i386/boot/compressed/misc.c renamed from arch/i386/boot/compressed/misc.c~i386-CONFIG_PHYSICAL_START-cleanup +1
-0+#include <linux/config.h> #include <linux/linkage.h> #include <linux/vmalloc.h> #include <linux/screen_info.h> Isn't
config.himplicitly included everywhere by the build system now? I don't think this is needed.
It should be.
That is one of the issues I received feedback on, the first round.
Eric
Re: [PATCH 6/12] i386: CONFIG_PHYSICAL_START cleanup
Quoted 22 lines · Eric W. Biederman
Quoted 12 lines · Dave Hansen
Quoted 1 line · Vivek Goyal
diff -puN
arch/i386/boot/compressed/misc.c~i386-CONFIG_PHYSICAL_START-cleanup
arch/i386/boot/compressed/misc.cQuoted 1 line
---
linux-2.6.18-git17/arch/i386/boot/compressed/misc.c~i386-CONFIG_PHYSICAL_START-cleanup
2006-10-02 13:17:58.000000000 -0400Quoted 1 line
+++
linux-2.6.18-git17-root/arch/i386/boot/compressed/misc.c2006-10-0214:33:44.000000000 -0400
Quoted 4 lines
(quoted diff) +0
-0@@ -9,11 +9,11 @@ * High loaded stuff by Hans Lermen & Werner Almesberger, Feb. 1996 */Quoted 7 lines
Review line 15
Quoted 4 lines
(quoted diff) +1
-0+#include <linux/config.h> #include <linux/linkage.h> #include <linux/vmalloc.h> #include <linux/screen_info.h>Isn't
config.himplicitly included everywhere by the build system now? I don't think this is needed.
Quoted 4 lines
It should be.
That is one of the issues I received feedback on, the first round.
I got rid of some other config.h but somehow missed last two in this patch.
Please find attached the regenerated patch.
-Vivek
Defining __PHYSICAL_START and __KERNEL_START in asm-i386/page.h works but it triggers a full kernel rebuild for the silliest of reasons. This modifies the users to directly use CONFIG_PHYSICAL_START and linux/config.h which prevents the full rebuild problem, which makes the code much more maintainer and hopefully user friendly.
---
arch/i386/boot/compressed/head.S | 7 +++---- arch/i386/boot/compressed/misc.c | 7 +++---- arch/i386/kernel/vmlinux.lds.S | 2 +- include/asm-i386/page.h | 3 --- 4 files changed, 7 insertions(+), 12 deletions(-)
arch/i386/boot/compressed/head.S renamed from arch/i386/boot/compressed/head.S~i386-CONFIG_PHYSICAL_START-cleanup +3 -4
@@ -25,7 +25,6 @@ #include <linux/linkage.h> #include <asm/segment.h> -#include <asm/page.h> .globl startup_32
@@ -75,7 +74,7 @@ startup_32: popl %esi # discard address popl %esi # real mode pointer xorl %ebx,%ebx - ljmp $(__BOOT_CS), $__PHYSICAL_START + ljmp $(__BOOT_CS), $CONFIG_PHYSICAL_START /* * We come here, if we were loaded high.
@@ -100,7 +99,7 @@ startup_32: popl %ecx # lcount popl %edx # high_buffer_start popl %eax # hcount - movl $__PHYSICAL_START,%edi + movl $CONFIG_PHYSICAL_START,%edi cli # make sure we don't get interrupted ljmp $(__BOOT_CS), $0x1000 # and jump to the move routine
@@ -125,5 +124,5 @@ move_routine_start: movsl movl %ebx,%esi # Restore setup pointer xorl %ebx,%ebx - ljmp $(__BOOT_CS), $__PHYSICAL_START + ljmp $(__BOOT_CS), $CONFIG_PHYSICAL_START move_routine_end:
arch/i386/boot/compressed/misc.c renamed from arch/i386/boot/compressed/misc.c~i386-CONFIG_PHYSICAL_START-cleanup +3 -4
@@ -13,7 +13,6 @@#include <linux/vmalloc.h> #include <linux/screen_info.h> #include <asm/io.h> -#include <asm/page.h> /* * gzip declarations
@@ -303,7 +302,7 @@ static void setup_normal_output_buffer(v#else if ((RM_ALT_MEM_K >RM_EXT_MEM_K ?RM_ALT_MEM_K :RM_EXT_MEM_K ) <1024 )error ("Less than 2MB of memory" );#endif - output_data = (unsigned char *)__PHYSICAL_START;/* Normally Points to 1M */ + output_data = (unsigned char *)CONFIG_PHYSICAL_START ;/* Normally Points to 1M */ free_mem_end_ptr = (long )real_mode; }
@@ -326,8 +325,8 @@ static void setup_output_buffer_if_we_ru low_buffer_size = low_buffer_end -LOW_BUFFER_START ; high_loaded =1 ; free_mem_end_ptr = (long )high_buffer_start; -if ( (__PHYSICAL_START + low_buffer_size) > ((ulg )high_buffer_start)) { - high_buffer_start = (uch *)(__PHYSICAL_START + low_buffer_size); +if ( (CONFIG_PHYSICAL_START + low_buffer_size) > ((ulg )high_buffer_start)) { + high_buffer_start = (uch *)(CONFIG_PHYSICAL_START + low_buffer_size); mv->hcount =0 ;/* say: we need not to move high_buffer */ }else mv->hcount =-1 ;
arch/i386/kernel/vmlinux.lds.S renamed from arch/i386/kernel/vmlinux.lds.S~i386-CONFIG_PHYSICAL_START-cleanup +1 -1
@@ -21,7 +21,7 @@ PHDRS { } SECTIONS { - . = __KERNEL_START; + . = LOAD_OFFSET + CONFIG_PHYSICAL_START; phys_startup_32 = startup_32 - LOAD_OFFSET; /* read-only */ .text : AT(ADDR(.text) - LOAD_OFFSET) {
include/asm-i386/page.h renamed from include/asm-i386/page.h~i386-CONFIG_PHYSICAL_START-cleanup +0 -3
@@ -112,12 +112,9 @@ extern int page_is_ram(unsigned long pag#ifdef __ASSEMBLY__#define __PAGE_OFFSET CONFIG_PAGE_OFFSET -#define __PHYSICAL_START CONFIG_PHYSICAL_START#else #define __PAGE_OFFSET ((unsigned long)CONFIG_PAGE_OFFSET) -#define __PHYSICAL_START ((unsigned long)CONFIG_PHYSICAL_START)#endif -#define __KERNEL_START (__PAGE_OFFSET + __PHYSICAL_START)#define PAGE_OFFSET ((unsigned long)__PAGE_OFFSET)
_
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
In reply to Vivek GoyalQuoted 4 lines · On Tue, 3 Oct 2006 13:25:11 -0400 Vivek Goyal <[email protected]> wrote:
Increasingly the cobbled together boot protocol that is bzImage does not have the flexibility to deal with booting in new situations.
Quoted 8 lines
Now that we no longer support the bootsector loader we have 512 bytes at the very start of a bzImage that we can use for other things.
Placing an ELF header there allows us to retain a single binary for all of x86 while at the same time describing things that bzImage does not allow us to describe.
Seems that the entire kernel effort is an ongoing plot to make my poor little Vaio stop working. This patch turns it into a black-screened rock as soon as it does grub -> linux. Stock-standard FC5 install, config at
http://userweb.kernel.org/~akpm/config-sony.txt.
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
Quoted 16 lines · Andrew Morton
Quoted 4 lines · On Tue, 3 Oct 2006 13:25:11 -0400 Vivek Goyal <[email protected]> wrote:
Increasingly the cobbled together boot protocol that is bzImage does not have the flexibility to deal with booting in new situations.
Quoted 8 lines
Now that we no longer support the bootsector loader we have 512 bytes at the very start of a bzImage that we can use for other things.
Placing an ELF header there allows us to retain a single binary for all of x86 while at the same time describing things that bzImage does not allow us to describe.
Quoted 4 lines
Seems that the entire kernel effort is an ongoing plot to make my poor little Vaio stop working. This patch turns it into a black-screened rock as soon as it does grub -> linux. Stock-standard FC5 install, config at
http://userweb.kernel.org/~akpm/config-sony.txt.
Hi Andrew,
Right now I don't have access to my test machine. Tomorrow morning, very first thing I am going to try it out with your config file.
This patch just adds and ELF header to bzImage which is not even used by grub.
So without this patch you are able to boot the kernel on your laptop?
Thanks
Vivek
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
Quoted 9 lines · Vivek Goyal
Hi Andrew,
Right now I don't have access to my test machine. Tomorrow morning, very first thing I am going to try it out with your config file.
This patch just adds and ELF header to bzImage which is not even used by grub.
Oh yes, it will be. See below.
Quoted 1 line
So without this patch you are able to boot the kernel on your laptop?
Danger, Will Robinson. GRUB, Etherboot, and a whole bunch of other boot loaders will recognize an ELF binary and load it as such. They will typically load it as an executable (not a relocatable object) -- I doubt many of them check that appropriate part of the ELF header -- so unless your kernel can be safely loaded *AND RUN* in that mode this is not going to work.
The entrypoint is going to be a major headache, since the standard kernel is entered in real mode, whereas an ELF file will typically be entered in protected mode, quite possibly using the C calling convention to pass the command line as (argc, argv). God only knows how they're going to deal with an initrd.
It may very well be that the ELF magic number has to be obfuscated.
-hpa
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
In reply to Vivek GoyalQuoted 7 lines · On Wed, 4 Oct 2006 00:28:50 -0400 Vivek Goyal <[email protected]> wrote:
Quoted 4 lines
Seems that the entire kernel effort is an ongoing plot to make my poor little Vaio stop working. This patch turns it into a black-screened rock as soon as it does grub -> linux. Stock-standard FC5 install, config at
http://userweb.kernel.org/~akpm/config-sony.txt.Hi Andrew,
Quoted 7 lines
Right now I don't have access to my test machine. Tomorrow morning, very first thing I am going to try it out with your config file.
This patch just adds and ELF header to bzImage which is not even used by grub.
So without this patch you are able to boot the kernel on your laptop?
With your other 11 patches applied and not this one, it boots OK.
With this patch applied and not the other eleven applied: no-compile.
With all 12 applied: crash.
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
In reply to Vivek GoyalQuoted 8 lines · Vivek Goyal
Increasingly the cobbled together boot protocol that is bzImage does not have the flexibility to deal with booting in new situations.
Now that we no longer support the bootsector loader we have 512 bytes at the very start of a bzImage that we can use for other things.
Quoted 8 lines
Placing an ELF header there allows us to retain a single binary for all of x86 while at the same time describing things that bzImage does not allow us to describe.
The existing bugger off code for warning if we attempt to boot from the bootsector is kept but the error message is made more terse so we have a little more room to play with.
Vivek for this first round can we please take out the ELF note processing. Now that vmlinux has ELF notes of interest to the bootloader we really should be getting the ELF notes from there.
So the generation of the ELF notes needs to move into the vmlinux and then we need to copy them to ELF header.
If we just remove the ELF note munging code from this patch that should be a good first step in getting the ELF notes correct.
Eric
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
In reply to H. Peter AnvinQuoted 10 lines · H. Peter Anvin
Quoted 6 lines · Vivek Goyal
Hi Andrew,
Right now I don't have access to my test machine. Tomorrow morning, very first thing I am going to try it out with your config file. This patch just adds and ELF header to bzImage which is not even used by grub.Oh yes, it will be. See below.
Quoted 7 lines
Quoted 1 line
So without this patch you are able to boot the kernel on your laptop?
Danger, Will Robinson. GRUB, Etherboot, and a whole bunch of other boot loaders will recognize an ELF binary and load it as such. They will typically load it as an executable (not a relocatable object) -- I doubt many of them check that appropriate part of the ELF header -- so unless your kernel can be safely loaded *AND RUN* in that mode this is not going to work.
The bzImage be safely loaded run in that mode. The only question is one of arguments. Because there are no standards. For Etherboot we are good. For the insanity that is GRUB I haven't the faintest clue but we should be ok as we don't have a multiboot header.
Quoted 6 lines
The entrypoint is going to be a major headache, since the standard kernel is entered in real mode, whereas an ELF file will typically be entered in protected mode, quite possibly using the C calling convention to pass the command line as (argc, argv). God only knows how they're going to deal with an initrd.
It may very well be that the ELF magic number has to be obfuscated.
The entry point that is exported is the kernels protected mode entry point that is used after the real mode code has been run. This is to allow bootloaders like kexec where running the real-mode code is insane or impossible to be used.
The calling conventions though are not changed, this is just formalizing something that various groups have been doing for years. Since it is all in the bzImage we still only have a single file format to support, so any bootloader that can load a standard bzImage and run the kernels real mode code should still do it that way but. If you can't the rest of the information is available.
Eric
Re: [PATCH 4/12] i386: define __pa_symbol()
In reply to Vivek Goyalhi,
Sorry for the late feedback...
Quoted 6 lines · Vivek Goyal
On
x86_64we have to be careful with calculating the physical address of kernel symbols. Both because of compiler odditities and because the symbols live in a different range of the virtual address space.
[snip]
include/asm-i386/page.h extern int page_is_ram(unsigned long pag · line 132
Quoted 4 lines
include/asm-i386/page.h renamed from include/asm-i386/page.h~i386-define-__pa_symbol +4
-0+#define __pa_symbol (x) \ + ({unsigned long v; \ + asm("" : "=r" (v) : "0" (x)); \ + __pa(v); })
Why not simply reusing RELOC_HIDE like this ?
#define __pa_symbol(x) __pa(RELOC_HIDE(x,0))
thanks
Franck
Re: [PATCH 3/12] i386: Force section size to be non-zero to prevent a symbol becoming absolute
In reply to Vivek Goyalarch/i386/kernel/vmlinux.lds.S SECTIONS · line 72
Quoted 10 lines
/* writeable */arch/i386/kernel/vmlinux.lds.S renamed from arch/i386/kernel/vmlinux.lds.S~i386-reloc-non-zero-size-section +1
-0@@ -64,6 +66,7 @@ SECTIONS *(.data.nosave) . = ALIGN(4096); __nosave_end = .; + LONG(0) } . = ALIGN(4096);
You're wasting one full page once for each of these LONG(0)s because of the following 4096 alignment.
Isn't there some way to do this less wastefull?
-Andi
Re: [PATCH 2/12] i386: align data section to 4K boundary
In reply to Vivek GoyalQuoted 6 lines · Vivek Goyal
o Currently there is no specific alignment restriction in linker script and in some cases it can be placed non 4K aligned addresses. This fails kexec which checks that segment to be loaded is page aligned.
o I guess, it does not harm data segment to be 4K aligned.
iirc P4 optimization guide even recommends to keep writable data away one page from code to avoid some cache invalidations. But:
arch/i386/kernel/vmlinux.lds.S SECTIONS · line 58
Quoted 11 lines
diff -puN
arch/i386/kernel/vmlinux.lds.S~i386-force-data-section-to-4K-alignedarch/i386/kernel/vmlinux.lds.Sarch/i386/kernel/vmlinux.lds.S renamed from arch/i386/kernel/vmlinux.lds.S~i386-force-data-section-to-4K-aligned +1
-0@@ -52,6 +52,7 @@ SECTIONS } /* writeable */ + . = ALIGN(4096); .data : AT(ADDR(.data) - LOAD_OFFSET) { /* Data */ *(.data) CONSTRUCTORS
I would move the ".tracedata" section behind it first.
-Andi
Re: [PATCH 3/12] i386: Force section size to be non-zero to prevent a symbol becoming absolute
In reply to Andi KleenQuoted 8 lines · Andi Kleen
Quoted 8 lines
/* writeable */arch/i386/kernel/vmlinux.lds.S renamed from arch/i386/kernel/vmlinux.lds.S~i386-reloc-non-zero-size-section +1
-0@@ -64,6 +66,7 @@ SECTIONS *(.data.nosave) . = ALIGN(4096); __nosave_end = .; + LONG(0) }
Quoted 6 lines
Review SECTIONS · line 72
Quoted 1 line
(quoted diff) +0
-0. = ALIGN(4096);You're wasting one full page once for each of these LONG(0)s because of the following 4096 alignment.
Isn't there some way to do this less wastefull?
So the problem is that we have sections that don't get relocated which confuses things. If the first that happened was that the size was check to see if it was non-zero before we did anything I think we wouldn't care if the linker messed up in this way.
But I may be wrong on that point.
Eric
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
In reply to Eric W. BiedermanQuoted 24 lines · Eric W. Biederman
Quoted 8 lines · Vivek Goyal
Increasingly the cobbled together boot protocol that is bzImage does not have the flexibility to deal with booting in new situations.
Now that we no longer support the bootsector loader we have 512 bytes at the very start of a bzImage that we can use for other things.
Quoted 8 lines
Placing an ELF header there allows us to retain a single binary for all of x86 while at the same time describing things that bzImage does not allow us to describe.
The existing bugger off code for warning if we attempt to boot from the bootsector is kept but the error message is made more terse so we have a little more room to play with.
Vivek for this first round can we please take out the ELF note processing. Now that vmlinux has ELF notes of interest to the bootloader we really should be getting the ELF notes from there.
Quoted 5 lines
So the generation of the ELF notes needs to move into the vmlinux and then we need to copy them to ELF header.
If we just remove the ELF note munging code from this patch that should be a good first step in getting the ELF notes correct.
Hi Eric,
Sure. I will get rid if ELF note generation for bzImage ELF header.
But would that stop bootloaders out there from treating kernel as an ELF executable?
I have got a FC5 machine with grub version .97 and everything seems to work for me. So I am assuming that Andrew got a newer version of Grub which is trying to load ther kernel as an ELF executable and then running into the issues.
Thanks
Vivek
Re: [PATCH 3/12] i386: Force section size to be non-zero to prevent a symbol becoming absolute
In reply to Eric W. BiedermanQuoted 15 lines · Eric W. Biederman
Quoted 13 lines · Andi Kleen
arch/i386/kernel/vmlinux.lds.S SECTIONS · line 72
Quoted 9 lines
/* writeable */arch/i386/kernel/vmlinux.lds.S renamed from arch/i386/kernel/vmlinux.lds.S~i386-reloc-non-zero-size-section +1
-0@@ -64,6 +66,7 @@ SECTIONS *(.data.nosave) . = ALIGN(4096); __nosave_end = .; + LONG(0) } . = ALIGN(4096);You're wasting one full page once for each of these LONG(0)s because of the following 4096 alignment.
Quoted 7 lines
Quoted 1 line
Isn't there some way to do this less wastefull?
So the problem is that we have sections that don't get relocated which confuses things. If the first that happened was that the size was check to see if it was non-zero before we did anything I think we wouldn't care if the linker messed up in this way.
Actually in this case if section size is zero, linker does not even output that section and simply gets rid of it. What is left behind is just the symbols (which were supposed to be section relative) and linker just makes those symbols as absolute symbols. Absolute symbols are not to be relocated so patch just filters out those symbols and they don't get relocated. So I am not sure where can I check the section size?
One other possible solution is that kernel code is written carefully so that we don't run into such problems even if absolute symbols don't get relocated. For example, if there are two symbols A and B denoting section start and end, always check if (A<B) before doing anything. Also make sure that one is not trying to handle multiple sections at the same time. For example, if A and B represents start and end for section 1 and C and D represent start and end for section 2 then one wants to free memory between A and D , then it should be done in two steps.
if (A<B)
free_memory(A,B)
if (C<D)
free_memory(C,D)
So this code will become safe even if symbols for empty sections become absolute.
But this looks to be very awkward solution.
Thanks
Vivek
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
In reply to Eric W. BiedermanQuoted 13 lines · Eric W. Biederman
Quoted 7 lines
The entrypoint is going to be a major headache, since the standard kernel is entered in real mode, whereas an ELF file will typically be entered in protected mode, quite possibly using the C calling convention to pass the command line as (argc, argv). God only knows how they're going to deal with an initrd.
It may very well be that the ELF magic number has to be obfuscated.
The entry point that is exported is the kernels protected mode entry point that is used after the real mode code has been run. This is to allow bootloaders like kexec where running the real-mode code is insane or impossible to be used.
Quoted 7 lines
The calling conventions though are not changed, this is just formalizing something that various groups have been doing for years. Since it is all in the bzImage we still only have a single file format to support, so any bootloader that can load a standard bzImage and run the kernels real mode code should still do it that way but. If you can't the rest of the information is available.
Well, it doesn't help if what you end up with for some bootloader is a nonfunctioning kernel.
-hpa
Re: [PATCH 2/12] i386: align data section to 4K boundary
In reply to Andi KleenQuoted 9 lines · Andi Kleen
Quoted 5 lines · Vivek Goyal
o Currently there is no specific alignment restriction in linker script and in some cases it can be placed non 4K aligned addresses. This fails kexec which checks that segment to be loaded is page aligned.
o I guess, it does not harm data segment to be 4K aligned.
iirc P4 optimization guide even recommends to keep writable data away one page from code to avoid some cache invalidations. But:
Yes, that's why the .rodata section should be in between.
It's not just the P4, either.
-hpa
Re: [PATCH 3/12] i386: Force section size to be non-zero to prevent a symbol becoming absolute
In reply to Vivek GoyalQuoted 24 lines · On Tue, 3 Oct 2006 13:09:08 -0400 Vivek Goyal <[email protected]> wrote:
o Relocation patches for i386, moved the symbols in
vmlinux.lds.Sinside sections so that these symbols become section relative and are no more absolute. If these symbols become absolute, its bad as they are not relocated if kernel is not loaded at the address it has been compiled for.o Ironically, just moving the symbols inside the section does not gurantee that symbols inside will not become absolute. Recent versions of linkers, do some optimization, and if section size is zero, it gets rid of the section and makes any defined symbol as absolute.
o This leads to a failure while second kernel is booting.
arch/i386/alternative.cfrees any pages present between__smp_alt_beginand__smp_alt_end. In my case size of section .smp_altinstructions is zero and symbol__smpt_alt_beginbecomes absolute and is not relocated and system crashes while it is trying to free the memory starting from__smp_alt_begin.o This issue is being fixed by the linker guys and they are making sure that linker does not get rid of an empty section if there is any section relative symbol defined in it. But we need to fix it at kernel level too so that people using the linker version without fix, are not affected.
Quoted 3 lines
o One of the possible solutions is that force the section size to be non zero to make sure these symbols don't become absolute. This patch implements that.
Would it be reasonable to omit this patch and require that the small number of people who want to build relocatable kernels install binutils 2.17.50.0.5 or later?
Re: [PATCH 3/12] i386: Force section size to be non-zero to prevent a symbol becoming absolute
Quoted 27 lines · Andrew Morton
Quoted 24 lines · On Tue, 3 Oct 2006 13:09:08 -0400 Vivek Goyal <[email protected]> wrote:
o Relocation patches for i386, moved the symbols in
vmlinux.lds.Sinside sections so that these symbols become section relative and are no more absolute. If these symbols become absolute, its bad as they are not relocated if kernel is not loaded at the address it has been compiled for.o Ironically, just moving the symbols inside the section does not gurantee that symbols inside will not become absolute. Recent versions of linkers, do some optimization, and if section size is zero, it gets rid of the section and makes any defined symbol as absolute.
o This leads to a failure while second kernel is booting.
arch/i386/alternative.cfrees any pages present between__smp_alt_beginand__smp_alt_end. In my case size of section .smp_altinstructions is zero and symbol__smpt_alt_beginbecomes absolute and is not relocated and system crashes while it is trying to free the memory starting from__smp_alt_begin.o This issue is being fixed by the linker guys and they are making sure that linker does not get rid of an empty section if there is any section relative symbol defined in it. But we need to fix it at kernel level too so that people using the linker version without fix, are not affected.
Quoted 7 lines
Quoted 3 lines
o One of the possible solutions is that force the section size to be non zero to make sure these symbols don't become absolute. This patch implements that.
Would it be reasonable to omit this patch and require that the small number of people who want to build relocatable kernels install binutils 2.17.50.0.5 or later?
I think that's a reasonable thing to do for now.
Thanks
Vivek
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
In reply to Eric W. BiedermanQuoted 24 lines · Eric W. Biederman
Quoted 8 lines · Vivek Goyal
Increasingly the cobbled together boot protocol that is bzImage does not have the flexibility to deal with booting in new situations.
Now that we no longer support the bootsector loader we have 512 bytes at the very start of a bzImage that we can use for other things.
Quoted 8 lines
Placing an ELF header there allows us to retain a single binary for all of x86 while at the same time describing things that bzImage does not allow us to describe.
The existing bugger off code for warning if we attempt to boot from the bootsector is kept but the error message is made more terse so we have a little more room to play with.
Vivek for this first round can we please take out the ELF note processing. Now that vmlinux has ELF notes of interest to the bootloader we really should be getting the ELF notes from there.
Quoted 5 lines
So the generation of the ELF notes needs to move into the vmlinux and then we need to copy them to ELF header.
If we just remove the ELF note munging code from this patch that should be a good first step in getting the ELF notes correct.
Please find attached the patch. I have got rid the ELF note code from the patch.
Andrew, does this fix your boot issue with grub? What's the grub version you are using?
Thanks
Vivek
Increasingly the cobbled together boot protocol that is bzImage does not have the flexibility to deal with booting in new situations.
Now that we no longer support the bootsector loader we have 512 bytes at the very start of a bzImage that we can use for other things.
Placing an ELF header there allows us to retain a single binary for all of x86 while at the same time describing things that bzImage does not allow us to describe.
The existing bugger off code for warning if we attempt to boot from the bootsector is kept but the error message is made more terse so we have a little more room to play with.
---
arch/i386/boot/Makefile | 2 arch/i386/boot/bootsect.S | 56 ++++++++++- arch/i386/boot/tools/build.c | 214 ++++++++++++++++++++++++++++++++++++++----- 3 files changed, 244 insertions(+), 28 deletions(-)
arch/i386/boot/bootsect.S renamed from arch/i386/boot/bootsect.S~i386-boot-Add-an-ELF-header-to-bzImage +53 -3
@@ -13,6 +13,11 @@ * */ +#include <linux/version.h> +#include <linux/utsrelease.h> +#include <linux/compile.h> +#include <linux/elf.h> +#include <asm/page.h> #include <asm/boot.h> SETUPSECTS = 4 /* default nr of setup-sectors */
@@ -42,10 +47,55 @@ SWAP_DEV = 0 /* SWAP_DEV is now writte .global _start _start: +ehdr: + # e_ident is carefully crafted so if this is treated + # as an x86 bootsector you will execute through + # e_ident and then print the bugger off message. + # The 1 stores to bx+di is unfortunate it is + # unlikely to affect the ability to print + # a message and you aren't supposed to be booting a + # bzImage directly from a floppy anyway. + + # e_ident + .byte ELFMAG0, ELFMAG1, ELFMAG2, ELFMAG3 + .byte ELFCLASS32, ELFDATA2LSB, EV_CURRENT, ELFOSABI_STANDALONE + .byte 0xeb, 0x3d, 0, 0, 0, 0, 0, 0 +#ifndef CONFIG_RELOCATABLE + .word ET_EXEC # e_type +#else + .word ET_DYN # e_type +#endif + .word EM_386 # e_machine + .int 1 # e_version + .int LOAD_PHYSICAL_ADDR # e_entry + .int phdr - _start # e_phoff + .int 0 # e_shoff + .int 0 # e_flags + .word e_ehdr - ehdr # e_ehsize + .word e_phdr - phdr # e_phentsize + .word 1 # e_phnum + .word 40 # e_shentsize + .word 0 # e_shnum + .word 0 # e_shstrndx +e_ehdr: +.org 71 +normalize: # Normalize the start address jmpl $BOOTSEG, $start2 +.org 80 +phdr: + .int PT_LOAD # p_type + .int (SETUPSECTS+1)*512 # p_offset + .int LOAD_PHYSICAL_ADDR + __PAGE_OFFSET # p_vaddr + .int LOAD_PHYSICAL_ADDR # p_paddr + .int SYSSIZE*16 # p_filesz + .int 0 # p_memsz + .int PF_R | PF_W | PF_X # p_flags + .int CONFIG_PHYSICAL_ALIGN # p_align +e_phdr: + start2: movw %cs, %ax movw %ax, %ds
@@ -78,11 +128,11 @@ die: bugger_off_msg: - .ascii "Direct booting from floppy is no longer supported.\r\n" - .ascii "Please use a boot loader program instead.\r\n" + .ascii "Booting linux without a boot loader is no longer supported.\r\n" .ascii "\n" - .ascii "Remove disk and press any key to reboot . . .\r\n" + .ascii "Press any key to reboot . . .\r\n" .byte 0 +ebugger_off_msg: # Kernel attributes; used by setup
arch/i386/boot/Makefile renamed from arch/i386/boot/Makefile~i386-boot-Add-an-ELF-header-to-bzImage +1 -1
@@ -43,7 +43,7 @@ $(obj)/bzImage: BUILDFLAGS := -b quiet_cmd_image = BUILD $@ cmd_image = $(obj)/tools/build $(BUILDFLAGS) $(obj)/bootsect $(obj)/setup \ - $(obj)/vmlinux.bin $(ROOT_DEV) > $@ + $(obj)/vmlinux.bin $(ROOT_DEV) vmlinux > $@ $(obj)/zImage $(obj)/bzImage: $(obj)/bootsect $(obj)/setup \ $(obj)/vmlinux.bin $(obj)/tools/build FORCE
arch/i386/boot/tools/build.c renamed from arch/i386/boot/tools/build.c~i386-boot-Add-an-ELF-header-to-bzImage +190 -24
269 lines not on this page · raw message
_
Re: [PATCH 4/12] i386: define __pa_symbol()
In reply to Franck Bui-HuuQuoted 14 lines · Franck Bui-Huu
hi,
Sorry for the late feedback...
Quoted 6 lines · Vivek Goyal
On
x86_64we have to be careful with calculating the physical address of kernel symbols. Both because of compiler odditities and because the symbols live in a different range of the virtual address space.[snip]
Quoted 9 lines
Review
Quoted 4 lines
(quoted diff) +4
-0+#define __pa_symbol(x) \ + ({unsigned long v; \ + asm("" : "=r" (v) : "0" (x)); \ + __pa(v); })Why not simply reusing
RELOC_HIDElike this ?#define __pa_symbol(x) __pa(RELOC_HIDE(x,0))
Thanks. Above did not work and compiler gave following warning message upon using __pa_symbol(_text)
error: cast specified array type
Then I specifically typecasted x to unsigned long and it seems to be fine.
Regenerated patch is attached.
On x86_64 we have to be careful with calculating the physical address of kernel symbols. Both because of compiler odditities and because the symbols live in a different range of the virtual address space.
Having a defintition of __pa_symbol that works on both x86_64 and i386 simplifies writing code that works for both x86_64 and i386 that has these kinds of dependencies.
So this patch adds the trivial i386 __pa_symbol definition.
Added assembly magic similar to RELOC_HIDE as suggested by Andi Kleen. Just picked it up from x86_64.
---
include/asm-i386/page.h | 3 +++ 1 file changed, 3 insertions(+)
include/asm-i386/page.h renamed from include/asm-i386/page.h~i386-define-__pa_symbol +3 -0
@@ -124,6 +124,9 @@ extern int page_is_ram(unsigned long pag#define VMALLOC_RESERVE ((unsigned long)__VMALLOC_RESERVE)#define MAXMEM (-__PAGE_OFFSET-__VMALLOC_RESERVE)#define __pa (x) ((unsigned long)(x)-PAGE_OFFSET) +/* __pa_symbol should be used for C visible symbols. +This seems to be the official gcc blessed way to do such arithmetic. */ +#define __pa_symbol (x) __pa(RELOC_HIDE((unsigned long)x,0))#define __va (x) ((void *)((unsigned long)(x)+PAGE_OFFSET))#define pfn_to_kaddr (pfn) __va((pfn) << PAGE_SHIFT)#ifdef CONFIG_FLATMEM
_
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
In reply to H. Peter AnvinQuoted 22 lines · H. Peter Anvin
Quoted 9 lines · Vivek Goyal
Hi Andrew,
Right now I don't have access to my test machine. Tomorrow morning, very first thing I am going to try it out with your config file.
This patch just adds and ELF header to bzImage which is not even used by grub.
Oh yes, it will be. See below.
Quoted 1 line
So without this patch you are able to boot the kernel on your laptop?
Danger, Will Robinson. GRUB, Etherboot, and a whole bunch of other boot loaders will recognize an ELF binary and load it as such. They will typically load it as an executable (not a relocatable object) -- I doubt many of them check that appropriate part of the ELF header -- so unless your kernel can be safely loaded *AND RUN* in that mode this is not going to work.
Quoted 8 lines
The entrypoint is going to be a major headache, since the standard kernel is entered in real mode, whereas an ELF file will typically be entered in protected mode, quite possibly using the C calling convention to pass the command line as (argc, argv). God only knows how they're going to deal with an initrd.
It may very well be that the ELF magic number has to be obfuscated.
Eric/Peter,
How about just extending bzImage format to include some info in real mode kernel header. Say protocol version 2.05. I think if we just include two more fields, is kernel relocatable and equivalent of ELF memsz, then probably this information should be enough for kexec bzImage loader to load and run a relocatable kernel from a different address.
Thanks
Vivek
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
Quoted 9 lines · Vivek Goyal
Eric/Peter,
How about just extending bzImage format to include some info in real mode kernel header. Say protocol version 2.05. I think if we just include two more fields, is kernel relocatable and equivalent of ELF memsz, then probably this information should be enough for kexec bzImage loader to load and run a relocatable kernel from a different address.
What would be the exact semantics of the "equivalent of ELF memsz"? I have balked on that one in the past, because the proposed semantics were unsafe.
I suspect we need at least one more piece of data, which is the required alignment of a relocated kernel. Either which way, it seems clear that there is some re-engineering that needs to be done, and I think we need to better understand *why* the proposed patch failed.
Can this failure be reproduced in a simulator?
-hpa
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
Quoted 12 lines · H. Peter Anvin
Quoted 10 lines · Vivek Goyal
Eric/Peter,
How about just extending bzImage format to include some info in real mode kernel header. Say protocol version 2.05. I think if we just include two more fields, is kernel relocatable and equivalent of ELF memsz, then probably
this information should be enough for kexec bzImage loader to load and run a relocatable kernel from a different address.
Quoted 4 lines
What would be the exact semantics of the "equivalent of ELF memsz"? I have balked on that one in the past, because the proposed semantics were unsafe.
memsz will contain the memory required to load the kernel image. And probably should also include the memory used by kernel in initial boot up code which is unaccounted and unbounded.
Quoted 2 lines
I suspect we need at least one more piece of data, which is the required alignment of a relocated kernel.
Now with the introduction of config option CONFIG_PHYSICAL_ALIGN, it should be easy to get.
Quoted 5 lines
Either which way, it seems clear that
there is some re-engineering that needs to be done, and I think we need to better understand *why* the proposed patch failed.Can this failure be reproduced in a simulator?
I will try to reproduce in a simulator. May be qemu? Any suggestions?
Thanks
Vivek
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
Quoted 5 lines · Vivek Goyal
memsz will contain the memory required to load the kernel image. And probably should also include the memory used by kernel in initial boot up code which is unaccounted and unbounded.
Right, so that's a major project to produce.
One modification that would be highly desirable is to be able to put initrd/initramfs in highmem, since people keep adding options which break the highmem/lowmem boundary without consideration for the implications; the latest one being vmalloc=.
Quoted 4 lines
Quoted 1 line
I suspect we need at least one more piece of data, which is the required alignment of a relocated kernel.
Now with the introduction of config option
CONFIG_PHYSICAL_ALIGN, it should be easy to get.
Yes, that should be easy.
Quoted 6 lines
Quoted 4 lines
Either which way, it seems clear that
there is some re-engineering that needs to be done, and I think we need to better understand *why* the proposed patch failed.Can this failure be reproduced in a simulator?
I will try to reproduce in a simulator. May be qemu? Any suggestions?
I find Bochs easier to debug under, although it's substantially slower.
-hpa
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
Quoted 9 lines · H. Peter Anvin
Quoted 5 lines · Vivek Goyal
memsz will contain the memory required to load the kernel image. And probably should also include the memory used by kernel in initial boot up code which is unaccounted and unbounded.
Right, so that's a major project to produce.
Eric is already doing that in his patch. He goes through vmlinux headers to determine the memory to load the various segments and then also takes into account the memory required by bootmem bitmap (128K) and memory consumed by initial page tables (tools/build.c). We can audit the code more closely for anything missed and can also include some buffer amount to be safe.
The only flip side would be that if down the line somebody changes the initial bootup code, he shall have to also acccount it in tools/build.c. Having said that, its not frequent that initial bootup code changes.
Thanks
Vivek
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
Quoted 16 lines · Vivek Goyal
Quoted 7 lines · H. Peter Anvin
Quoted 4 lines · Vivek Goyal
memsz will contain the memory required to load the kernel image. And probably should also include the memory used by kernel in initial boot up code which is unaccounted and unbounded.
Right, so that's a major project to produce.
Eric is already doing that in his patch. He goes through vmlinux headers to determine the memory to load the various segments and then also takes into account the memory required by bootmem bitmap (128K) and memory consumed by initial page tables (
tools/build.c). We can audit the code more closely for anything missed and can also include some buffer amount to be safe.
Quoted 5 lines
The only flip side would be that if down the line somebody changes the initial bootup code, he shall have to also acccount it in
tools/build.c. Having said that, its not frequent that initial bootup code changes.
No, but it's going to be extremely hard to get this straight unless this is actually enforced. I suspect there needs to be a check and a message if this is violated.
-hpa
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
In reply to Vivek GoyalQuoted 6 lines · Vivek Goyal
Hi Eric,
Sure. I will get rid if ELF note generation for bzImage ELF header.
But would that stop bootloaders out there from treating kernel as an ELF executable?
No. The point of the notes is so that the bootloaders can look at the kernel and have a strong hint what the right thing todo is.
The reason for taking them out is that what needs to happen is that we need to put the notes into vmlinux and then copy the notes in
vmlinux into the bzImage. Taking the notes out just make way
for us to put them back in properly.
Quoted 4 lines
I have got a FC5 machine with grub version .97 and everything seems to work for me. So I am assuming that Andrew got a newer version of Grub which is trying to load ther kernel as an ELF executable and then running into the issues.
We need to figure out how to reproduce this.
Eric
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
In reply to Andrew MortonQuoted 16 lines · Andrew Morton
Quoted 4 lines · On Tue, 3 Oct 2006 13:25:11 -0400 Vivek Goyal <[email protected]> wrote:
Increasingly the cobbled together boot protocol that is bzImage does not have the flexibility to deal with booting in new situations.
Quoted 8 lines
Now that we no longer support the bootsector loader we have 512 bytes at the very start of a bzImage that we can use for other things.
Placing an ELF header there allows us to retain a single binary for all of x86 while at the same time describing things that bzImage does not allow us to describe.
Quoted 4 lines
Seems that the entire kernel effort is an ongoing plot to make my poor little Vaio stop working. This patch turns it into a black-screened rock as soon as it does grub -> linux. Stock-standard FC5 install, config at
http://userweb.kernel.org/~akpm/config-sony.txt.
Ugh. I just tested this with a grub 0.97-5 from what I assume is a standard FC5 install (I haven't touched it) and the kernel boots. I only have a 64bit user space on that machine so init doesn't start but I get the rest of the kernel messages.
There were several testers working at redhat so a pure redhat incompatibility would be a surprise.
I don't think the formula is a simple grub+bzImage == death.
There is something more subtle going on here.
I'm not certain where to start looking. Andrew it might help if we could get the dying binary just in case some weird compile or processing problem caused insanely unlikely things like the multiboot binary to show up in your grub install. I don't think that is it, but it should allow us to rule out that possibility.
Eric
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
Quoted 11 lines · Eric W. Biederman
Ugh. I just tested this with a grub 0.97-5 from what I assume is a standard FC5 install (I haven't touched it) and the kernel boots. I only have a 64bit user space on that machine so init doesn't start but I get the rest of the kernel messages.
There were several testers working at redhat so a pure redhat incompatibility would be a surprise.
I don't think the formula is a simple grub+bzImage == death.
Quoted 8 lines
There is something more subtle going on here.
I'm not certain where to start looking. Andrew it might help if we could get the dying binary just in case some weird compile or processing problem caused insanely unlikely things like the multiboot binary to show up in your grub install. I don't think that is it, but it should allow us to rule out that possibility.
I would try running it in a more memory-constrained environment.
-hpa
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
In reply to H. Peter AnvinQuoted 2 lines · H. Peter Anvin
Well, it doesn't help if what you end up with for some bootloader is a nonfunctioning kernel.
I agree. We need to look at what is happening closely. However just because we have some initial glitches doesn't mean we shouldn't give up.
With grub you can say:
kernel --type=biglinux /path/to/bzImage
As I read the code it won't necessarily force the type of kernel image grub will use but it will refuse to boot if it doesn't recognize the kernel as the type specified.
The code for grub is in stage2/boot.c:load_image(). It tries a few other formats before it tests for the linux magic number but it won't recognize an ELF format executable unless it is a mutliboot or a BSD executable.
Eric
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
Quoted 11 lines · Eric W. Biederman
Quoted 2 lines · H. Peter Anvin
Well, it doesn't help if what you end up with for some bootloader is a nonfunctioning kernel.
I agree. We need to look at what is happening closely. However just because we have some initial glitches doesn't mean we shouldn't give up.
With grub you can say:
kernel --type=biglinux /path/to/bzImage
Quoted 8 lines
As I read the code it won't necessarily force the type of kernel image
grub will use but it will refuse to boot if it doesn't recognize the kernel as the type specified.The code for grub is in stage2/boot.c:load_image(). It tries a few other formats before it tests for the linux magic number but it won't recognize an ELF format executable unless it is a mutliboot or a BSD executable.
This isn't just about Grub, though. There is probably about a dozen bootloaders in use on i386, if not more.
-hpa
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
In reply to Eric W. BiedermanQuoted 15 lines · On Wed, 04 Oct 2006 22:06:27 -0600 [email protected] (Eric W. Biederman)…
Quoted 4 lines
Seems that the entire kernel effort is an ongoing plot to make my poor little Vaio stop working. This patch turns it into a black-screened rock as soon as it does grub -> linux. Stock-standard FC5 install, config at
http://userweb.kernel.org/~akpm/config-sony.txt.Ugh. I just tested this with a grub 0.97-5 from what I assume is a standard FC5 install (I haven't touched it) and the kernel boots. I only have a 64bit user space on that machine so init doesn't start but I get the rest of the kernel messages.
There were several testers working at redhat so a pure redhat incompatibility would be a surprise.
I don't think the formula is a simple grub+bzImage == death.
Quoted 7 lines
There is something more subtle going on here.
I'm not certain where to start looking. Andrew it might help if we could get the dying binary just in case some weird compile or processing problem caused insanely unlikely things like the multiboot binary to show up in your grub install. I don't think that is it, but it should allow us to rule out that possibility.
I tested it with Vivek's fix (below) and it still dies immediately.
The grub record is
title new (2.6.19-rc1)
root (hd0,5)
kernel /boot/bzImage-2.6.19-rc1 ro root=LABEL=/ rhgb vga=0x263
initrd /boot/initrd-2.6.19-rc1.imgvarious binares are at http://userweb.kernel.org/~akpm/reloc/
arch/i386/boot/bootsect.S | 42 +----------------------------------- 1 files changed, 2 insertions(+), 40 deletions(-)
arch/i386/boot/bootsect.S renamed from arch/i386/boot/bootsect.S~i386-boot-add-an-elf-header-to-bzimage-fix +2 -40
@@ -17,7 +17,6 @@ #include <linux/utsrelease.h> #include <linux/compile.h> #include <linux/elf.h> -#include <linux/elf_boot.h> #include <asm/page.h> #include <asm/boot.h>
@@ -73,8 +72,8 @@ ehdr: .int 0 # e_shoff .int 0 # e_flags .word e_ehdr - ehdr # e_ehsize - .word e_phdr1 - phdr # e_phentsize - .word (e_phdr - phdr)/(e_phdr1 - phdr) # e_phnum + .word e_phdr - phdr # e_phentsize + .word 1 # e_phnum .word 40 # e_shentsize .word 0 # e_shnum .word 0 # e_shstrndx
@@ -95,45 +94,8 @@ phdr: .int 0 # p_memsz .int PF_R | PF_W | PF_X # p_flags .int CONFIG_PHYSICAL_ALIGN # p_align -e_phdr1: - - .int PT_NOTE # p_type - .int b_note - _start # p_offset - .int 0 # p_vaddr - .int 0 # p_paddr - .int e_note - b_note # p_filesz - .int 0 # p_memsz - .int 0 # p_flags - .int 0 # p_align e_phdr: -.macro note name, type - .balign 4 - .int 2f - 1f # n_namesz - .int 4f - 3f # n_descsz - .int \type # n_type - .balign 4 -1: .asciz "\name" -2: .balign 4 -3: -.endm -.macro enote -4: .balign 4 -.endm - - .balign 4 -b_note: - note ELF_NOTE_BOOT, EIN_PROGRAM_NAME - .asciz "Linux" - enote - note ELF_NOTE_BOOT, EIN_PROGRAM_VERSION - .asciz UTS_RELEASE - enote - note ELF_NOTE_BOOT, EIN_ARGUMENT_STYLE - .asciz "Linux" - enote -e_note: - start2: movw %cs, %ax movw %ax, %ds
_
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
Quoted 10 lines · Andrew Morton
I tested it with Vivek's fix (below) and it still dies immediately.
The grub record is
title new (2.6.19-rc1)
root (hd0,5) kernel /boot/bzImage-2.6.19-rc1 ro root=LABEL=/ rhgb vga=0x263 initrd /boot/initrd-2.6.19-rc1.imgvarious binares are at http://userweb.kernel.org/~akpm/reloc/
Thanks.
The fix was actually to remove a conflict with the other ELF notes we are starting to generate (in the Xen context) so we can get our act together that way. I had no reason to suspect it would have had any connection with your boot failure.
I examined your bzImage and it does not have a multiboot signature, in the first 8k.
I pointed my grub at your bzImage and it booted as far as searching for init. The only differences were I don't have video mode 0x263 so when prompted for something supported I told it to use video mode 0 instead. My boot partition is (hd0,0) and is just boot, so I changed the grub configuration to:
title Andrew
root (hd0,0)
kernel /bzImage-2.6.19-rc1 ro root=LABEL=/ rhgb vga=0x263
initrd /initrd-2.6.19-rc1.imgSo it feels like a subtle interaction with your hardware, or firmware. Do things work better if you don't specify a vga=xxx mode?
This is a weird problem.
Eric
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
In reply to Vivek GoyalVivek Goyal <[email protected]> writes:
Ok. I just noticed another piece that we want to change for greater compatibility. We should make the virtual and the physical addresses the same. Then there is no danger of some loader getting them mixed up.
I.e. Not:
arch/i386/boot/bootsect.S SWAP_DEV = 0 /* SWAP_DEV is now writte · line 98
Quoted 12 lines
+.org 80
arch/i386/boot/bootsect.S renamed from arch/i386/boot/bootsect.S~i386-boot-Add-an-ELF-header-to-bzImage +11
-0+phdr: + .int PT_LOAD # p_type + .int (SETUPSECTS+1)*512 # p_offset + .int LOAD_PHYSICAL_ADDR + __PAGE_OFFSET # p_vaddr + .int LOAD_PHYSICAL_ADDR # p_paddr + .int SYSSIZE*16 # p_filesz + .int 0 # p_memsz + .int PF_R | PF_W | PF_X # p_flags + .int CONFIG_PHYSICAL_ALIGN # p_align +e_phdr: +
but
arch/i386/boot/bootsect.S die:
Quoted 16 lines
+.org 80
arch/i386/boot/bootsect.S renamed from arch/i386/boot/bootsect.S~i386-boot-Add-an-ELF-header-to-bzImage +11
-0+phdr: + .int PT_LOAD # p_type + .int (SETUPSECTS+1)*512 # p_offset + .int LOAD_PHYSICAL_ADDR # p_vaddr + .int LOAD_PHYSICAL_ADDR # p_paddr + .int SYSSIZE*16 # p_filesz + .int 0 # p_memsz + .int PF_R | PF_W | PF_X # p_flags + .int CONFIG_PHYSICAL_ALIGN # p_align +e_phdr: + start2: movw %cs, %ax movw %ax, %ds@@ -78,11 +128,11 @@ die:
Eric
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
In reply to Eric W. BiedermanQuoted 1 line · On Thu, 05 Oct 2006 00:13:12 -0600 [email protected] (Eric W. Biederman)…
Do things work better if you don't specify a vga=xxx mode?
yes, without vga=0x263 it boots.
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
Quoted 6 lines · Andrew Morton
Quoted 1 line · On Thu, 05 Oct 2006 00:13:12 -0600 [email protected] (Eric W. Biederman)…
Do things work better if you don't specify a vga=xxx mode?
yes, without vga=0x263 it boots.
Ok. It will take some digging but I suspect the problem is that video.S is using a table or a variable placed over the original boot sector, and expecting it to be zero initialized.
Finding that in the pile of 2000 lines of assembly could take a little while.
Now at least we have something other people can try and reproduce this problem with.
Eric
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
In reply to Andrew MortonQuoted 6 lines · Andrew Morton
Quoted 1 line · On Thu, 05 Oct 2006 00:13:12 -0600 [email protected] (Eric W. Biederman)…
Do things work better if you don't specify a vga=xxx mode?
yes, without vga=0x263 it boots.
vga= actually patches a specific offset in the boot sector. We don't actually have 512 bytes, we have some 500-ish bytes plus a small patch area at the end.
-hpa
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
In reply to Andrew MortonIn the lazy programmer school of fixes.
I haven't really tested this in any configuration. But reading video.S it does use variable in the bootsector. It does seem to initialize the variables before use. But obviously something is missed.
By zeroing the uninteresting parts of the bootsector just after we have determined we are loaded ok. We should ensure we are always in a known state the entire time.
Andrew if I am right about the cause of your video not working when you set an enhanced video mode this should fix your boot problem.
arch/i386/boot/setup.S +7 -0
@@ -287,6 +287,13 @@ # Check if an old loader tries to load a loader_panic_mess: .string "Wrong loader, giving up..." loader_ok: +# Zero initialize the variables we keep in the bootsector + xorw %di, %di + xorb %al, %al + movw $497, %cx + rep + stosb + # Get memory size (extended mem, kB) xorl %eax, %eax
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
In reply to H. Peter AnvinQuoted 11 lines · H. Peter Anvin
Quoted 5 lines · Andrew Morton
Quoted 1 line · On Thu, 05 Oct 2006 00:13:12 -0600 [email protected] (Eric W. Biederman)…
Do things work better if you don't specify a vga=xxx mode?
yes, without vga=0x263 it boots.
vga= actually patches a specific offset in the boot sector. We don't actually have 512 bytes, we have some 500-ish bytes plus a small patch area at the end.
From
video.S
It uses offset 0 in the boot sector. We have 497 bytes that can be used, before we call setup.S after that setup.S considers the entire bootsector it's own.
/* Positions of various video parameters passed to the kernel */ /* (see also include/linux/tty.h) */
#define PARAM_CURSOR_POS 0x00
#define PARAM_VIDEO_PAGE 0x04
#define PARAM_VIDEO_MODE 0x06
#define PARAM_VIDEO_COLS 0x07
#define PARAM_VIDEO_EGA_BX 0x0a
#define PARAM_VIDEO_LINES 0x0e
#define PARAM_HAVE_VGA 0x0f
#define PARAM_FONT_POINTS 0x10
#define PARAM_LFB_WIDTH 0x12
#define PARAM_LFB_HEIGHT 0x14
#define PARAM_LFB_DEPTH 0x16
#define PARAM_LFB_BASE 0x18
#define PARAM_LFB_SIZE 0x1c
#define PARAM_LFB_LINELENGTH 0x24
#define PARAM_LFB_COLORS 0x26
#define PARAM_VESAPM_SEG 0x2e
#define PARAM_VESAPM_OFF 0x30
#define PARAM_LFB_PAGES 0x32
#define PARAM_VESA_ATTRIB 0x34
#define PARAM_CAPABILITIES 0x36
Eric
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
In reply to Eric W. BiedermanQuoted 7 lines · Eric W. Biederman
In the lazy programmer school of fixes.
I haven't really tested this in any configuration. But reading
video.Sit does use variable in the bootsector. It does seem to initialize the variables before use. But obviously something is missed.
Quoted 8 lines
By zeroing the uninteresting parts of the bootsector just after we have determined we are loaded ok. We should ensure we are always in a known state the entire time.
Andrew if I am right about the cause of your video not working when you set an enhanced video mode this should fix your boot problem.
I just noticed we're using string instructions in setup.S, without forcing DF = 0 anywhere. There should be a "cld" near the top.
-hpa
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
In reply to Eric W. BiedermanQuoted 7 lines · Eric W. Biederman
Vivek Goyal <[email protected]> writes:
Ok. I just noticed another piece that we want to change for greater compatibility. We should make the virtual and the physical addresses the same. Then there is no danger of some loader getting them mixed up.
Ok. I changed virtual address to LOAD_PHYSICAL_ADDR. Please find attached the regenrated patch.
Increasingly the cobbled together boot protocol that is bzImage does not have the flexibility to deal with booting in new situations.
Now that we no longer support the bootsector loader we have 512 bytes at the very start of a bzImage that we can use for other things.
Placing an ELF header there allows us to retain a single binary for all of x86 while at the same time describing things that bzImage does not allow us to describe.
The existing bugger off code for warning if we attempt to boot from the bootsector is kept but the error message is made more terse so we have a little more room to play with.
---
arch/i386/boot/Makefile | 2 arch/i386/boot/bootsect.S | 56 ++++++++++- arch/i386/boot/tools/build.c | 214 ++++++++++++++++++++++++++++++++++++++----- 3 files changed, 244 insertions(+), 28 deletions(-)
arch/i386/boot/bootsect.S renamed from arch/i386/boot/bootsect.S~i386-boot-Add-an-ELF-header-to-bzImage +53 -3
@@ -13,6 +13,11 @@ * */ +#include <linux/version.h> +#include <linux/utsrelease.h> +#include <linux/compile.h> +#include <linux/elf.h> +#include <asm/page.h> #include <asm/boot.h> SETUPSECTS = 4 /* default nr of setup-sectors */
@@ -42,10 +47,55 @@ SWAP_DEV = 0 /* SWAP_DEV is now writte .global _start _start: +ehdr: + # e_ident is carefully crafted so if this is treated + # as an x86 bootsector you will execute through + # e_ident and then print the bugger off message. + # The 1 stores to bx+di is unfortunate it is + # unlikely to affect the ability to print + # a message and you aren't supposed to be booting a + # bzImage directly from a floppy anyway. + + # e_ident + .byte ELFMAG0, ELFMAG1, ELFMAG2, ELFMAG3 + .byte ELFCLASS32, ELFDATA2LSB, EV_CURRENT, ELFOSABI_STANDALONE + .byte 0xeb, 0x3d, 0, 0, 0, 0, 0, 0 +#ifndef CONFIG_RELOCATABLE + .word ET_EXEC # e_type +#else + .word ET_DYN # e_type +#endif + .word EM_386 # e_machine + .int 1 # e_version + .int LOAD_PHYSICAL_ADDR # e_entry + .int phdr - _start # e_phoff + .int 0 # e_shoff + .int 0 # e_flags + .word e_ehdr - ehdr # e_ehsize + .word e_phdr - phdr # e_phentsize + .word 1 # e_phnum + .word 40 # e_shentsize + .word 0 # e_shnum + .word 0 # e_shstrndx +e_ehdr: +.org 71 +normalize: # Normalize the start address jmpl $BOOTSEG, $start2 +.org 80 +phdr: + .int PT_LOAD # p_type + .int (SETUPSECTS+1)*512 # p_offset + .int LOAD_PHYSICAL_ADDR # p_vaddr + .int LOAD_PHYSICAL_ADDR # p_paddr + .int SYSSIZE*16 # p_filesz + .int 0 # p_memsz + .int PF_R | PF_W | PF_X # p_flags + .int CONFIG_PHYSICAL_ALIGN # p_align +e_phdr: + start2: movw %cs, %ax movw %ax, %ds
@@ -78,11 +128,11 @@ die: bugger_off_msg: - .ascii "Direct booting from floppy is no longer supported.\r\n" - .ascii "Please use a boot loader program instead.\r\n" + .ascii "Booting linux without a boot loader is no longer supported.\r\n" .ascii "\n" - .ascii "Remove disk and press any key to reboot . . .\r\n" + .ascii "Press any key to reboot . . .\r\n" .byte 0 +ebugger_off_msg: # Kernel attributes; used by setup
arch/i386/boot/Makefile renamed from arch/i386/boot/Makefile~i386-boot-Add-an-ELF-header-to-bzImage +1 -1
@@ -43,7 +43,7 @@ $(obj)/bzImage: BUILDFLAGS := -b quiet_cmd_image = BUILD $@ cmd_image = $(obj)/tools/build $(BUILDFLAGS) $(obj)/bootsect $(obj)/setup \ - $(obj)/vmlinux.bin $(ROOT_DEV) > $@ + $(obj)/vmlinux.bin $(ROOT_DEV) vmlinux > $@ $(obj)/zImage $(obj)/bzImage: $(obj)/bootsect $(obj)/setup \ $(obj)/vmlinux.bin $(obj)/tools/build FORCE
arch/i386/boot/tools/build.c renamed from arch/i386/boot/tools/build.c~i386-boot-Add-an-ELF-header-to-bzImage +190 -24
269 lines not on this page · raw message
_
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
In reply to Eric W. BiedermanQuoted 13 lines · Eric W. Biederman
Quoted 6 lines · Andrew Morton
Quoted 1 line · On Thu, 05 Oct 2006 00:13:12 -0600 [email protected] (Eric W. Biederman)…
Do things work better if you don't specify a vga=xxx mode?
yes, without vga=0x263 it boots.
Ok. It will take some digging but I suspect the problem is that
video.Sis using a table or a variable placed over the original boot sector, and expecting it to be zero initialized.
Quoted 6 lines
Finding that in the pile of 2000 lines of assembly could take a little while.
Now at least we have something other people can try and reproduce this problem with.
I have tried it on three machines with various combinations of vga= but no luck. Can't reproduce the problem at all. :-(
Vivek
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
In reply to Eric W. BiedermanQuoted 26 lines · On Thu, 05 Oct 2006 09:29:42 -0600 [email protected] (Eric W. Biederman)…
In the lazy programmer school of fixes.
I haven't really tested this in any configuration. But reading
video.Sit does use variable in the bootsector. It does seem to initialize the variables before use. But obviously something is missed.By zeroing the uninteresting parts of the bootsector just after we have determined we are loaded ok. We should ensure we are always in a known state the entire time.
Andrew if I am right about the cause of your video not working when you set an enhanced video mode this should fix your boot problem.
Singed-off-by Eric Biederman <[email protected]>arch/i386/boot/setup.S +0
-0@@ -287,6 +287,13 @@ # Check if an old loader tries to load a loader_panic_mess: .string "Wrong loader, giving up..." loader_ok:
arch/i386/boot/setup.S # Check if an old loader tries to load a · line 299
Quoted 10 lines
arch/i386/boot/setup.S +7
-0+# Zero initialize the variables we keep in the bootsector + xorw %di, %di + xorb %al, %al + movw $497, %cx + rep + stosb + # Get memory size (extended mem, kB) xorl %eax, %eax
That fixed the vga=0x263 crash.
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
Quoted 38 lines · Andrew Morton
Quoted 35 lines · On Thu, 05 Oct 2006 09:29:42 -0600 [email protected] (Eric W. Biederman)…
In the lazy programmer school of fixes.
I haven't really tested this in any configuration. But reading
video.Sit does use variable in the bootsector. It does seem to initialize the variables before use. But obviously something is missed.By zeroing the uninteresting parts of the bootsector just after we have determined we are loaded ok. We should ensure we are always in a known state the entire time.
Andrew if I am right about the cause of your video not working when you set an enhanced video mode this should fix your boot problem.
Singed-off-by Eric Biederman <[email protected]>arch/i386/boot/setup.S +7
-0@@ -287,6 +287,13 @@ # Check if an old loader tries to load a loader_panic_mess: .string "Wrong loader, giving up..." loader_ok: +# Zero initialize the variables we keep in the bootsector + xorw %di, %di + xorb %al, %al + movw $497, %cx + rep + stosb + # Get memory size (extended mem, kB)
Quoted 3 lines
arch/i386/boot/setup.S # Check if an old loader tries to load a · line 299
Quoted 1 line
arch/i386/boot/setup.S +0
-0xorl %eax, %eaxThat fixed the vga=0x263 crash.
Good. We still have to be paranoid and address HPA's missing cld issues, But otherwise it looks like we are in good shape.
Eric
Re: [PATCH 4/12] i386: define __pa_symbol()
In reply to Vivek Goyalinclude/asm-i386/page.h extern int page_is_ram(unsigned long pag · line 129
Quoted 3 lines · Vivek Goyal
include/asm-i386/page.h renamed from include/asm-i386/page.h~i386-define-__pa_symbol +3
-0+/* __pa_symbol should be used for C visible symbols. +This seems to be the official gcc blessed way to do such arithmetic. */ +#define __pa_symbol (x) __pa(RELOC_HIDE((unsigned long)x,0))
#define __pa_symbol(x) __pa(RELOC_HIDE((unsigned long)(x),0))
^^^... should be better. You should not rely on RELOC_HIDE implementation.
Franck
Re: [PATCH 4/12] i386: define __pa_symbol()
Quoted 10 lines · Franck Bui-Huu
Review
Quoted 3 lines · Vivek Goyal
(quoted diff) +3
-0+/* __pa_symbol should be used for C visible symbols. + This seems to be the official gcc blessed way to do such arithmetic. */ +#define __pa_symbol(x) __pa(RELOC_HIDE((unsigned long)x,0))#define __pa_symbol(x) __pa(RELOC_HIDE((unsigned long)(x),0)) ^^^... should be better. You should not rely on
RELOC_HIDEimplementation.
Thanks Franck. Done.
On x86_64 we have to be careful with calculating the physical address of kernel symbols. Both because of compiler odditities and because the symbols live in a different range of the virtual address space.
Having a defintition of __pa_symbol that works on both x86_64 and i386 simplifies writing code that works for both x86_64 and i386 that has these kinds of dependencies.
So this patch adds the trivial i386 __pa_symbol definition.
Added assembly magic similar to RELOC_HIDE as suggested by Andi Kleen. Just picked it up from x86_64.
---
include/asm-i386/page.h | 3 +++ 1 file changed, 3 insertions(+)
include/asm-i386/page.h renamed from include/asm-i386/page.h~i386-define-__pa_symbol +3 -0
@@ -124,6 +124,9 @@ extern int page_is_ram(unsigned long pag#define VMALLOC_RESERVE ((unsigned long)__VMALLOC_RESERVE)#define MAXMEM (-__PAGE_OFFSET-__VMALLOC_RESERVE)#define __pa (x) ((unsigned long)(x)-PAGE_OFFSET) +/* __pa_symbol should be used for C visible symbols. +This seems to be the official gcc blessed way to do such arithmetic. */ +#define __pa_symbol (x) __pa(RELOC_HIDE((unsigned long)(x),0))#define __va (x) ((void *)((unsigned long)(x)+PAGE_OFFSET))#define pfn_to_kaddr (pfn) __va((pfn) << PAGE_SHIFT)#ifdef CONFIG_FLATMEM
_
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
In reply to Eric W. BiedermanQuoted 40 lines · Eric W. Biederman
Quoted 38 lines · Andrew Morton
Quoted 35 lines · On Thu, 05 Oct 2006 09:29:42 -0600 [email protected] (Eric W. Biederman)…
In the lazy programmer school of fixes.
I haven't really tested this in any configuration. But reading
video.Sit does use variable in the bootsector. It does seem to initialize the variables before use. But obviously something is missed.By zeroing the uninteresting parts of the bootsector just after we have determined we are loaded ok. We should ensure we are always in a known state the entire time.
Andrew if I am right about the cause of your video not working when you set an enhanced video mode this should fix your boot problem.
Singed-off-by Eric Biederman <[email protected]>arch/i386/boot/setup.S +7
-0@@ -287,6 +287,13 @@ # Check if an old loader tries to load a loader_panic_mess: .string "Wrong loader, giving up..." loader_ok: +# Zero initialize the variables we keep in the bootsector + xorw %di, %di + xorb %al, %al + movw $497, %cx + rep + stosb + # Get memory size (extended mem, kB)
Quoted 7 lines
Quoted 3 lines
arch/i386/boot/setup.S # Check if an old loader tries to load a · line 299
Quoted 1 line
arch/i386/boot/setup.S +0
-0xorl %eax, %eaxThat fixed the vga=0x263 crash.
Good. We still have to be paranoid and address HPA's missing cld issues, But otherwise it looks like we are in good shape.
Hi Eric,
I have added cld in the regenerated patch below.
Also one more minor nit. stosb relies on being %es set properly. By the time control reaches loader_ok, i could not find %es being set explicitly hence I am assuming we are relying on bootloader to set it up for us.
Maybe we can be little more paranoid and setup the %es before stosb. I have done this change too in the attached patch. Pleaese have a look. I know little about assembly code.
In the lazy programmer school of fixes.
I haven't really tested this in any configuration. But reading video.S it does use variable in the bootsector. It does seem to initialize the variables before use. But obviously something is missed.
By zeroing the uninteresting parts of the bootsector just after we have determined we are loaded ok. We should ensure we are always in a known state the entire time.
Andrew if I am right about the cause of your video not working when you set an enhanced video mode this should fix your boot problem.
---
arch/i386/boot/setup.S | 11 +++++++++++ 1 file changed, 11 insertions(+)
arch/i386/boot/setup.S renamed from arch/i386/boot/setup.S~i386-set-bootset-to-zero-fix +11 -0
@@ -287,6 +287,17 @@ good_sig: loader_panic_mess: .string "Wrong loader, giving up..." loader_ok: +# Zero initialize the variables we keep in the bootsector + movw %cs, %ax # aka SETUPSEG + subw $DELTA_INITSEG, %ax # aka INITSEG + movw %ax, %es + xorw %di, %di + xorb %al, %al + movw $497, %cx + cld + rep + stosb + # Get memory size (extended mem, kB) xorl %eax, %eax
_
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
Quoted 5 lines · Vivek Goyal
Quoted 1 line
Hi Eric,
I have added cld in the regenerated patch below.
No, the cld needs to be earlier. It turns out this isn't the first use of string instructions.
I think I am going to add DF=0 as a documented entry condition; it definitely seems all current Linux kernels require it.
Quoted 7 lines
Also one more minor nit. stosb relies on being %es set properly. By the time control reaches
loader_ok, i could not find %es being set explicitly hence I am assuming we are relying on bootloader to set it up for us.Maybe we can be little more paranoid and setup the %es before stosb. I have done this change too in the attached patch. Pleaese have a look. I know little about assembly code.
%es being set is part of the requirements list, although it *would* be better to not rely on any segment registers being set at all (only rely on %cs.)
-hpa
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
In reply to Vivek GoyalQuoted 7 lines · Vivek Goyal
Hi Eric,
I have added cld in the regenerated patch below.
Also one more minor nit. stosb relies on being %es set properly. By the time control reaches
loader_ok, i could not find %es being set explicitly hence I am assuming we are relying on bootloader to set it up for us.
No my bad. I was thinking it was %ds, like everything else.
Quoted 3 lines
Maybe we can be little more paranoid and setup the %es before stosb. I have done this change too in the attached patch. Pleaese have a look. I know little about assembly code.
Looks good to me.
Quoted 48 lines
In the lazy programmer school of fixes.
I haven't really tested this in any configuration. But reading
video.Sit does use variable in the bootsector. It does seem to initialize the variables before use. But obviously something is missed.By zeroing the uninteresting parts of the bootsector just after we have determined we are loaded ok. We should ensure we are always in a known state the entire time.
Andrew if I am right about the cause of your video not working when you set an enhanced video mode this should fix your boot problem.
Singed-off-by Eric Biederman <[email protected]>Signed-off-by Vivek Goyal <[email protected]>---
arch/i386/boot/setup.S | 11 +++++++++++ 1 file changed, 11 insertions(+)diff -puN
arch/i386/boot/setup.S~i386-set-bootset-to-zero-fixarch/i386/boot/setup.S
--- linux-2.6.18-git17/arch/i386/boot/setup.S~i386-set-bootset-to-zero-fix2006-10-06 12:42:19.000000000 -0400+++
linux-2.6.18-git17-root/arch/i386/boot/setup.S2006-10-06 12:49:37.000000000 -0400arch/i386/boot/setup.S renamed from arch/i386/boot/setup.S~i386-set-bootset-to-zero-fix +11
-0@@ -287,6 +287,17 @@ good_sig: loader_panic_mess: .string "Wrong loader, giving up..." loader_ok: +# Zero initialize the variables we keep in the bootsector + movw %cs, %ax # aka SETUPSEG + subw $DELTA_INITSEG, %ax # aka INITSEG + movw %ax, %es + xorw %di, %di + xorb %al, %al + movw $497, %cx + cld + rep + stosb + # Get memory size (extended mem, kB) xorl %eax, %eax_
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
In reply to H. Peter AnvinQuoted 7 lines · H. Peter Anvin
Quoted 3 lines · Vivek Goyal
Quoted 1 line
Hi Eric,
I have added cld in the regenerated patch below.No, the cld needs to be earlier. It turns out this isn't the first use of string instructions.
Can we rely on the int calls not setting df? Otherwise we need to clear df at each use as we do with all of the later uses.
Quoted 10 lines
I think I am going to add DF=0 as a documented entry condition; it definitely seems all current Linux kernels require it.
Quoted 6 lines
Also one more minor nit. stosb relies on being %es set properly. By the time control reaches
loader_ok, i could not find %es being set explicitly hence I am assuming we are relying on bootloader to set it up for us. Maybe we can be little more paranoid and setup the %es before stosb. I have done this change too in the attached patch. Pleaese have a look. I know little about assembly code.
Quoted 2 lines
%es being set is part of the requirements list, although it *would* be better to not rely on any segment registers being set at all (only rely on %cs.)
Agreed.
Eric
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
Quoted 11 lines · Eric W. Biederman
Quoted 5 lines · H. Peter Anvin
Quoted 2 lines · Vivek Goyal
Hi Eric,
I have added cld in the regenerated patch below.No, the cld needs to be earlier. It turns out this isn't the first use of string instructions.
Can we rely on the int calls not setting df? Otherwise we need to clear df at each use as we do with all of the later uses.
Yes, we can, with a few exceptions. INT saves the flags and IRET restores them.
-hpa
Re: [PATCH 1/12] i386: Distinguish absolute symbols
In reply to Vivek GoyalQuoted 24 lines · On Tue, 3 Oct 2006 13:04:13 -0400 Vivek Goyal <[email protected]> wrote:
Ld knows about 2 kinds of symbols, absolute and section relative. Section relative symbols symbols change value when a section is moved and absolute symbols do not.
Currently in the linker script we have several labels marking the beginning and ending of sections that are outside of sections, making them absolute symbols. Having a mixture of absolute and section relative symbols refereing to the same data is currently harmless but it is confusing.
This must be done carefully as newer revs of ld do not place symbols that appear in sections without data and instead ld makes those symbols global :(
My ultimate goal is to build a relocatable kernel. The safest and least intrusive technique is to generate relocation entries so the kernel can be relocated at load time. The only penalty would be an increase in the size of the kernel binary. The problem is that if absolute and relocatable symbols are not properly specified absolute symbols will be relocated or section relative symbols won't be, which is fatal.
Quoted 5 lines
The practical motivation is that when generating kernels that will run from a reserved area for analyzing what caused a kernel panic, it is simpler if you don't need to hard code the physical memory location they will run at, especially for the distributions.
This patch causes the following warnings:
/opt/crosstool/gcc-4.1.0-glibc-2.3.6/i686-unknown-linux-gnu/bin/i686-unknown-linux-gnu-ld: .tmp_vmlinux1: warning: allocated section .smp_altinstr_replacement' not in segment /opt/crosstool/gcc-4.1.0-glibc-2.3.6/i686-unknown-linux-gnu/bin/i686-unknown-linux-gnu-ld: .tmp_vmlinux2: warning: allocated section .smp_altinstr_replacement' not in segment /opt/crosstool/gcc-4.1.0-glibc-2.3.6/i686-unknown-linux-gnu/bin/i686-unknown-linux-gnu-ld: vmlinux: warning: allocated section `.smp_altinstr_replacement' not in segment
The patch i386-force-section-size-to-be-non-zero-to-prevent-a-symbol-becoming-absolute.patch makes those warnings go away again, but we decided to drop that.
This:
.smp_altinstr_replacement : AT(ADDR(.smp_altinstr_replacement) - LOAD_OFFSET) {
*(.smp_altinstr_replacement)
. = ALIGN(4096);
__smp_alt_end = .;}
looks odd. What's the point in putting a gap before __smp_alt_end? Moving __smp_alt_end to before the ALIGN doesn't prevent the warning.
GNU ld version 2.16.1, gcc-4.1.0, config at
http://userweb.kernel.org/~akpm/config-vmm.txt
Re: [PATCH 1/12] i386: Distinguish absolute symbols
Quoted 45 lines · Andrew Morton
Quoted 24 lines · On Tue, 3 Oct 2006 13:04:13 -0400 Vivek Goyal <[email protected]> wrote:
Ld knows about 2 kinds of symbols, absolute and section relative. Section relative symbols symbols change value when a section is moved and absolute symbols do not.
Currently in the linker script we have several labels marking the beginning and ending of sections that are outside of sections, making them absolute symbols. Having a mixture of absolute and section relative symbols refereing to the same data is currently harmless but it is confusing.
This must be done carefully as newer revs of ld do not place symbols that appear in sections without data and instead ld makes those symbols global :(
My ultimate goal is to build a relocatable kernel. The safest and least intrusive technique is to generate relocation entries so the kernel can be relocated at load time. The only penalty would be an increase in the size of the kernel binary. The problem is that if absolute and relocatable symbols are not properly specified absolute symbols will be relocated or section relative symbols won't be, which is fatal.
Quoted 5 lines
The practical motivation is that when generating kernels that will run from a reserved area for analyzing what caused a kernel panic, it is simpler if you don't need to hard code the physical memory location they will run at, especially for the distributions.
This patch causes the following warnings:
/opt/crosstool/gcc-4.1.0-glibc-2.3.6/i686-unknown-linux-gnu/bin/i686-unknown-linux-gnu-ld: .tmp_vmlinux1: warning: allocated section.smp_altinstr_replacement' not in segment /opt/crosstool/gcc-4.1.0-glibc-2.3.6/i686-unknown-linux-gnu/bin/i686-unknown-linux-gnu-ld: .tmp_vmlinux2: warning: allocated section.smp_altinstr_replacement' not in segment/opt/crosstool/gcc-4.1.0-glibc-2.3.6/i686-unknown-linux-gnu/bin/i686-unknown-linux-gnu-ld: vmlinux: warning: allocated section `.smp_altinstr_replacement' not in segmentThe patch i386-force-section-size-to-be-non-zero-to-prevent-a-symbol-becoming-absolute.patch makes those warnings go away again, but we decided to drop that.
This:
Quoted 9 lines
.smp_altinstr_replacement : AT(ADDR(.smp_altinstr_replacement) - LOAD_OFFSET) { *(.smp_altinstr_replacement) . = ALIGN(4096); __smp_alt_end = .;}
looks odd. What's the point in putting a gap before
__smp_alt_end? Moving__smp_alt_endto before the ALIGN doesn't prevent the warning.
Actually this ALIGN(4096) was already present present before symbol __smp_alt_end that's why we kept it even when we moved __smp_alt_end inside the section.
But now thinking about it, it looks like this ALIGN(4096) might not be required. There is already one ALIGN(4086) present after this section which should take care of protecting other data while this page is freed.
Please find attached a patch for the same. I am also copying Gerd Hoffmann, who introduced this ALIGN. Gerd, can you please confirm that above ALIGN() is not required and the patch attached should be fine.
As a side effect, above warning also disappears. Looks like there is no data in the section .smp_altinstr_replacement but above ALIGN() forced the linker to create a non-empty allocatable section. The type of the section is NOBITS and probably that's why linker is emitting the warning. I will write a separate mail to linker folks to find more about it.
Thanks
Vivek
o There seems to be one extra ALIGN(4096) before symbol __smp_alt_end. The only usage of __smp_alt_end is to mark the end of smp alternative sections so that this memory can be freed. As a physical page is freed one has to just make sure that there is no other data on the same page where __smp_alt_end is pointing. There is already a ALIGN(4096) after this section which should take care of the above issue. Hence it looks like the ALIGN(4096) before __smp_alt_end is redundant and not required.
---
linux-2.6.19-rc1-vivek/arch/i386/kernel/vmlinux.lds.S | 1 - 1 files changed, 1 deletion(-)
arch/i386/kernel/vmlinux.lds.S renamed from arch/i386/kernel/vmlinux.lds.S~i386-remove-unnecessary-align-option +0 -1
@@ -112,7 +112,6 @@ SECTIONS } .smp_altinstr_replacement : AT(ADDR(.smp_altinstr_replacement) - LOAD_OFFSET) { *(.smp_altinstr_replacement) - . = ALIGN(4096); __smp_alt_end = .; }
_
Re: [PATCH 1/12] i386: Distinguish absolute symbols
Quoted 7 lines
Quoted 3 lines
looks odd. What's the point in putting a gap before
__smp_alt_end? Moving__smp_alt_endto before the ALIGN doesn't prevent the warning.Please find attached a patch for the same. I am also copying Gerd Hoffmann, who introduced this ALIGN. Gerd, can you please confirm that above
ALIGN()is not required and the patch attached should be fine.
The data between __smp_alt_start and __smp_alt_end will be released at boot time in some cases (UP machine, kernel without CPU_HOTPLUG, ...).
Releasing memory works at page granularity only, thats why I added the alignment. I think you can't simply drop it.
Quoted 7 lines
o There seems to be one extra ALIGN(4096) before symbol
__smp_alt_end. The only usage of__smp_alt_endis to mark the end of smp alternative sections so that this memory can be freed. As a physical page is freed one has to just make sure that there is no other data on the same page where__smp_alt_endis pointing. There is already a ALIGN(4096) after this section which should take care of the above issue. Hence it looks like the ALIGN(4096) before__smp_alt_endis redundant and not required.
Hmm, ok, it should work then. How about adding a comment to make sure the align after __smp_alt_end doesn't get dropped by accident?
cheers,
Gerd
Signature · 2 lines
Gerd Hoffmann <[email protected]> http://www.suse.de/~kraxel/julika-dora.jpeg
Re: [PATCH 1/12] i386: Distinguish absolute symbols
Quoted 22 lines · Gerd Hoffmann
Quoted 7 lines
Quoted 3 lines
looks odd. What's the point in putting a gap before
__smp_alt_end? Moving__smp_alt_endto before the ALIGN doesn't prevent the warning.Please find attached a patch for the same. I am also copying Gerd Hoffmann, who introduced this ALIGN. Gerd, can you please confirm that above
ALIGN()is not required and the patch attached should be fine.The data between
__smp_alt_startand__smp_alt_endwill be released at boot time in some cases (UP machine, kernel withoutCPU_HOTPLUG, ...).Releasing memory works at page granularity only, thats why I added the alignment. I think you can't simply drop it.
Quoted 7 lines
o There seems to be one extra ALIGN(4096) before symbol
__smp_alt_end. The only usage of__smp_alt_endis to mark the end of smp alternative sections so that this memory can be freed. As a physical page is freed one has to just make sure that there is no other data on the same page where__smp_alt_endis pointing. There is already a ALIGN(4096) after this section which should take care of the above issue. Hence it looks like the ALIGN(4096) before__smp_alt_endis redundant and not required.
Quoted 3 lines
Hmm, ok, it should work then. How about adding a comment to make sure the align after
__smp_alt_enddoesn't get dropped by accident?
Thanks Gerd. I have put a comment to make things more clear. Please find attahched the attached regenerated patch.
o There seems to be one extra ALIGN(4096) before symbol __smp_alt_end. The only usage of __smp_alt_end is to mark the end of smp alternative sections so that this memory can be freed. As a physical page is freed one has to just make sure that there is no other data on the same page where __smp_alt_end is pointing. There is already a ALIGN(4096) after this section which should take care of the above issue. Hence it looks like the ALIGN(4096) before __smp_alt_end is redundant and not required.
---
linux-2.6.19-rc1-vivek/arch/i386/kernel/vmlinux.lds.S | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)
arch/i386/kernel/vmlinux.lds.S renamed from arch/i386/kernel/vmlinux.lds.S~i386-remove-unnecessary-align-option +6 -2
@@ -112,11 +112,15 @@ SECTIONS } .smp_altinstr_replacement : AT(ADDR(.smp_altinstr_replacement) - LOAD_OFFSET) { *(.smp_altinstr_replacement) - . = ALIGN(4096); __smp_alt_end = .; } - /* will be freed after init */ + /* will be freed after init + * Following ALIGN() is required to make sure no other data falls on the + * same page where __smp_alt_end is pointing as that page might be freed + * after boot. Always make sure that ALIGN() directive is present after + * the section which contains __smp_alt_end. + */ . = ALIGN(4096); /* Init code and data */ .init.text : AT(ADDR(.init.text) - LOAD_OFFSET) { __init_begin = .;
_
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
In reply to H. Peter AnvinQuoted 9 lines · H. Peter Anvin
Quoted 8 lines · Eric W. Biederman
Quoted 5 lines · H. Peter Anvin
Quoted 2 lines · Vivek Goyal
Hi Eric,
I have added cld in the regenerated patch below.No, the cld needs to be earlier. It turns out this isn't the first use of string instructions.
Quoted 7 lines
Quoted 3 lines
Can we rely on the int calls not setting df? Otherwise we need to clear df at each use as we do with all of the later uses.
Yes, we can, with a few exceptions. INT saves the flags and IRET restores them.
Ok. I have added the "cld" early in the setup code. I am still retaining the call to "cld" just before string instruction to be on the safer side.
Please find attached the regenerated patch.
In the lazy programmer school of fixes.
I haven't really tested this in any configuration. But reading video.S it does use variable in the bootsector. It does seem to initialize the variables before use. But obviously something is missed.
By zeroing the uninteresting parts of the bootsector just after we have determined we are loaded ok. We should ensure we are always in a known state the entire time.
Andrew if I am right about the cause of your video not working when you set an enhanced video mode this should fix your boot problem.
---
linux-2.6.19-rc1-vivek/arch/i386/boot/setup.S | 12 ++++++++++++ 1 files changed, 12 insertions(+)
arch/i386/boot/setup.S renamed from arch/i386/boot/setup.S~i386-set-bootset-to-zero-fix +12 -0
@@ -167,6 +167,7 @@ trampoline: call start_of_setup # End of setup header ##################################################### start_of_setup: + cld # set DF=0 # Bootlin depends on this being done early movw $0x01500, %ax movb $0x81, %dl
@@ -287,6 +288,17 @@ good_sig: loader_panic_mess: .string "Wrong loader, giving up..." loader_ok: +# Zero initialize the variables we keep in the bootsector + movw %cs, %ax # aka SETUPSEG + subw $DELTA_INITSEG, %ax # aka INITSEG + movw %ax, %es + xorw %di, %di + xorb %al, %al + movw $497, %cx + cld + rep + stosb + # Get memory size (extended mem, kB) xorl %eax, %eax
_
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
Quoted 1 line · On Mon, 9 Oct 2006 10:33:45 -0400 Vivek Goyal <[email protected]> wrote:
Please find attached the regenerated patch.
Somewhere amongst the six versions of this patch, the kernel broke. Seems that the kernel command line isn't getting recognised. The machine is running LILO and RH FC1.
I'll consolidate the patches which I have now and then I'll drop them.
They are (were), in order:
i386-distinguish-absolute-symbols.patch i386-distinguish-absolute-symbols-fix.patch i386-align-data-section-to-4k-boundary.patch i386-define-__pa_symbol-2.patch i386-setupc-reserve-kernel-memory-starting-from-_text.patch i386-config_physical_start-cleanup.patch make-linux-elfh-safe-to-be-included-in-assembly-files.patch elf-add-elfosabi_standalone-to-elfh.patch kallsyms-generate-relocatable-symbols.patch i386-relocatable-kernel-support.patch i386-implement-config_physical_align.patch i386-boot-add-an-elf-header-to-bzimage.patch i386-boot-add-an-elf-header-to-bzimage-fix.patch i386-boot-add-an-elf-header-to-bzimage-update-2.patch i386-boot-add-an-elf-header-to-bzimage-fix-fix.patch i386-boot-add-an-elf-header-to-bzimage-fix-fix-fix.patch i386-boot-add-an-elf-header-to-bzimage-fix-fix-fix-fix.patch
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
Quoted 8 lines · Andrew Morton
Quoted 1 line · On Mon, 9 Oct 2006 10:33:45 -0400 Vivek Goyal <[email protected]> wrote:
Please find attached the regenerated patch.
Somewhere amongst the six versions of this patch, the kernel broke. Seems that the kernel command line isn't getting recognised. The machine is running LILO and RH FC1.
Ugh. That is no fun :(
Eric
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
In reply to Andrew MortonQuoted 11 lines · Andrew Morton
Quoted 1 line · On Mon, 9 Oct 2006 10:33:45 -0400 Vivek Goyal <[email protected]> wrote:
Please find attached the regenerated patch.
Somewhere amongst the six versions of this patch, the kernel broke. Seems that the kernel command line isn't getting recognised. The machine is running LILO and RH FC1.
I'll consolidate the patches which I have now and then I'll drop them.
Hi Andrew,
I will find a machine having lilo and look into the issue.
Instead of dropping all the patches, can't we just drop the last patch which adds an elf header. Most likely this issue should be happening because of that patch. Rest of the patches should be harmless.
Thanks
Vivek
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
Quoted 10 lines · On Tue, 10 Oct 2006 10:30:44 -0400 Vivek Goyal <[email protected]> wrote:
Quoted 9 lines · Andrew Morton
Quoted 1 line · On Mon, 9 Oct 2006 10:33:45 -0400 Vivek Goyal <[email protected]> wrote:
Please find attached the regenerated patch.
Somewhere amongst the six versions of this patch, the kernel broke. Seems that the kernel command line isn't getting recognised. The machine is running LILO and RH FC1.
Quoted 6 lines
Quoted 2 lines
I'll consolidate the patches which I have now and then I'll drop them.
Hi Andrew,
I will find a machine having lilo and look into the issue.
Thanks.
Quoted 2 lines
Instead of dropping all the patches, can't we just drop the last patch which adds an elf header.
Yes, that patch was the cause.
Quoted 2 lines
Most likely this issue should be happening because of that patch. Rest of the patches should be harmless.
Those patches had reached my tolerance threshold and other people want to make changes to vmlinux.lds.S, and having large and uncertain changes in there makes that harder for them.
Resend them when you think they're ready for another run please.
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
In reply to Andrew MortonQuoted 9 lines · Andrew Morton
Quoted 1 line · On Mon, 9 Oct 2006 10:33:45 -0400 Vivek Goyal <[email protected]> wrote:
Please find attached the regenerated patch.
Somewhere amongst the six versions of this patch, the kernel broke. Seems that the kernel command line isn't getting recognised. The machine is running LILO and RH FC1.
Hi Andrew,
I tried lilo 22.7.3 with FC6 Test2 with 2.6.19-rc1 and all the relocatable patches and things work fine for me. Commnand line is also being recognized properly.
Looks like something specific to your setup. Can you please provide some more details
- Do you see any failure messages?
- Can you please provide your /etc/lilo.conf file.
- What lilo version are you using?
- Can you please also upload your kernel config file.
Thanks
Vivek
Re: [PATCH 12/12] i386 boot: Add an ELF header to bzImage
Quoted 11 lines · On Tue, 10 Oct 2006 17:40:25 -0400 Vivek Goyal <[email protected]> wrote:
Quoted 9 lines · Andrew Morton
Quoted 1 line · On Mon, 9 Oct 2006 10:33:45 -0400 Vivek Goyal <[email protected]> wrote:
Please find attached the regenerated patch.
Somewhere amongst the six versions of this patch, the kernel broke. Seems that the kernel command line isn't getting recognised. The machine is running LILO and RH FC1.
Quoted 5 lines
Hi Andrew,
I tried lilo 22.7.3 with FC6 Test2 with 2.6.19-rc1 and all the relocatable patches and things work fine for me. Commnand line is also being recognized properly.
This is FC1.
Quoted 4 lines
Looks like something specific to your setup. Can you please provide some more details
- Do you see any failure messages?
Tricky. No command line means no serial console, no netconsole.
Quoted 1 line
- Can you please provide your
/etc/lilo.conffile.
Various stuff at http://userweb.kernel.org/~akpm/vmm/
Quoted 1 line
- What lilo version are you using?
vmm:/boot> lilo -v
LILO version 21.4-4, Copyright (C) 1992-1998 Werner Almesberger 'lba32' extensions Copyright (C) 1999,2000 John Coffman
Quoted 1 line
- Can you please also upload your kernel config file.
See above.