Linker script cleanup patches for arm
v4 cover Linker script cleanup patches for arm
This is an updated version of the patch series I sent in late July cleaning up the arm architecture's linker scripts. Version 2 was rebased on top of Linus's current master; version 3 contains a fix for a problem with CONFIG_XIP_KERNEL noted by Russell King. Version 4 differs from version 3 only in being rebased on top of Linus' master.
This cross-architecture linker script cleanup project is in preparation for adding support for building the kernel with -ffunction-sections -fdata-sections, which is a prerequisite for Ksplice.
-Tim Abbott
Nelson Elhage (1):
arm: Clean up linker script using new linker script macros.
Tim Abbott (1):
arm: convert to use __HEAD and HEAD_TEXT macros.
arch/arm/kernel/head-nommu.S | 2 +- arch/arm/kernel/head.S | 2 +- arch/arm/kernel/vmlinux.lds.S | 83 ++++++++++++----------------------------- 3 files changed, 26 insertions(+), 61 deletions(-)
PATCH v4 1/2 arm: convert to use __HEAD and HEAD_TEXT macros.
This has the consequence of changing the section name used for head code from ".text.head" to ".head.text". Since this commit changes all users in the architecture, this change should be harmless.
The .text.head output section is eliminated and the head text code is included at the start of the .init output section.
--- arch/arm/kernel/head-nommu.S | 2 +- arch/arm/kernel/head.S | 2 +- arch/arm/kernel/vmlinux.lds.S | 8 +++----- 3 files changed, 5 insertions(+), 7 deletions(-)
arch/arm/kernel/head-nommu.S +1 -1
@@ -32,7 +32,7 @@ * numbers for r1. * */ - .section ".text.head", "ax" + __HEAD ENTRY(stext) setmode PSR_F_BIT | PSR_I_BIT | SVC_MODE, r9 @ ensure svc mode @ and irqs disabled
arch/arm/kernel/head.S +1 -1
@@ -74,7 +74,7 @@ * crap here - that's what the boot loader (or in extreme, well justified * circumstances, zImage) is for. */ - .section ".text.head", "ax" + __HEAD ENTRY(stext) setmode PSR_F_BIT | PSR_I_BIT | SVC_MODE, r9 @ ensure svc mode @ and irqs disabled
arch/arm/kernel/vmlinux.lds.S +3 -5
@@ -24,13 +24,11 @@ SECTIONS #else . = PAGE_OFFSET + TEXT_OFFSET; #endif - .text.head : { - _stext = .; - _sinittext = .; - *(.text.head) - } .init : { /* Init code and data */ + _stext = .; + _sinittext = .; + HEAD_TEXT INIT_TEXT _einittext = .; __proc_info_begin = .;
Signature · 1 line
1.6.3.3
Re: [PATCH 1/2] arm: convert to use __HEAD and HEAD_TEXT macros.
Quoted 10 lines · Tim Abbott
This has the consequence of changing the section name used for head code from ".text.head" to ".head.text". Since this commit changes all users in the architecture, this change should be harmless.
The .text.head output section is eliminated and the head text code is included at the start of the .init output section.
Signed-off-by Tim Abbott <[email protected]>Cc Russell King <[email protected]>Cc Linus Torvalds <[email protected]>
PATCH v4 2/2 arm: Clean up linker script using new linker script macros.
In reply to Tim AbbottFrom: Nelson Elhage <[email protected]>
This patch is mostly a straightforward translation. The primary side effect to the resulting vmlinux should be to increase the alignment on the initramfs to the standard PAGE_SIZE from 32 bytes.
--- arch/arm/kernel/vmlinux.lds.S | 75 +++++++++++----------------------------- 1 files changed, 21 insertions(+), 54 deletions(-)
arch/arm/kernel/vmlinux.lds.S +21 -54
@@ -40,43 +40,31 @@ SECTIONS __tagtable_begin = .; *(.taglist.init) __tagtable_end = .; - . = ALIGN(16); - __setup_start = .; - *(.init.setup) - __setup_end = .; + + INIT_SETUP(16) + __early_begin = .; *(.early_param.init) __early_end = .; - __initcall_start = .; - INITCALLS - __initcall_end = .; - __con_initcall_start = .; - *(.con_initcall.init) - __con_initcall_end = .; - __security_initcall_start = .; - *(.security_initcall.init) - __security_initcall_end = .; -#ifdef CONFIG_BLK_DEV_INITRD - . = ALIGN(32); - __initramfs_start = .; - usr/built-in.o(.init.ramfs) - __initramfs_end = .; -#endif - . = ALIGN(PAGE_SIZE); - __per_cpu_load = .; - __per_cpu_start = .; - *(.data.percpu.page_aligned) - *(.data.percpu) - *(.data.percpu.shared_aligned) - __per_cpu_end = .; + + INIT_CALLS + CON_INITCALL + SECURITY_INITCALL + INIT_RAM_FS + #ifndef CONFIG_XIP_KERNEL __init_begin = _stext; INIT_DATA - . = ALIGN(PAGE_SIZE); - __init_end = .; #endif } + PERCPU(PAGE_SIZE) + +#ifndef CONFIG_XIP_KERNEL + . = ALIGN(PAGE_SIZE); + __init_end = .; +#endif + /DISCARD/ : { /* Exit code and data */ EXIT_TEXT EXIT_DATA
@@ -155,7 +143,7 @@ SECTIONS * first, the init task union, aligned * to an 8192 byte boundary. */ - *(.data.init_task) + INIT_TASK_DATA(THREAD_SIZE) #ifdef CONFIG_XIP_KERNEL . = ALIGN(PAGE_SIZE);
@@ -165,17 +153,8 @@ SECTIONS __init_end = .; #endif - . = ALIGN(PAGE_SIZE); - __nosave_begin = .; - *(.data.nosave) - . = ALIGN(PAGE_SIZE); - __nosave_end = .; - - /* - * then the cacheline aligned data - */ - . = ALIGN(32); - *(.data.cacheline_aligned) + NOSAVE_DATA + CACHELINE_ALIGNED_DATA(32) /* * The exception fixup table (might need resorting at runtime)
@@ -254,20 +233,8 @@ SECTIONS } #endif - .bss : { - __bss_start = .; /* BSS */ - *(.bss) - *(COMMON) - __bss_stop = .; - _end = .; - } - /* Stabs debugging sections. */ - .stab 0 : { *(.stab) } - .stabstr 0 : { *(.stabstr) } - .stab.excl 0 : { *(.stab.excl) } - .stab.exclstr 0 : { *(.stab.exclstr) } - .stab.index 0 : { *(.stab.index) } - .stab.indexstr 0 : { *(.stab.indexstr) } + BSS_SECTION(0, 0, 0) + STABS_DEBUG .comment 0 : { *(.comment) } }
Signature · 1 line
1.6.3.3
Re: [PATCH 2/2] arm: Clean up linker script using new linker script macros.
Quoted 14 lines · Tim Abbott
From: Nelson Elhage <[email protected]>
This patch is mostly a straightforward translation. The primary side effect to the resulting vmlinux should be to increase the alignment on the initramfs to the standard
PAGE_SIZEfrom 32 bytes.Signed-off-by Nelson Elhage <[email protected]>Cc Russell King <[email protected]>Signed-off-by Tim Abbott <[email protected]>--- arch/arm/kernel/vmlinux.lds.S | 75 +++++++++++----------------------------- 1 files changed, 21 insertions(+), 54 deletions(-)
arch/arm/kernel/vmlinux.lds.S SECTIONS · line 262
Quoted 6 lines
arch/arm/kernel/vmlinux.lds.S +0
-6- .bss : { - __bss_start = .; /* BSS */ - *(.bss) - *(COMMON) - __bss_stop = .; - _end = .;
Where is _end in the new layout?
I think we lost it.
arch/arm/kernel/vmlinux.lds.S SECTIONS · line 239
Quoted 12 lines
arch/arm/kernel/vmlinux.lds.S +2
-8- } - /* Stabs debugging sections. */ - .stab 0 : { *(.stab) } - .stabstr 0 : { *(.stabstr) } - .stab.excl 0 : { *(.stab.excl) } - .stab.exclstr 0 : { *(.stab.exclstr) } - .stab.index 0 : { *(.stab.index) } - .stab.indexstr 0 : { *(.stab.indexstr) } + BSS_SECTION(0, 0, 0) + STABS_DEBUG .comment 0 : { *(.comment) } }
Other than that.
Sam
Re: [PATCH 2/2] arm: Clean up linker script using new linker script macros.
Quoted 15 lines · Sam Ravnborg
Quoted 14 lines · Tim Abbott
From: Nelson Elhage <[email protected]>
This patch is mostly a straightforward translation. The primary side effect to the resulting vmlinux should be to increase the alignment on the initramfs to the standard
PAGE_SIZEfrom 32 bytes.Signed-off-by Nelson Elhage <[email protected]>Cc Russell King <[email protected]>Signed-off-by Tim Abbott <[email protected]>--- arch/arm/kernel/vmlinux.lds.S | 75 +++++++++++----------------------------- 1 files changed, 21 insertions(+), 54 deletions(-)
Quoted 9 lines
arch/arm/kernel/vmlinux.lds.S SECTIONS · line 262
Quoted 6 lines
arch/arm/kernel/vmlinux.lds.S +0
-6- .bss : { - __bss_start = .; /* BSS */ - *(.bss) - *(COMMON) - __bss_stop = .; - _end = .;Where is
_endin the new layout?
I think we lost it.
You're right - this will cause a build failure since _end is used in several core ARM files. Tim?
PS, please ensure that all patches are at the very least build tested, or say when they aren't.
Re: [PATCH 2/2] arm: Clean up linker script using new linker script macros.
Quoted 7 lines · Russell King - ARM Linux
Quoted 3 lines · Sam Ravnborg
Where is
_endin the new layout?
I think we lost it.You're right - this will cause a build failure since
_endis used in several core ARM files. Tim?
It's supposed to be after BSS_SECTION. I'll send you a new pair of patches with this fixed and Sam's acks added shortly.
Quoted 2 lines
PS, please ensure that all patches are at the very least build tested, or say when they aren't.
These were build-tested originally; it seems I introduced this bug when rebasing the patch past the recent DISCARD changes, and failed to retest. Sorry about that (I think you are right that it was more generally a mistake to not clearly tag these patches as build-but-not-run tested in the first place. I'll do that in the future).
My cross-compile environment is unavailable at present, so the new version will be completely untested as well.
-Tim Abbott
PATCH v4 1/2 arm: convert to use __HEAD and HEAD_TEXT macros.
This has the consequence of changing the section name used for head code from ".text.head" to ".head.text". Since this commit changes all users in the architecture, this change should be harmless.
The .text.head output section is eliminated and the head text code is included at the start of the .init output section.
--- arch/arm/kernel/head-nommu.S | 2 +- arch/arm/kernel/head.S | 2 +- arch/arm/kernel/vmlinux.lds.S | 8 +++----- 3 files changed, 5 insertions(+), 7 deletions(-)
arch/arm/kernel/head-nommu.S +1 -1
@@ -32,7 +32,7 @@ * numbers for r1. * */ - .section ".text.head", "ax" + __HEAD ENTRY(stext) setmode PSR_F_BIT | PSR_I_BIT | SVC_MODE, r9 @ ensure svc mode @ and irqs disabled
arch/arm/kernel/head.S +1 -1
@@ -74,7 +74,7 @@ * crap here - that's what the boot loader (or in extreme, well justified * circumstances, zImage) is for. */ - .section ".text.head", "ax" + __HEAD ENTRY(stext) setmode PSR_F_BIT | PSR_I_BIT | SVC_MODE, r9 @ ensure svc mode @ and irqs disabled
arch/arm/kernel/vmlinux.lds.S +3 -5
@@ -24,13 +24,11 @@ SECTIONS #else . = PAGE_OFFSET + TEXT_OFFSET; #endif - .text.head : { - _stext = .; - _sinittext = .; - *(.text.head) - } .init : { /* Init code and data */ + _stext = .; + _sinittext = .; + HEAD_TEXT INIT_TEXT _einittext = .; __proc_info_begin = .;
Signature · 1 line
1.6.4.3
PATCH v4 2/2 arm: Clean up linker script using new linker script macros.
In reply to Tim AbbottFrom: Nelson Elhage <[email protected]>
This patch is mostly a straightforward translation. The primary side effect to the resulting vmlinux should be to increase the alignment on the initramfs to the standard PAGE_SIZE from 32 bytes.
--- arch/arm/kernel/vmlinux.lds.S | 77 ++++++++++++---------------------------- 1 files changed, 23 insertions(+), 54 deletions(-)
arch/arm/kernel/vmlinux.lds.S +23 -54
@@ -40,43 +40,31 @@ SECTIONS __tagtable_begin = .; *(.taglist.init) __tagtable_end = .; - . = ALIGN(16); - __setup_start = .; - *(.init.setup) - __setup_end = .; + + INIT_SETUP(16) + __early_begin = .; *(.early_param.init) __early_end = .; - __initcall_start = .; - INITCALLS - __initcall_end = .; - __con_initcall_start = .; - *(.con_initcall.init) - __con_initcall_end = .; - __security_initcall_start = .; - *(.security_initcall.init) - __security_initcall_end = .; -#ifdef CONFIG_BLK_DEV_INITRD - . = ALIGN(32); - __initramfs_start = .; - usr/built-in.o(.init.ramfs) - __initramfs_end = .; -#endif - . = ALIGN(PAGE_SIZE); - __per_cpu_load = .; - __per_cpu_start = .; - *(.data.percpu.page_aligned) - *(.data.percpu) - *(.data.percpu.shared_aligned) - __per_cpu_end = .; + + INIT_CALLS + CON_INITCALL + SECURITY_INITCALL + INIT_RAM_FS + #ifndef CONFIG_XIP_KERNEL __init_begin = _stext; INIT_DATA - . = ALIGN(PAGE_SIZE); - __init_end = .; #endif } + PERCPU(PAGE_SIZE) + +#ifndef CONFIG_XIP_KERNEL + . = ALIGN(PAGE_SIZE); + __init_end = .; +#endif + /DISCARD/ : { /* Exit code and data */ EXIT_TEXT EXIT_DATA
@@ -155,7 +143,7 @@ SECTIONS * first, the init task union, aligned * to an 8192 byte boundary. */ - *(.data.init_task) + INIT_TASK_DATA(THREAD_SIZE) #ifdef CONFIG_XIP_KERNEL . = ALIGN(PAGE_SIZE);
@@ -165,17 +153,8 @@ SECTIONS __init_end = .; #endif - . = ALIGN(PAGE_SIZE); - __nosave_begin = .; - *(.data.nosave) - . = ALIGN(PAGE_SIZE); - __nosave_end = .; - - /* - * then the cacheline aligned data - */ - . = ALIGN(32); - *(.data.cacheline_aligned) + NOSAVE_DATA + CACHELINE_ALIGNED_DATA(32) /* * The exception fixup table (might need resorting at runtime)
@@ -254,20 +233,10 @@ SECTIONS } #endif - .bss : { - __bss_start = .; /* BSS */ - *(.bss) - *(COMMON) - __bss_stop = .; - _end = .; - } - /* Stabs debugging sections. */ - .stab 0 : { *(.stab) } - .stabstr 0 : { *(.stabstr) } - .stab.excl 0 : { *(.stab.excl) } - .stab.exclstr 0 : { *(.stab.exclstr) } - .stab.index 0 : { *(.stab.index) } - .stab.indexstr 0 : { *(.stab.indexstr) } + BSS_SECTION(0, 0, 0) + _end = .; + + STABS_DEBUG .comment 0 : { *(.comment) } }
Signature · 1 line
1.6.4.3
Re: [PATCH v4 2/2] arm: Clean up linker script using new linker script macros.
Can someone with an arm machine test this patch? I'd really appreciate it.
-Tim Abbott
Quoted 136 lines · Tim Abbott
From: Nelson Elhage <[email protected]>
This patch is mostly a straightforward translation. The primary side effect to the resulting vmlinux should be to increase the alignment on the initramfs to the standard
PAGE_SIZEfrom 32 bytes.Signed-off-by Nelson Elhage <[email protected]>Cc Russell King <[email protected]>Signed-off-by Tim Abbott <[email protected]>Acked-by Sam Ravnborg <[email protected]>--- arch/arm/kernel/vmlinux.lds.S | 77 ++++++++++++---------------------------- 1 files changed, 23 insertions(+), 54 deletions(-)arch/arm/kernel/vmlinux.lds.S +23
-54@@ -40,43 +40,31 @@ SECTIONS __tagtable_begin = .; *(.taglist.init) __tagtable_end = .; - . = ALIGN(16); - __setup_start = .; - *(.init.setup) - __setup_end = .; + + INIT_SETUP(16) + __early_begin = .; *(.early_param.init) __early_end = .; - __initcall_start = .; - INITCALLS - __initcall_end = .; - __con_initcall_start = .; - *(.con_initcall.init) - __con_initcall_end = .; - __security_initcall_start = .; - *(.security_initcall.init) - __security_initcall_end = .; -#ifdef CONFIG_BLK_DEV_INITRD - . = ALIGN(32); - __initramfs_start = .; - usr/built-in.o(.init.ramfs) - __initramfs_end = .; -#endif - . = ALIGN(PAGE_SIZE); - __per_cpu_load = .; - __per_cpu_start = .; - *(.data.percpu.page_aligned) - *(.data.percpu) - *(.data.percpu.shared_aligned) - __per_cpu_end = .; + + INIT_CALLS + CON_INITCALL + SECURITY_INITCALL + INIT_RAM_FS + #ifndef CONFIG_XIP_KERNEL __init_begin = _stext; INIT_DATA - . = ALIGN(PAGE_SIZE); - __init_end = .; #endif } + PERCPU(PAGE_SIZE) + +#ifndef CONFIG_XIP_KERNEL + . = ALIGN(PAGE_SIZE); + __init_end = .; +#endif + /DISCARD/ : { /* Exit code and data */ EXIT_TEXT EXIT_DATA@@ -155,7 +143,7 @@ SECTIONS * first, the init task union, aligned * to an 8192 byte boundary. */ - *(.data.init_task) + INIT_TASK_DATA(THREAD_SIZE) #ifdef CONFIG_XIP_KERNEL . = ALIGN(PAGE_SIZE);@@ -165,17 +153,8 @@ SECTIONS __init_end = .; #endif - . = ALIGN(PAGE_SIZE); - __nosave_begin = .; - *(.data.nosave) - . = ALIGN(PAGE_SIZE); - __nosave_end = .; - - /* - * then the cacheline aligned data - */ - . = ALIGN(32); - *(.data.cacheline_aligned) + NOSAVE_DATA + CACHELINE_ALIGNED_DATA(32) /* * The exception fixup table (might need resorting at runtime)@@ -254,20 +233,10 @@ SECTIONS } #endif - .bss : { - __bss_start = .; /* BSS */ - *(.bss) - *(COMMON) - __bss_stop = .; - _end = .; - } - /* Stabs debugging sections. */ - .stab 0 : { *(.stab) } - .stabstr 0 : { *(.stabstr) } - .stab.excl 0 : { *(.stab.excl) } - .stab.exclstr 0 : { *(.stab.exclstr) } - .stab.index 0 : { *(.stab.index) } - .stab.indexstr 0 : { *(.stab.indexstr) } + BSS_SECTION(0, 0, 0) + _end = .; + + STABS_DEBUG .comment 0 : { *(.comment) } }Signature · 1 line
1.6.4.3
Re: [PATCH v4 2/2] arm: Clean up linker script using new linker script macros.
Quoted 2 lines · Tim Abbott
Can someone with an arm machine test this patch? I'd really appreciate it.
Compiles and is running fine on eco920.
Best regards
Uwe
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
Re: [PATCH v4 2/2] arm: Clean up linker script using new linker script macros.
Quoted 4 lines · Uwe Kleine-K?nig
Quoted 2 lines · Tim Abbott
Can someone with an arm machine test this patch? I'd really appreciate it.
Compiles and is running fine on eco920.
Thanks!
Russell, are you willing to take this patch series for 2.6.32? It would make life a lot easier for my work on building the kernel with -ffunction-sections -fdata-sections targeted at 2.6.33 if these linker script cleanups for the last couple architectures made it into 2.6.32.
-Tim Abbott