__cpuinitconst and __devinitconst
Subsystems (14)
cover __cpuinitconst and __devinitconst
Since __cpuinitdata/__devinitdata don't allow const to be specified with them (otherwise .init.data sections with and without the writeable attribute will be generated by the compiler), and since __devinitdata except for embedded systems evaluates to <empty> unconditionally and __cpuinitdata at least in most production kernel configurations also likely evaluates to <empty>, it seems appropriate to add an additional attribute allowing the respective objects to end up in .rodata rather than .data when not used at initialization time only.
Patch 1 introduces __cpuinitconst and a single common code consumer. Patch 2 adds a number of x86 consumers of __cpuinitconst. Patch 3 introduces __devinitconst and common code consumers. Patch 4 adds a number of x86 consumers of __devinitconst.
Hi Jan.
Quoted 8 lines · Jan Beulich
Since __cpuinitdata/__devinitdata don't allow const to be specified with them (otherwise .init.data sections with and without the writeable attribute will be generated by the compiler), and since
__devinitdataexcept for embedded systems evaluates to <empty> unconditionally and__cpuinitdataat least in most production kernel configurations also likely evaluates to <empty>, it seems appropriate to add an additional attribute allowing the respective objects to end up in .rodata rather than .data when not used at initialization time only.
How about a slightly diffrent approach...
Consider__cpuinitconst => function is placed in section .init.const.text __devinitconst => function is placed in section .init.const.text
Then we in the linker scrip can distingush between the two and locate the sections as appropriate.
This will require some updates to modpost but are align with an idea I have had for a while.
All of the following should have dedicated sections associated unconditionally:
__init__cpuinit__meminit__initdata__cpuinitdata__meminitdata
And then in the linker script we decide what to do with the section. In the built-in case we put them in the "to-be-discarded" section. In the module case we put them as today.
The primary tasks needed to accomplish this is:
1) Update all arch linker scripts (and some of them looks ugly)
2) Teach modpost about the new sections
If you following the suggestion above this is a simple step in this direction which would be good.
Comments?
Sam
Quoted 36 lines · Sam Ravnborg
Hi Jan.
Quoted 8 lines · Jan Beulich
Since __cpuinitdata/__devinitdata don't allow const to be specified with them (otherwise .init.data sections with and without the writeable attribute will be generated by the compiler), and since
__devinitdataexcept for embedded systems evaluates to <empty> unconditionally and__cpuinitdataat least in most production kernel configurations also likely evaluates to <empty>, it seems appropriate to add an additional attribute allowing the respective objects to end up in .rodata rather than .data when not used at initialization time only.How about a slightly diffrent approach...
Consider__cpuinitconst=> function is placed in section .init.const.text__devinitconst=> function is placed in section .init.const.textThen we in the linker scrip can distingush between the two and locate the sections as appropriate.
This will require some updates to modpost but are align with an idea I have had for a while.
All of the following should have dedicated sections associated unconditionally:
__init__cpuinit__meminit__initdata__cpuinitdata__meminitdataAnd then in the linker script we decide what to do with the section. In the built-in case we put them in the "to-be-discarded" section. In the module case we put them as today.
Quoted 6 lines
The primary tasks needed to accomplish this is:
1) Update all arch linker scripts (and some of them looks ugly)
2) Teach modpost about the new sectionsIf you following the suggestion above this is a simple step in this direction which would be good.
The following patch implment first step in this direction. It is only an RFC as I have not touched anything else than 64 bit x86 for the arch specific parts.
But it should show what I tried to say above.
On top of x86.git mm-branch.
Sam
arch/x86/kernel/vmlinux_64.lds.S +13 -5
@@ -155,12 +155,16 @@ SECTIONS __init_begin = .; .init.text : AT(ADDR(.init.text) - LOAD_OFFSET) { _sinittext = .; + INIT_TEXT *(.init.text) _einittext = .; } - __initdata_begin = .; - .init.data : AT(ADDR(.init.data) - LOAD_OFFSET) { *(.init.data) } - __initdata_end = .; + .init.data : AT(ADDR(.init.data) - LOAD_OFFSET) { + __initdata_begin = .; + INIT_DATA + __initdata_end = .; + } + . = ALIGN(16); __setup_start = .; .init.setup : AT(ADDR(.init.setup) - LOAD_OFFSET) { *(.init.setup) }
@@ -187,8 +191,12 @@ SECTIONS } /* .exit.text is discard at runtime, not link time, to deal with references from .altinstructions and .eh_frame */ - .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) { *(.exit.text) } - .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) { *(.exit.data) } + .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) { + EXIT_TEXT + } + .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) { + EXIT_DATA + } /* vdso blob that is mapped into user space */ vdso_start = . ;
include/asm-generic/vmlinux.lds.h +76 -1
99 lines not on this page · raw message
include/linux/init.h +20 -36
62 lines not on this page · raw message
Quoted 15 lines
include/asm-generic/vmlinux.lds.h +14
-0+#ifdef CONFIG_HOTPLUG +#define DEV_KEEP (sec) +#define DEV_DISCARD (sec) *(.dev##sec) +#else +#define DEV_KEEP (sec) *(.dev##sec) +#define DEV_DISCARD (sec) +#endif + +#ifdef CONFIG_HOTPLUG_CPU +#define CPU_KEEP (sec) +#define CPU_DISCARD (sec) *(.cpu##sec) +#else +#define CPU_KEEP (sec) *(.cpu##sec) +#define CPU_DISCARD (sec)
include/asm-generic/vmlinux.lds.h line 35
Quoted 10 lines
include/asm-generic/vmlinux.lds.h +10
-0+#endif + +#if defined(CONFIG_MEMORY_HOTPLUG ) || defined(CONFIG_ACPI_HOTPLUG_MEMORY ) \ + || defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE ) +#define MEM_KEEP (sec) +#define MEM_DISCARD (sec) *(.mem##sec) +#else +#define MEM_KEEP (sec) *(.mem##sec) +#define MEM_DISCARD (sec) +#endif
I inversed it in the ifdef's above.
And I found another small buglet too. I hope to post a complete solution later today.
Sam
Quoted 2 lines
And I found another small buglet too. I hope to post a complete solution later today.
The modpost bits turned out to take longer than expected so they are not done yet. The problem was the modpost structure were not prepared for adding such additional chacks.
So I reworked those bits and the patch has been sent out for review.
What follows here is the changes for init.h + all linker scripts to show the idea.
Next step is to beat modpost in shape and to post this on linux-arch.
Note - in -mm there are changes to init.h so the logic to decide type of __meminit notation is much simpler.
Sam
arch/alpha/kernel/vmlinux.lds.S | 8 +-- arch/arm/kernel/vmlinux.lds.S | 10 ++-- arch/avr32/kernel/vmlinux.lds.S | 8 +-- arch/blackfin/kernel/vmlinux.lds.S | 8 +-- arch/cris/arch-v10/vmlinux.lds.S | 8 +-- arch/cris/arch-v32/vmlinux.lds.S | 8 +-- arch/frv/kernel/vmlinux.lds.S | 14 +++--- arch/h8300/kernel/vmlinux.lds.S | 8 +-- arch/ia64/kernel/vmlinux.lds.S | 8 +-- arch/m32r/kernel/vmlinux.lds.S | 12 ++--- arch/m68k/kernel/vmlinux-std.lds | 8 +-- arch/m68k/kernel/vmlinux-sun3.lds | 8 +-- arch/m68knommu/kernel/vmlinux.lds.S | 8 +-- arch/mips/kernel/vmlinux.lds.S | 8 +-- arch/parisc/kernel/vmlinux.lds.S | 8 +-- arch/powerpc/kernel/vmlinux.lds.S | 10 ++-- arch/ppc/kernel/vmlinux.lds.S | 8 +-- arch/s390/kernel/vmlinux.lds.S | 8 +-- arch/sh/kernel/vmlinux.lds.S | 8 +-- arch/sh64/kernel/vmlinux.lds.S | 8 +-- arch/sparc/kernel/vmlinux.lds.S | 8 +-- arch/sparc64/kernel/vmlinux.lds.S | 8 +-- arch/um/kernel/dyn.lds.S | 4 - arch/um/kernel/uml.lds.S | 4 - arch/v850/kernel/vmlinux.lds.S | 10 ++-- arch/x86/kernel/vmlinux_32.lds.S | 14 ++++-- arch/x86/kernel/vmlinux_64.lds.S | 19 ++++++-- arch/xtensa/kernel/vmlinux.lds.S | 9 ++-- include/asm-generic/vmlinux.lds.h | 77 +++++++++++++++++++++++++++++++++++- include/linux/init.h | 56 +++++++++----------------- 30 files changed, 229 insertions(+), 154 deletions(-)
arch/alpha/kernel/vmlinux.lds.S +4 -4
@@ -46,11 +46,11 @@ SECTIONS __init_begin = .; .init.text : { _sinittext = .; - *(.init.text) + INIT_TEXT _einittext = .; } .init.data : { - *(.init.data) + INIT_DATA } . = ALIGN(16);
@@ -136,8 +136,8 @@ SECTIONS /* Sections to be discarded */ /DISCARD/ : { - *(.exit.text) - *(.exit.data) + EXIT_TEXT + EXIT_DATA *(.exitcall.exit) }
arch/arm/kernel/vmlinux.lds.S +5 -5
@@ -30,7 +30,7 @@ SECTIONS } .init : { /* Init code and data */ - *(.init.text) + INIT_TEXT _einittext = .; __proc_info_begin = .; *(.proc.info.init)
@@ -70,15 +70,15 @@ SECTIONS __per_cpu_end = .; #ifndef CONFIG_XIP_KERNEL __init_begin = _stext; - *(.init.data) + INIT_DATA . = ALIGN(4096); __init_end = .; #endif } /DISCARD/ : { /* Exit code and data */ - *(.exit.text) - *(.exit.data) + EXIT_TEXT + EXIT_DATA *(.exitcall.exit) #ifndef CONFIG_MMU *(.fixup)
@@ -129,7 +129,7 @@ SECTIONS #ifdef CONFIG_XIP_KERNEL . = ALIGN(4096); __init_begin = .; - *(.init.data) + INIT_DATA . = ALIGN(4096); __init_end = .; #endif
arch/avr32/kernel/vmlinux.lds.S +4 -4
@@ -27,19 +27,19 @@ SECTIONS __init_begin = .; _sinittext = .; *(.text.reset) - *(.init.text) + INIT_TEXT /* * .exit.text is discarded at runtime, not * link time, to deal with references from * __bug_table */ - *(.exit.text) + EXIT_TEXT _einittext = .; . = ALIGN(4); __tagtable_begin = .; *(.taglist.init) __tagtable_end = .; - *(.init.data) + INIT_DATA . = ALIGN(16); __setup_start = .; *(.init.setup)
@@ -135,7 +135,7 @@ SECTIONS * thrown away, as cleanup code is never called unless it's a module. */ /DISCARD/ : { - *(.exit.data) + EXIT_DATA *(.exitcall.exit) }
arch/blackfin/kernel/vmlinux.lds.S +4 -4
@@ -91,13 +91,13 @@ SECTIONS { . = ALIGN(PAGE_SIZE); __sinittext = .; - *(.init.text) + INIT_TEXT __einittext = .; } .init.data : { . = ALIGN(16); - *(.init.data) + INIT_DATA } .init.setup : {
@@ -198,8 +198,8 @@ SECTIONS /DISCARD/ : { - *(.exit.text) - *(.exit.data) + EXIT_TEXT + EXIT_DATA *(.exitcall.exit) } }
arch/cris/arch-v10/vmlinux.lds.S +4 -4
@@ -56,10 +56,10 @@ SECTIONS __init_begin = .; .init.text : { _sinittext = .; - *(.init.text) + INIT_TEXT _einittext = .; } - .init.data : { *(.init.data) } + .init.data : { INIT_DATA } . = ALIGN(16); __setup_start = .; .init.setup : { *(.init.setup) }
@@ -112,8 +112,8 @@ SECTIONS /* Sections to be discarded */ /DISCARD/ : { - *(.text.exit) - *(.data.exit) + EXIT_TEXT + EXIT_DATA *(.exitcall.exit) }
arch/cris/arch-v32/vmlinux.lds.S +4 -4
@@ -61,10 +61,10 @@ SECTIONS __init_begin = .; .init.text : { _sinittext = .; - *(.init.text) + INIT_TEXT _einittext = .; } - .init.data : { *(.init.data) } + .init.data : { INIT_DATA } . = ALIGN(16); __setup_start = .; .init.setup : { *(.init.setup) }
@@ -124,8 +124,8 @@ SECTIONS /* Sections to be discarded */ /DISCARD/ : { - *(.text.exit) - *(.data.exit) + EXIT_TEXT + EXIT_DATA *(.exitcall.exit) }
arch/frv/kernel/vmlinux.lds.S +7 -7
@@ -28,14 +28,14 @@ SECTIONS .init.text : { *(.text.head) #ifndef CONFIG_DEBUG_INFO - *(.init.text) - *(.exit.text) - *(.exit.data) + INIT_TEXT + EXIT_TEXT + EXIT_DATA *(.exitcall.exit) #endif } _einittext = .; - .init.data : { *(.init.data) } + .init.data : { INIT_DATA } . = ALIGN(8); __setup_start = .;
@@ -106,8 +106,8 @@ SECTIONS LOCK_TEXT #ifdef CONFIG_DEBUG_INFO *( - .init.text - .exit.text + INIT_TEXT + EXIT_TEXT .exitcall.exit ) #endif
@@ -138,7 +138,7 @@ SECTIONS .data : { /* Data */ DATA_DATA *(.data.*) - *(.exit.data) + EXIT_DATA CONSTRUCTORS }
arch/h8300/kernel/vmlinux.lds.S +4 -4
@@ -110,9 +110,9 @@ SECTIONS . = ALIGN(0x4) ; ___init_begin = .; __sinittext = .; - *(.init.text) + INIT_TEXT __einittext = .; - *(.init.data) + INIT_DATA . = ALIGN(0x4) ; ___setup_start = .; *(.init.setup)
@@ -124,8 +124,8 @@ SECTIONS ___con_initcall_start = .; *(.con_initcall.init) ___con_initcall_end = .; - *(.exit.text) - *(.exit.data) + EXIT_TEXT + EXIT_DATA #if defined(CONFIG_BLK_DEV_INITRD) . = ALIGN(4); ___initramfs_start = .;
arch/ia64/kernel/vmlinux.lds.S +4 -4
@@ -27,8 +27,8 @@ SECTIONS { /* Sections to be discarded */ /DISCARD/ : { - *(.exit.text) - *(.exit.data) + EXIT_TEXT + EXIT_DATA *(.exitcall.exit) *(.IA_64.unwind.exit.text) *(.IA_64.unwind_info.exit.text)
@@ -119,12 +119,12 @@ SECTIONS .init.text : AT(ADDR(.init.text) - LOAD_OFFSET) { _sinittext = .; - *(.init.text) + INIT_TEXT _einittext = .; } .init.data : AT(ADDR(.init.data) - LOAD_OFFSET) - { *(.init.data) } + { INIT_DATA } #ifdef CONFIG_BLK_DEV_INITRD .init.ramfs : AT(ADDR(.init.ramfs) - LOAD_OFFSET)
arch/m32r/kernel/vmlinux.lds.S +6 -6
@@ -76,10 +76,10 @@ SECTIONS __init_begin = .; .init.text : { _sinittext = .; - *(.init.text) + INIT_TEXT _einittext = .; } - .init.data : { *(.init.data) } + .init.data : { INIT_DATA } . = ALIGN(16); __setup_start = .; .init.setup : { *(.init.setup) }
@@ -100,8 +100,8 @@ SECTIONS .altinstr_replacement : { *(.altinstr_replacement) } /* .exit.text is discard at runtime, not link time, to deal with references from .altinstructions and .eh_frame */ - .exit.text : { *(.exit.text) } - .exit.data : { *(.exit.data) } + .exit.text : { EXIT_TEXT } + .exit.data : { EXIT_DATA } #ifdef CONFIG_BLK_DEV_INITRD . = ALIGN(4096);
@@ -124,8 +124,8 @@ SECTIONS /* Sections to be discarded */ /DISCARD/ : { - *(.exit.text) - *(.exit.data) + EXIT_TEXT + EXIT_DATA *(.exitcall.exit) }
arch/m68k/kernel/vmlinux-std.lds +4 -4
@@ -45,10 +45,10 @@ SECTIONS __init_begin = .; .init.text : { _sinittext = .; - *(.init.text) + INIT_TEXT _einittext = .; } - .init.data : { *(.init.data) } + .init.data : { INIT_DATA } . = ALIGN(16); __setup_start = .; .init.setup : { *(.init.setup) }
@@ -82,8 +82,8 @@ SECTIONS /* Sections to be discarded */ /DISCARD/ : { - *(.exit.text) - *(.exit.data) + EXIT_TEXT + EXIT_DATA *(.exitcall.exit) }
arch/m68k/kernel/vmlinux-sun3.lds +4 -4
@@ -38,10 +38,10 @@ SECTIONS __init_begin = .; .init.text : { _sinittext = .; - *(.init.text) + INIT_TEXT _einittext = .; } - .init.data : { *(.init.data) } + .init.data : { INIT_DATA } . = ALIGN(16); __setup_start = .; .init.setup : { *(.init.setup) }
@@ -77,8 +77,8 @@ __init_begin = .; /* Sections to be discarded */ /DISCARD/ : { - *(.exit.text) - *(.exit.data) + EXIT_TEXT + EXIT_DATA *(.exitcall.exit) }
arch/m68knommu/kernel/vmlinux.lds.S +4 -4
@@ -143,9 +143,9 @@ SECTIONS { . = ALIGN(4096); __init_begin = .; _sinittext = .; - *(.init.text) + INIT_TEXT _einittext = .; - *(.init.data) + INIT_DATA . = ALIGN(16); __setup_start = .; *(.init.setup)
@@ -170,8 +170,8 @@ SECTIONS { } > INIT /DISCARD/ : { - *(.exit.text) - *(.exit.data) + EXIT_TEXT + EXIT_DATA *(.exitcall.exit) }
arch/mips/kernel/vmlinux.lds.S +4 -4
@@ -114,11 +114,11 @@ SECTIONS __init_begin = .; .init.text : { _sinittext = .; - *(.init.text) + INIT_TEXT _einittext = .; } .init.data : { - *(.init.data) + INIT_DATA } . = ALIGN(16); .init.setup : {
@@ -144,10 +144,10 @@ SECTIONS * references from .rodata */ .exit.text : { - *(.exit.text) + EXIT_TEXT } .exit.data : { - *(.exit.data) + EXIT_DATA } #if defined(CONFIG_BLK_DEV_INITRD) . = ALIGN(_PAGE_SIZE);
arch/parisc/kernel/vmlinux.lds.S +4 -4
@@ -172,11 +172,11 @@ SECTIONS __init_begin = .; .init.text : { _sinittext = .; - *(.init.text) + INIT_TEXT _einittext = .; } .init.data : { - *(.init.data) + INIT_DATA } . = ALIGN(16); .init.setup : {
@@ -215,10 +215,10 @@ SECTIONS * from .altinstructions and .eh_frame */ .exit.text : { - *(.exit.text) + EXIT_TEXT } .exit.data : { - *(.exit.data) + EXIT_DATA } #ifdef CONFIG_BLK_DEV_INITRD . = ALIGN(PAGE_SIZE);
arch/powerpc/kernel/vmlinux.lds.S +6 -4
@@ -23,7 +23,7 @@ SECTIONS /* Sections to be discarded. */ /DISCARD/ : { *(.exitcall.exit) - *(.exit.data) + EXIT_DATA } . = KERNELBASE;
@@ -76,17 +76,19 @@ SECTIONS .init.text : { _sinittext = .; - *(.init.text) + INIT_TEXT _einittext = .; } /* .exit.text is discarded at runtime, not link time, * to deal with references from __bug_table */ - .exit.text : { *(.exit.text) } + .exit.text : { + EXIT_TEXT + } .init.data : { - *(.init.data); + INIT_DATA __vtop_table_begin = .; *(.vtop_fixup); __vtop_table_end = .;
arch/ppc/kernel/vmlinux.lds.S +4 -4
@@ -97,14 +97,14 @@ SECTIONS __init_begin = .; .init.text : { _sinittext = .; - *(.init.text) + INIT_TEXT _einittext = .; } /* .exit.text is discarded at runtime, not link time, to deal with references from __bug_table */ - .exit.text : { *(.exit.text) } + .exit.text : { EXIT_TEXT } .init.data : { - *(.init.data); + INIT_DATA __vtop_table_begin = .; *(.vtop_fixup); __vtop_table_end = .;
@@ -164,6 +164,6 @@ SECTIONS /* Sections to be discarded. */ /DISCARD/ : { *(.exitcall.exit) - *(.exit.data) + EXIT_DATA } }
arch/s390/kernel/vmlinux.lds.S +4 -4
@@ -91,7 +91,7 @@ SECTIONS __init_begin = .; .init.text : { _sinittext = .; - *(.init.text) + INIT_TEXT _einittext = .; } /*
@@ -99,11 +99,11 @@ SECTIONS * to deal with references from __bug_table */ .exit.text : { - *(.exit.text) + EXIT_TEXT } .init.data : { - *(.init.data) + INIT_DATA } . = ALIGN(0x100); .init.setup : {
@@ -150,7 +150,7 @@ SECTIONS /* Sections to be discarded */ /DISCARD/ : { - *(.exit.data) + EXIT_DATA *(.exitcall.exit) }
arch/sh/kernel/vmlinux.lds.S +4 -4
@@ -70,9 +70,9 @@ SECTIONS . = ALIGN(PAGE_SIZE); /* Init code and data */ __init_begin = .; _sinittext = .; - .init.text : { *(.init.text) } + .init.text : { INIT_TEXT } _einittext = .; - .init.data : { *(.init.data) } + .init.data : { INIT_DATA } . = ALIGN(16); __setup_start = .;
@@ -108,8 +108,8 @@ SECTIONS * .exit.text is discarded at runtime, not link time, to deal with * references from __bug_table */ - .exit.text : { *(.exit.text) } - .exit.data : { *(.exit.data) } + .exit.text : { EXIT_TEXT } + .exit.data : { EXIT_DATA } . = ALIGN(PAGE_SIZE); .bss : {
arch/sh64/kernel/vmlinux.lds.S +4 -4
@@ -93,9 +93,9 @@ SECTIONS . = ALIGN(PAGE_SIZE); /* Init code and data */ __init_begin = .; _sinittext = .; - .init.text : C_PHYS(.init.text) { *(.init.text) } + .init.text : C_PHYS(.init.text) { INIT_TEXT } _einittext = .; - .init.data : C_PHYS(.init.data) { *(.init.data) } + .init.data : C_PHYS(.init.data) { INIT_DATA } . = ALIGN(L1_CACHE_BYTES); /* Better if Cache Line aligned */ __setup_start = .; .init.setup : C_PHYS(.init.setup) { *(.init.setup) }
@@ -130,8 +130,8 @@ SECTIONS /* Sections to be discarded */ /DISCARD/ : { - *(.exit.text) - *(.exit.data) + EXIT_TEXT + EXIT_DATA *(.exitcall.exit) }
arch/sparc/kernel/vmlinux.lds.S +4 -4
@@ -48,12 +48,12 @@ SECTIONS __init_begin = .; .init.text : { _sinittext = .; - *(.init.text) + INIT_TEXT _einittext = .; } __init_text_end = .; .init.data : { - *(.init.data) + INIT_DATA } . = ALIGN(16); .init.setup : {
@@ -102,8 +102,8 @@ SECTIONS _end = . ; PROVIDE (end = .); /DISCARD/ : { - *(.exit.text) - *(.exit.data) + EXIT_TEXT + EXIT_DATA *(.exitcall.exit) }
arch/sparc64/kernel/vmlinux.lds.S +4 -4
@@ -56,11 +56,11 @@ SECTIONS .init.text : { __init_begin = .; _sinittext = .; - *(.init.text) + INIT_TEXT _einittext = .; } .init.data : { - *(.init.data) + INIT_DATA } . = ALIGN(16); .init.setup : {
@@ -137,8 +137,8 @@ SECTIONS PROVIDE (end = .); /DISCARD/ : { - *(.exit.text) - *(.exit.data) + EXIT_TEXT + EXIT_DATA *(.exitcall.exit) }
arch/um/kernel/dyn.lds.S +2 -2
@@ -17,7 +17,7 @@ SECTIONS __init_begin = .; .init.text : { _sinittext = .; - *(.init.text) + INIT_TEXT _einittext = .; }
@@ -84,7 +84,7 @@ SECTIONS #include "asm/common.lds.S" - init.data : { *(.init.data) } + init.data : { INIT_DATA } /* Ensure the __preinit_array_start label is properly aligned. We could instead move the label definition inside the section, but
arch/um/kernel/uml.lds.S +2 -2
@@ -23,7 +23,7 @@ SECTIONS __init_begin = .; .init.text : { _sinittext = .; - *(.init.text) + INIT_TEXT _einittext = .; } . = ALIGN(4096);
@@ -48,7 +48,7 @@ SECTIONS #include "asm/common.lds.S" - init.data : { *(init.data) } + init.data : { INIT_DATA } .data : { . = ALIGN(KERNEL_STACK_SIZE); /* init_task */
arch/v850/kernel/vmlinux.lds.S +5 -5
@@ -114,7 +114,7 @@ #define DATA_CONTENTS \ __sdata = . ; \ DATA_DATA \ - *(.exit.data) /* 2.5 convention */ \ + EXIT_DATA /* 2.5 convention */ \ *(.data.exit) /* 2.4 convention */ \ . = ALIGN (16) ; \ *(.data.cacheline_aligned) \
@@ -157,9 +157,9 @@ . = ALIGN (4096) ; \ __init_start = . ; \ __sinittext = .; \ - *(.init.text) /* 2.5 convention */ \ + INIT_TEXT /* 2.5 convention */ \ __einittext = .; \ - *(.init.data) \ + INIT_DATA \ *(.text.init) /* 2.4 convention */ \ *(.data.init) \ INITCALL_CONTENTS \
@@ -170,7 +170,7 @@ #define ROMK_INIT_RAM_CONTENTS \ . = ALIGN (4096) ; \ __init_start = . ; \ - *(.init.data) /* 2.5 convention */ \ + INIT_DATA /* 2.5 convention */ \ *(.data.init) /* 2.4 convention */ \ __init_end = . ; \ . = ALIGN (4096) ;
@@ -179,7 +179,7 @@ should go into ROM. */ #define ROMK_INIT_ROM_CONTENTS \ _sinittext = .; \ - *(.init.text) /* 2.5 convention */ \ + INIT_TEXT /* 2.5 convention */ \ _einittext = .; \ *(.text.init) /* 2.4 convention */ \ INITCALL_CONTENTS \
arch/x86/kernel/vmlinux_32.lds.S +10 -4
@@ -127,10 +127,12 @@ SECTIONS .init.text : AT(ADDR(.init.text) - LOAD_OFFSET) { __init_begin = .; _sinittext = .; - *(.init.text) + INIT_TEXT _einittext = .; } - .init.data : AT(ADDR(.init.data) - LOAD_OFFSET) { *(.init.data) } + .init.data : AT(ADDR(.init.data) - LOAD_OFFSET) { + INIT_DATA + } . = ALIGN(16); .init.setup : AT(ADDR(.init.setup) - LOAD_OFFSET) { __setup_start = .;
@@ -165,8 +167,12 @@ SECTIONS } /* .exit.text is discard at runtime, not link time, to deal with references from .altinstructions and .eh_frame */ - .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) { *(.exit.text) } - .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) { *(.exit.data) } + .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) { + EXIT_TEXT + } + .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) { + EXIT_DATA + } #if defined(CONFIG_BLK_DEV_INITRD) . = ALIGN(4096); .init.ramfs : AT(ADDR(.init.ramfs) - LOAD_OFFSET) {
arch/x86/kernel/vmlinux_64.lds.S +13 -6
@@ -155,12 +155,15 @@ SECTIONS __init_begin = .; .init.text : AT(ADDR(.init.text) - LOAD_OFFSET) { _sinittext = .; - *(.init.text) + INIT_TEXT _einittext = .; } - __initdata_begin = .; - .init.data : AT(ADDR(.init.data) - LOAD_OFFSET) { *(.init.data) } - __initdata_end = .; + .init.data : AT(ADDR(.init.data) - LOAD_OFFSET) { + __initdata_begin = .; + INIT_DATA + __initdata_end = .; + } + . = ALIGN(16); __setup_start = .; .init.setup : AT(ADDR(.init.setup) - LOAD_OFFSET) { *(.init.setup) }
@@ -187,8 +190,12 @@ SECTIONS } /* .exit.text is discard at runtime, not link time, to deal with references from .altinstructions and .eh_frame */ - .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) { *(.exit.text) } - .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) { *(.exit.data) } + .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) { + EXIT_TEXT + } + .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) { + EXIT_DATA + } /* vdso blob that is mapped into user space */ vdso_start = . ;
arch/xtensa/kernel/vmlinux.lds.S +5 -4
@@ -136,13 +136,13 @@ SECTIONS __init_begin = .; .init.text : { _sinittext = .; - *(.init.literal) *(.init.text) + *(.init.literal) INIT_TEXT _einittext = .; } .init.data : { - *(.init.data) + INIT_DATA . = ALIGN(0x4); __tagtable_begin = .; *(.taglist)
@@ -278,8 +278,9 @@ SECTIONS /* Sections to be discarded */ /DISCARD/ : { - *(.exit.literal .exit.text) - *(.exit.data) + *(.exit.literal) + EXIT_TEXT + EXIT_DATA *(.exitcall.exit) }
include/asm-generic/vmlinux.lds.h +76 -1
99 lines not on this page · raw message
include/linux/init.h +20 -36
62 lines not on this page · raw message
Quoted 9 lines
Quoted 3 lines
Quoted 1 line
Sam Ravnborg <[email protected]> 13.01.08 22:42 >>>
And I found another small buglet too. I hope to post a complete solution later today.
The modpost bits turned out to take longer than expected so they are not done yet. The problem was the modpost structure were not prepared for adding such additional chacks.
So I reworked those bits and the patch has been sent out for review.
Quoted 7 lines
What follows here is the changes for
init.h+ all linker scripts to show the idea.Next step is to beat modpost in shape and to post this on linux-arch.
Note - in -mm there are changes to
init.hso the logic to decide type of__meminitnotation is much simpler.
Yes, I certainly like this concept. What I would have wanted in that patch, though, is that the read-only data would right away be included in RODATA() rather than being put in DATA_DATA. Also, to shorten the names a little, how about .{cpu,mem,dev}init.rodata?
The one thing that I'm not sure is really consistent yet wrt. the constification is that now you need to write e.g.
static const char __cpuinitcdata example[];
and (accidentally) omitting the 'const' (as it's really an apparently redundant thing now) as in
static char __cpuinitcdata example[];
will cause section type conflicts (at the compiler or linker level). I therefore think that the 'const' should really be part of the __{cpu,mem,dev}cdata definitions (requiring the attribute to be placed properly, namely placement at the end of a declaration as is possible with __{cpu,mem,dev}initdata is then not an option here).
Jan
Quoted 12 lines · Jan Beulich
Quoted 12 lines
Quoted 3 lines
Quoted 1 line
Sam Ravnborg <[email protected]> 13.01.08 22:42 >>>
And I found another small buglet too. I hope to post a complete solution later today.
The modpost bits turned out to take longer than expected so they are not done yet. The problem was the modpost structure were not prepared for adding such additional chacks.
So I reworked those bits and the patch has been sent out for review.What follows here is the changes for
init.h+ all linker scripts to show the idea.
Quoted 8 lines
Quoted 4 lines
Next step is to beat modpost in shape and to post this on linux-arch.
Note - in -mm there are changes to
init.hso the logic to decide type of__meminitnotation is much simpler.Yes, I certainly like this concept. What I would have wanted in that patch, though, is that the read-only data would right away be included in
RODATA()rather than being put inDATA_DATA.
Will fix that in next patch. My focus was on the concept when I did the patch but it is dead easy to fix for ll archs at once.
Quoted 2 lines
Also, to shorten the
names a little, how about .{cpu,mem,dev}init.rodata?
Good suggestion - will use these.
Quoted 8 lines
The one thing that I'm not sure is really consistent yet wrt. the constification is that now you need to write e.g.
static const char
__cpuinitcdataexample[];and (accidentally) omitting the 'const' (as it's really an apparently redundant thing now) as in
Quoted 7 lines
static char
__cpuinitcdataexample[];will cause section type conflicts (at the compiler or linker level). I therefore think that the 'const' should really be part of the __{cpu,mem,dev}cdata definitions (requiring the attribute to be placed properly, namely placement at the end of a declaration as is possible with __{cpu,mem,dev}initdata is then not an option here).
I need to play a little with this before I make up my mind. I do not like the concpet of hiding the const too much - it will be non-obvious why the compiler complains if the only thing that distingush const from non-const is a small capital 'c' within __cpucinitdata (versus __cpuinitdata).
It can always be an incremental patch as my concpet does not prevent it and we have only a few const __initdata variables.
Sam
Quoted 16 lines
Quoted 8 lines
The one thing that I'm not sure is really consistent yet wrt. the constification is that now you need to write e.g.
static const char
__cpuinitcdataexample[];and (accidentally) omitting the 'const' (as it's really an apparently redundant thing now) as in
Quoted 7 lines
static char
__cpuinitcdataexample[];will cause section type conflicts (at the compiler or linker level). I therefore think that the 'const' should really be part of the __{cpu,mem,dev}cdata definitions (requiring the attribute to be placed properly, namely placement at the end of a declaration as is possible with __{cpu,mem,dev}initdata is then not an option here).
Quoted 5 lines
I need to play a little with this before I make up my mind. I do not like the concpet of hiding the const too much - it will be non-obvious why the compiler complains if the only thing that distingush const from non-const is a small capital 'c' within
__cpucinitdata(versus__cpuinitdata).
That's the main reason I preferred __{cpu,mem,dev}initconst, as it makes it more obvious that the declared thing is 'const'.
Jan
Quoted 16 lines · Jan Beulich
Quoted 16 lines
Quoted 15 lines
The one thing that I'm not sure is really consistent yet wrt. the constification is that now you need to write e.g.
static const char
__cpuinitcdataexample[];and (accidentally) omitting the 'const' (as it's really an apparently redundant thing now) as in
static char
__cpuinitcdataexample[];will cause section type conflicts (at the compiler or linker level). I therefore think that the 'const' should really be part of the __{cpu,mem,dev}cdata definitions (requiring the attribute to be placed properly, namely placement at the end of a declaration as is possible with __{cpu,mem,dev}initdata is then not an option here).
Quoted 8 lines
Quoted 5 lines
I need to play a little with this before I make up my mind. I do not like the concpet of hiding the const too much - it will be non-obvious why the compiler complains if the only thing that distingush const from non-const is a small capital 'c' within
__cpucinitdata(versus__cpuinitdata).That's the main reason I preferred __{cpu,mem,dev}initconst, as it makes it more obvious that the declared thing is 'const'.
I will try with these names - thanks (Saw Adrian's comment but agree it is too long).
I will likely not have anything ready until wednesday so feel free to beat me.
Sam