aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-generic
diff options
context:
space:
mode:
authorJohn Reiser <jreiser@bitwagon.com>2009-07-27 14:23:50 -0400
committerSteven Rostedt <rostedt@goodmis.org>2009-09-12 21:57:29 -0400
commit4b3b4c5e64ce26612646867ee354373620063534 (patch)
tree048ff75a616c83c5bd64372f4140d53c9f79f169 /include/asm-generic
parentb5130b1e7d3717d03ab1916b198bf0d49fa0a619 (diff)
ftrace: __start_mcount_loc should be .init.rodata
__start_mcount_loc[] is unused after init, yet occupies RAM forever as part of .rodata. 152kiB is typical on a 64-bit architecture. Instead, __start_mcount_loc should be in the interval [__init_begin, __init_end) so that the space is reclaimed after init. __start_mcount_loc[] is generated during the load portion of kernel build, and is used only by ftrace_init(). ftrace_init is declared '__init' and is in .init.text, which is freed after init. __start_mcount_loc is placed into .rodata by a call to MCOUNT_REC inside the RO_DATA macro of include/asm-generic/vmlinux.lds.h. The array *is* read-only, but more importantly it is not used after init. So the call to MCOUNT_REC should be moved from RO_DATA to INIT_DATA. This patch has been tested on x86_64 with CONFIG_DEBUG_PAGEALLOC=y which verifies that the address range never is accessed after init. Signed-off-by: John Reiser <jreiser@BitWagon.com> LKML-Reference: <4A6DF0B6.7080402@bitwagon.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'include/asm-generic')
-rw-r--r--include/asm-generic/vmlinux.lds.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 6ad76bf5fb40..98b37cf3ac6d 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -91,7 +91,8 @@
91#endif 91#endif
92 92
93#ifdef CONFIG_FTRACE_MCOUNT_RECORD 93#ifdef CONFIG_FTRACE_MCOUNT_RECORD
94#define MCOUNT_REC() VMLINUX_SYMBOL(__start_mcount_loc) = .; \ 94#define MCOUNT_REC() . = ALIGN(8); \
95 VMLINUX_SYMBOL(__start_mcount_loc) = .; \
95 *(__mcount_loc) \ 96 *(__mcount_loc) \
96 VMLINUX_SYMBOL(__stop_mcount_loc) = .; 97 VMLINUX_SYMBOL(__stop_mcount_loc) = .;
97#else 98#else
@@ -331,7 +332,6 @@
331 /* __*init sections */ \ 332 /* __*init sections */ \
332 __init_rodata : AT(ADDR(__init_rodata) - LOAD_OFFSET) { \ 333 __init_rodata : AT(ADDR(__init_rodata) - LOAD_OFFSET) { \
333 *(.ref.rodata) \ 334 *(.ref.rodata) \
334 MCOUNT_REC() \
335 DEV_KEEP(init.rodata) \ 335 DEV_KEEP(init.rodata) \
336 DEV_KEEP(exit.rodata) \ 336 DEV_KEEP(exit.rodata) \
337 CPU_KEEP(init.rodata) \ 337 CPU_KEEP(init.rodata) \
@@ -455,6 +455,7 @@
455 MEM_DISCARD(init.data) \ 455 MEM_DISCARD(init.data) \
456 KERNEL_CTORS() \ 456 KERNEL_CTORS() \
457 *(.init.rodata) \ 457 *(.init.rodata) \
458 MCOUNT_REC() \
458 DEV_DISCARD(init.rodata) \ 459 DEV_DISCARD(init.rodata) \
459 CPU_DISCARD(init.rodata) \ 460 CPU_DISCARD(init.rodata) \
460 MEM_DISCARD(init.rodata) 461 MEM_DISCARD(init.rodata)