2009-06-07 12:46:37 -06:00
|
|
|
/*
|
|
|
|
|
* Helper macros to support writing architecture specific
|
|
|
|
|
* linker scripts.
|
|
|
|
|
*
|
|
|
|
|
* A minimal linker scripts has following content:
|
|
|
|
|
* [This is a sample, architectures may have special requiriements]
|
|
|
|
|
*
|
|
|
|
|
* OUTPUT_FORMAT(...)
|
|
|
|
|
* OUTPUT_ARCH(...)
|
|
|
|
|
* ENTRY(...)
|
|
|
|
|
* SECTIONS
|
|
|
|
|
* {
|
|
|
|
|
* . = START;
|
|
|
|
|
* __init_begin = .;
|
2009-06-14 14:10:41 -06:00
|
|
|
* HEAD_TEXT_SECTION
|
2009-06-07 12:46:37 -06:00
|
|
|
* INIT_TEXT_SECTION(PAGE_SIZE)
|
|
|
|
|
* INIT_DATA_SECTION(...)
|
|
|
|
|
* PERCPU(PAGE_SIZE)
|
|
|
|
|
* __init_end = .;
|
|
|
|
|
*
|
|
|
|
|
* _stext = .;
|
|
|
|
|
* TEXT_SECTION = 0
|
|
|
|
|
* _etext = .;
|
|
|
|
|
*
|
|
|
|
|
* _sdata = .;
|
|
|
|
|
* RO_DATA_SECTION(PAGE_SIZE)
|
|
|
|
|
* RW_DATA_SECTION(...)
|
|
|
|
|
* _edata = .;
|
|
|
|
|
*
|
|
|
|
|
* EXCEPTION_TABLE(...)
|
|
|
|
|
* NOTES
|
|
|
|
|
*
|
2009-07-12 16:23:33 -06:00
|
|
|
* BSS_SECTION(0, 0, 0)
|
2009-06-07 12:46:37 -06:00
|
|
|
* _end = .;
|
|
|
|
|
*
|
|
|
|
|
* STABS_DEBUG
|
|
|
|
|
* DWARF_DEBUG
|
linker script: unify usage of discard definition
Discarded sections in different archs share some commonality but have
considerable differences. This led to linker script for each arch
implementing its own /DISCARD/ definition, which makes maintaining
tedious and adding new entries error-prone.
This patch makes all linker scripts to move discard definitions to the
end of the linker script and use the common DISCARDS macro. As ld
uses the first matching section definition, archs can include default
discarded sections by including them earlier in the linker script.
ia64 is notable because it first throws away some ia64 specific
subsections and then include the rest of the sections into the final
image, so those sections must be discarded before the inclusion.
defconfig compile tested for x86, x86-64, powerpc, powerpc64, ia64,
alpha, sparc, sparc64 and s390. Michal Simek tested microblaze.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Tested-by: Michal Simek <monstr@monstr.eu>
Cc: linux-arch@vger.kernel.org
Cc: Michal Simek <monstr@monstr.eu>
Cc: microblaze-uclinux@itee.uq.edu.au
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Tony Luck <tony.luck@intel.com>
2009-07-08 20:27:40 -06:00
|
|
|
*
|
|
|
|
|
* DISCARDS // must be the last
|
2009-06-07 12:46:37 -06:00
|
|
|
* }
|
|
|
|
|
*
|
|
|
|
|
* [__init_begin, __init_end] is the init section that may be freed after init
|
|
|
|
|
* [_stext, _etext] is the text section
|
|
|
|
|
* [_sdata, _edata] is the data section
|
|
|
|
|
*
|
|
|
|
|
* Some of the included output section have their own set of constants.
|
|
|
|
|
* Examples are: [__initramfs_start, __initramfs_end] for initramfs and
|
|
|
|
|
* [__nosave_begin, __nosave_end] for the nosave data
|
|
|
|
|
*/
|
2009-04-25 20:10:56 -06:00
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
#ifndef LOAD_OFFSET
|
|
|
|
|
#define LOAD_OFFSET 0
|
|
|
|
|
#endif
|
|
|
|
|
|
2009-11-07 14:03:54 -07:00
|
|
|
#ifndef SYMBOL_PREFIX
|
|
|
|
|
#define VMLINUX_SYMBOL(sym) sym
|
|
|
|
|
#else
|
|
|
|
|
#define PASTE2(x,y) x##y
|
|
|
|
|
#define PASTE(x,y) PASTE2(x,y)
|
|
|
|
|
#define VMLINUX_SYMBOL(sym) PASTE(SYMBOL_PREFIX, sym)
|
2005-04-16 16:20:36 -06:00
|
|
|
#endif
|
|
|
|
|
|
2005-07-14 14:15:44 -06:00
|
|
|
/* Align . to a 8 byte boundary equals to maximum function alignment. */
|
|
|
|
|
#define ALIGN_FUNCTION() . = ALIGN(8)
|
|
|
|
|
|
2010-07-10 00:35:00 -06:00
|
|
|
/*
|
|
|
|
|
* Align to a 32 byte boundary equal to the
|
|
|
|
|
* alignment gcc 4.5 uses for a struct
|
|
|
|
|
*/
|
|
|
|
|
#define STRUCT_ALIGN() . = ALIGN(32)
|
|
|
|
|
|
2008-01-20 12:07:28 -07:00
|
|
|
/* The actual configuration determine if the init/exit sections
|
|
|
|
|
* are handled as text/data or they can be discarded (which
|
|
|
|
|
* often happens at runtime)
|
|
|
|
|
*/
|
|
|
|
|
#ifdef CONFIG_HOTPLUG
|
|
|
|
|
#define DEV_KEEP(sec) *(.dev##sec)
|
|
|
|
|
#define DEV_DISCARD(sec)
|
|
|
|
|
#else
|
|
|
|
|
#define DEV_KEEP(sec)
|
|
|
|
|
#define DEV_DISCARD(sec) *(.dev##sec)
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#ifdef CONFIG_HOTPLUG_CPU
|
|
|
|
|
#define CPU_KEEP(sec) *(.cpu##sec)
|
|
|
|
|
#define CPU_DISCARD(sec)
|
|
|
|
|
#else
|
|
|
|
|
#define CPU_KEEP(sec)
|
|
|
|
|
#define CPU_DISCARD(sec) *(.cpu##sec)
|
|
|
|
|
#endif
|
|
|
|
|
|
2008-01-24 14:20:18 -07:00
|
|
|
#if defined(CONFIG_MEMORY_HOTPLUG)
|
2008-01-20 12:07:28 -07:00
|
|
|
#define MEM_KEEP(sec) *(.mem##sec)
|
|
|
|
|
#define MEM_DISCARD(sec)
|
|
|
|
|
#else
|
|
|
|
|
#define MEM_KEEP(sec)
|
|
|
|
|
#define MEM_DISCARD(sec) *(.mem##sec)
|
|
|
|
|
#endif
|
|
|
|
|
|
ftrace: create __mcount_loc section
This patch creates a section in the kernel called "__mcount_loc".
This will hold a list of pointers to the mcount relocation for
each call site of mcount.
For example:
objdump -dr init/main.o
[...]
Disassembly of section .text:
0000000000000000 <do_one_initcall>:
0: 55 push %rbp
[...]
000000000000017b <init_post>:
17b: 55 push %rbp
17c: 48 89 e5 mov %rsp,%rbp
17f: 53 push %rbx
180: 48 83 ec 08 sub $0x8,%rsp
184: e8 00 00 00 00 callq 189 <init_post+0xe>
185: R_X86_64_PC32 mcount+0xfffffffffffffffc
[...]
We will add a section to point to each function call.
.section __mcount_loc,"a",@progbits
[...]
.quad .text + 0x185
[...]
The offset to of the mcount call site in init_post is an offset from
the start of the section, and not the start of the function init_post.
The mcount relocation is at the call site 0x185 from the start of the
.text section.
.text + 0x185 == init_post + 0xa
We need a way to add this __mcount_loc section in a way that we do not
lose the relocations after final link. The .text section here will
be attached to all other .text sections after final link and the
offsets will be meaningless. We need to keep track of where these
.text sections are.
To do this, we use the start of the first function in the section.
do_one_initcall. We can make a tmp.s file with this function as a reference
to the start of the .text section.
.section __mcount_loc,"a",@progbits
[...]
.quad do_one_initcall + 0x185
[...]
Then we can compile the tmp.s into a tmp.o
gcc -c tmp.s -o tmp.o
And link it into back into main.o.
ld -r main.o tmp.o -o tmp_main.o
mv tmp_main.o main.o
But we have a problem. What happens if the first function in a section
is not exported, and is a static function. The linker will not let
the tmp.o use it. This case exists in main.o as well.
Disassembly of section .init.text:
0000000000000000 <set_reset_devices>:
0: 55 push %rbp
1: 48 89 e5 mov %rsp,%rbp
4: e8 00 00 00 00 callq 9 <set_reset_devices+0x9>
5: R_X86_64_PC32 mcount+0xfffffffffffffffc
The first function in .init.text is a static function.
00000000000000a8 t __setup_set_reset_devices
000000000000105f t __setup_str_set_reset_devices
0000000000000000 t set_reset_devices
The lowercase 't' means that set_reset_devices is local and is not exported.
If we simply try to link the tmp.o with the set_reset_devices we end
up with two symbols: one local and one global.
.section __mcount_loc,"a",@progbits
.quad set_reset_devices + 0x10
00000000000000a8 t __setup_set_reset_devices
000000000000105f t __setup_str_set_reset_devices
0000000000000000 t set_reset_devices
U set_reset_devices
We still have an undefined reference to set_reset_devices, and if we try
to compile the kernel, we will end up with an undefined reference to
set_reset_devices, or even worst, it could be exported someplace else,
and then we will have a reference to the wrong location.
To handle this case, we make an intermediate step using objcopy.
We convert set_reset_devices into a global exported symbol before linking
it with tmp.o and set it back afterwards.
00000000000000a8 t __setup_set_reset_devices
000000000000105f t __setup_str_set_reset_devices
0000000000000000 T set_reset_devices
00000000000000a8 t __setup_set_reset_devices
000000000000105f t __setup_str_set_reset_devices
0000000000000000 T set_reset_devices
00000000000000a8 t __setup_set_reset_devices
000000000000105f t __setup_str_set_reset_devices
0000000000000000 t set_reset_devices
Now we have a section in main.o called __mcount_loc that we can place
somewhere in the kernel using vmlinux.ld.S and access it to convert
all these locations that call mcount into nops before starting SMP
and thus, eliminating the need to do this with kstop_machine.
Note, A well documented perl script (scripts/recordmcount.pl) is used
to do all this in one location.
Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2008-08-14 13:45:07 -06:00
|
|
|
#ifdef CONFIG_FTRACE_MCOUNT_RECORD
|
2009-07-27 12:23:50 -06:00
|
|
|
#define MCOUNT_REC() . = ALIGN(8); \
|
|
|
|
|
VMLINUX_SYMBOL(__start_mcount_loc) = .; \
|
ftrace: create __mcount_loc section
This patch creates a section in the kernel called "__mcount_loc".
This will hold a list of pointers to the mcount relocation for
each call site of mcount.
For example:
objdump -dr init/main.o
[...]
Disassembly of section .text:
0000000000000000 <do_one_initcall>:
0: 55 push %rbp
[...]
000000000000017b <init_post>:
17b: 55 push %rbp
17c: 48 89 e5 mov %rsp,%rbp
17f: 53 push %rbx
180: 48 83 ec 08 sub $0x8,%rsp
184: e8 00 00 00 00 callq 189 <init_post+0xe>
185: R_X86_64_PC32 mcount+0xfffffffffffffffc
[...]
We will add a section to point to each function call.
.section __mcount_loc,"a",@progbits
[...]
.quad .text + 0x185
[...]
The offset to of the mcount call site in init_post is an offset from
the start of the section, and not the start of the function init_post.
The mcount relocation is at the call site 0x185 from the start of the
.text section.
.text + 0x185 == init_post + 0xa
We need a way to add this __mcount_loc section in a way that we do not
lose the relocations after final link. The .text section here will
be attached to all other .text sections after final link and the
offsets will be meaningless. We need to keep track of where these
.text sections are.
To do this, we use the start of the first function in the section.
do_one_initcall. We can make a tmp.s file with this function as a reference
to the start of the .text section.
.section __mcount_loc,"a",@progbits
[...]
.quad do_one_initcall + 0x185
[...]
Then we can compile the tmp.s into a tmp.o
gcc -c tmp.s -o tmp.o
And link it into back into main.o.
ld -r main.o tmp.o -o tmp_main.o
mv tmp_main.o main.o
But we have a problem. What happens if the first function in a section
is not exported, and is a static function. The linker will not let
the tmp.o use it. This case exists in main.o as well.
Disassembly of section .init.text:
0000000000000000 <set_reset_devices>:
0: 55 push %rbp
1: 48 89 e5 mov %rsp,%rbp
4: e8 00 00 00 00 callq 9 <set_reset_devices+0x9>
5: R_X86_64_PC32 mcount+0xfffffffffffffffc
The first function in .init.text is a static function.
00000000000000a8 t __setup_set_reset_devices
000000000000105f t __setup_str_set_reset_devices
0000000000000000 t set_reset_devices
The lowercase 't' means that set_reset_devices is local and is not exported.
If we simply try to link the tmp.o with the set_reset_devices we end
up with two symbols: one local and one global.
.section __mcount_loc,"a",@progbits
.quad set_reset_devices + 0x10
00000000000000a8 t __setup_set_reset_devices
000000000000105f t __setup_str_set_reset_devices
0000000000000000 t set_reset_devices
U set_reset_devices
We still have an undefined reference to set_reset_devices, and if we try
to compile the kernel, we will end up with an undefined reference to
set_reset_devices, or even worst, it could be exported someplace else,
and then we will have a reference to the wrong location.
To handle this case, we make an intermediate step using objcopy.
We convert set_reset_devices into a global exported symbol before linking
it with tmp.o and set it back afterwards.
00000000000000a8 t __setup_set_reset_devices
000000000000105f t __setup_str_set_reset_devices
0000000000000000 T set_reset_devices
00000000000000a8 t __setup_set_reset_devices
000000000000105f t __setup_str_set_reset_devices
0000000000000000 T set_reset_devices
00000000000000a8 t __setup_set_reset_devices
000000000000105f t __setup_str_set_reset_devices
0000000000000000 t set_reset_devices
Now we have a section in main.o called __mcount_loc that we can place
somewhere in the kernel using vmlinux.ld.S and access it to convert
all these locations that call mcount into nops before starting SMP
and thus, eliminating the need to do this with kstop_machine.
Note, A well documented perl script (scripts/recordmcount.pl) is used
to do all this in one location.
Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2008-08-14 13:45:07 -06:00
|
|
|
*(__mcount_loc) \
|
|
|
|
|
VMLINUX_SYMBOL(__stop_mcount_loc) = .;
|
|
|
|
|
#else
|
|
|
|
|
#define MCOUNT_REC()
|
|
|
|
|
#endif
|
2008-01-20 12:07:28 -07:00
|
|
|
|
2008-11-12 13:24:24 -07:00
|
|
|
#ifdef CONFIG_TRACE_BRANCH_PROFILING
|
2008-11-20 22:40:40 -07:00
|
|
|
#define LIKELY_PROFILE() VMLINUX_SYMBOL(__start_annotated_branch_profile) = .; \
|
|
|
|
|
*(_ftrace_annotated_branch) \
|
|
|
|
|
VMLINUX_SYMBOL(__stop_annotated_branch_profile) = .;
|
2008-11-11 22:14:39 -07:00
|
|
|
#else
|
|
|
|
|
#define LIKELY_PROFILE()
|
|
|
|
|
#endif
|
|
|
|
|
|
2008-11-20 23:30:54 -07:00
|
|
|
#ifdef CONFIG_PROFILE_ALL_BRANCHES
|
|
|
|
|
#define BRANCH_PROFILE() VMLINUX_SYMBOL(__start_branch_profile) = .; \
|
|
|
|
|
*(_ftrace_branch) \
|
|
|
|
|
VMLINUX_SYMBOL(__stop_branch_profile) = .;
|
|
|
|
|
#else
|
|
|
|
|
#define BRANCH_PROFILE()
|
|
|
|
|
#endif
|
|
|
|
|
|
2009-04-08 02:14:01 -06:00
|
|
|
#ifdef CONFIG_EVENT_TRACING
|
2009-02-24 08:21:36 -07:00
|
|
|
#define FTRACE_EVENTS() VMLINUX_SYMBOL(__start_ftrace_events) = .; \
|
|
|
|
|
*(_ftrace_events) \
|
|
|
|
|
VMLINUX_SYMBOL(__stop_ftrace_events) = .;
|
|
|
|
|
#else
|
|
|
|
|
#define FTRACE_EVENTS()
|
|
|
|
|
#endif
|
|
|
|
|
|
2009-03-06 09:21:48 -07:00
|
|
|
#ifdef CONFIG_TRACING
|
|
|
|
|
#define TRACE_PRINTKS() VMLINUX_SYMBOL(__start___trace_bprintk_fmt) = .; \
|
|
|
|
|
*(__trace_printk_fmt) /* Trace_printk fmt' pointer */ \
|
|
|
|
|
VMLINUX_SYMBOL(__stop___trace_bprintk_fmt) = .;
|
|
|
|
|
#else
|
|
|
|
|
#define TRACE_PRINTKS()
|
|
|
|
|
#endif
|
|
|
|
|
|
2009-03-13 08:42:11 -06:00
|
|
|
#ifdef CONFIG_FTRACE_SYSCALLS
|
|
|
|
|
#define TRACE_SYSCALLS() VMLINUX_SYMBOL(__start_syscalls_metadata) = .; \
|
|
|
|
|
*(__syscalls_metadata) \
|
|
|
|
|
VMLINUX_SYMBOL(__stop_syscalls_metadata) = .;
|
|
|
|
|
#else
|
|
|
|
|
#define TRACE_SYSCALLS()
|
|
|
|
|
#endif
|
|
|
|
|
|
2007-05-17 05:38:44 -06:00
|
|
|
/* .data section */
|
|
|
|
|
#define DATA_DATA \
|
2007-05-17 12:14:48 -06:00
|
|
|
*(.data) \
|
2008-01-28 12:21:15 -07:00
|
|
|
*(.ref.data) \
|
2010-10-26 15:22:29 -06:00
|
|
|
*(.data..shared_aligned) /* percpu related */ \
|
2008-01-20 12:07:28 -07:00
|
|
|
DEV_KEEP(init.data) \
|
|
|
|
|
DEV_KEEP(exit.data) \
|
|
|
|
|
CPU_KEEP(init.data) \
|
|
|
|
|
CPU_KEEP(exit.data) \
|
|
|
|
|
MEM_KEEP(init.data) \
|
|
|
|
|
MEM_KEEP(exit.data) \
|
2008-11-14 15:47:47 -07:00
|
|
|
. = ALIGN(32); \
|
tracing: Kernel Tracepoints
Implementation of kernel tracepoints. Inspired from the Linux Kernel
Markers. Allows complete typing verification by declaring both tracing
statement inline functions and probe registration/unregistration static
inline functions within the same macro "DEFINE_TRACE". No format string
is required. See the tracepoint Documentation and Samples patches for
usage examples.
Taken from the documentation patch :
"A tracepoint placed in code provides a hook to call a function (probe)
that you can provide at runtime. A tracepoint can be "on" (a probe is
connected to it) or "off" (no probe is attached). When a tracepoint is
"off" it has no effect, except for adding a tiny time penalty (checking
a condition for a branch) and space penalty (adding a few bytes for the
function call at the end of the instrumented function and adds a data
structure in a separate section). When a tracepoint is "on", the
function you provide is called each time the tracepoint is executed, in
the execution context of the caller. When the function provided ends its
execution, it returns to the caller (continuing from the tracepoint
site).
You can put tracepoints at important locations in the code. They are
lightweight hooks that can pass an arbitrary number of parameters, which
prototypes are described in a tracepoint declaration placed in a header
file."
Addition and removal of tracepoints is synchronized by RCU using the
scheduler (and preempt_disable) as guarantees to find a quiescent state
(this is really RCU "classic"). The update side uses rcu_barrier_sched()
with call_rcu_sched() and the read/execute side uses
"preempt_disable()/preempt_enable()".
We make sure the previous array containing probes, which has been
scheduled for deletion by the rcu callback, is indeed freed before we
proceed to the next update. It therefore limits the rate of modification
of a single tracepoint to one update per RCU period. The objective here
is to permit fast batch add/removal of probes on _different_
tracepoints.
Changelog :
- Use #name ":" #proto as string to identify the tracepoint in the
tracepoint table. This will make sure not type mismatch happens due to
connexion of a probe with the wrong type to a tracepoint declared with
the same name in a different header.
- Add tracepoint_entry_free_old.
- Change __TO_TRACE to get rid of the 'i' iterator.
Masami Hiramatsu <mhiramat@redhat.com> :
Tested on x86-64.
Performance impact of a tracepoint : same as markers, except that it
adds about 70 bytes of instructions in an unlikely branch of each
instrumented function (the for loop, the stack setup and the function
call). It currently adds a memory read, a test and a conditional branch
at the instrumentation site (in the hot path). Immediate values will
eventually change this into a load immediate, test and branch, which
removes the memory read which will make the i-cache impact smaller
(changing the memory read for a load immediate removes 3-4 bytes per
site on x86_32 (depending on mov prefixes), or 7-8 bytes on x86_64, it
also saves the d-cache hit).
About the performance impact of tracepoints (which is comparable to
markers), even without immediate values optimizations, tests done by
Hideo Aoki on ia64 show no regression. His test case was using hackbench
on a kernel where scheduler instrumentation (about 5 events in code
scheduler code) was added.
Quoting Hideo Aoki about Markers :
I evaluated overhead of kernel marker using linux-2.6-sched-fixes git
tree, which includes several markers for LTTng, using an ia64 server.
While the immediate trace mark feature isn't implemented on ia64, there
is no major performance regression. So, I think that we don't have any
issues to propose merging marker point patches into Linus's tree from
the viewpoint of performance impact.
I prepared two kernels to evaluate. The first one was compiled without
CONFIG_MARKERS. The second one was enabled CONFIG_MARKERS.
I downloaded the original hackbench from the following URL:
http://devresources.linux-foundation.org/craiger/hackbench/src/hackbench.c
I ran hackbench 5 times in each condition and calculated the average and
difference between the kernels.
The parameter of hackbench: every 50 from 50 to 800
The number of CPUs of the server: 2, 4, and 8
Below is the results. As you can see, major performance regression
wasn't found in any case. Even if number of processes increases,
differences between marker-enabled kernel and marker- disabled kernel
doesn't increase. Moreover, if number of CPUs increases, the differences
doesn't increase either.
Curiously, marker-enabled kernel is better than marker-disabled kernel
in more than half cases, although I guess it comes from the difference
of memory access pattern.
* 2 CPUs
Number of | without | with | diff | diff |
processes | Marker [Sec] | Marker [Sec] | [Sec] | [%] |
--------------------------------------------------------------
50 | 4.811 | 4.872 | +0.061 | +1.27 |
100 | 9.854 | 10.309 | +0.454 | +4.61 |
150 | 15.602 | 15.040 | -0.562 | -3.6 |
200 | 20.489 | 20.380 | -0.109 | -0.53 |
250 | 25.798 | 25.652 | -0.146 | -0.56 |
300 | 31.260 | 30.797 | -0.463 | -1.48 |
350 | 36.121 | 35.770 | -0.351 | -0.97 |
400 | 42.288 | 42.102 | -0.186 | -0.44 |
450 | 47.778 | 47.253 | -0.526 | -1.1 |
500 | 51.953 | 52.278 | +0.325 | +0.63 |
550 | 58.401 | 57.700 | -0.701 | -1.2 |
600 | 63.334 | 63.222 | -0.112 | -0.18 |
650 | 68.816 | 68.511 | -0.306 | -0.44 |
700 | 74.667 | 74.088 | -0.579 | -0.78 |
750 | 78.612 | 79.582 | +0.970 | +1.23 |
800 | 85.431 | 85.263 | -0.168 | -0.2 |
--------------------------------------------------------------
* 4 CPUs
Number of | without | with | diff | diff |
processes | Marker [Sec] | Marker [Sec] | [Sec] | [%] |
--------------------------------------------------------------
50 | 2.586 | 2.584 | -0.003 | -0.1 |
100 | 5.254 | 5.283 | +0.030 | +0.56 |
150 | 8.012 | 8.074 | +0.061 | +0.76 |
200 | 11.172 | 11.000 | -0.172 | -1.54 |
250 | 13.917 | 14.036 | +0.119 | +0.86 |
300 | 16.905 | 16.543 | -0.362 | -2.14 |
350 | 19.901 | 20.036 | +0.135 | +0.68 |
400 | 22.908 | 23.094 | +0.186 | +0.81 |
450 | 26.273 | 26.101 | -0.172 | -0.66 |
500 | 29.554 | 29.092 | -0.461 | -1.56 |
550 | 32.377 | 32.274 | -0.103 | -0.32 |
600 | 35.855 | 35.322 | -0.533 | -1.49 |
650 | 39.192 | 38.388 | -0.804 | -2.05 |
700 | 41.744 | 41.719 | -0.025 | -0.06 |
750 | 45.016 | 44.496 | -0.520 | -1.16 |
800 | 48.212 | 47.603 | -0.609 | -1.26 |
--------------------------------------------------------------
* 8 CPUs
Number of | without | with | diff | diff |
processes | Marker [Sec] | Marker [Sec] | [Sec] | [%] |
--------------------------------------------------------------
50 | 2.094 | 2.072 | -0.022 | -1.07 |
100 | 4.162 | 4.273 | +0.111 | +2.66 |
150 | 6.485 | 6.540 | +0.055 | +0.84 |
200 | 8.556 | 8.478 | -0.078 | -0.91 |
250 | 10.458 | 10.258 | -0.200 | -1.91 |
300 | 12.425 | 12.750 | +0.325 | +2.62 |
350 | 14.807 | 14.839 | +0.032 | +0.22 |
400 | 16.801 | 16.959 | +0.158 | +0.94 |
450 | 19.478 | 19.009 | -0.470 | -2.41 |
500 | 21.296 | 21.504 | +0.208 | +0.98 |
550 | 23.842 | 23.979 | +0.137 | +0.57 |
600 | 26.309 | 26.111 | -0.198 | -0.75 |
650 | 28.705 | 28.446 | -0.259 | -0.9 |
700 | 31.233 | 31.394 | +0.161 | +0.52 |
750 | 34.064 | 33.720 | -0.344 | -1.01 |
800 | 36.320 | 36.114 | -0.206 | -0.57 |
--------------------------------------------------------------
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Acked-by: Masami Hiramatsu <mhiramat@redhat.com>
Acked-by: 'Peter Zijlstra' <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2008-07-18 10:16:16 -06:00
|
|
|
VMLINUX_SYMBOL(__start___tracepoints) = .; \
|
|
|
|
|
*(__tracepoints) \
|
2008-11-11 22:14:39 -07:00
|
|
|
VMLINUX_SYMBOL(__stop___tracepoints) = .; \
|
2009-02-05 09:51:38 -07:00
|
|
|
/* implement dynamic printk debug */ \
|
|
|
|
|
. = ALIGN(8); \
|
|
|
|
|
VMLINUX_SYMBOL(__start___verbose) = .; \
|
|
|
|
|
*(__verbose) \
|
|
|
|
|
VMLINUX_SYMBOL(__stop___verbose) = .; \
|
2008-11-20 23:30:54 -07:00
|
|
|
LIKELY_PROFILE() \
|
2009-02-24 08:21:36 -07:00
|
|
|
BRANCH_PROFILE() \
|
2009-03-09 03:09:06 -06:00
|
|
|
TRACE_PRINTKS() \
|
2010-07-10 00:35:00 -06:00
|
|
|
\
|
|
|
|
|
STRUCT_ALIGN(); \
|
2009-03-13 08:42:11 -06:00
|
|
|
FTRACE_EVENTS() \
|
2010-07-10 00:35:00 -06:00
|
|
|
\
|
|
|
|
|
STRUCT_ALIGN(); \
|
2009-03-13 08:42:11 -06:00
|
|
|
TRACE_SYSCALLS()
|
2007-05-17 05:38:44 -06:00
|
|
|
|
2009-06-07 12:46:37 -06:00
|
|
|
/*
|
|
|
|
|
* Data section helpers
|
|
|
|
|
*/
|
|
|
|
|
#define NOSAVE_DATA \
|
|
|
|
|
. = ALIGN(PAGE_SIZE); \
|
|
|
|
|
VMLINUX_SYMBOL(__nosave_begin) = .; \
|
2010-02-19 17:03:52 -07:00
|
|
|
*(.data..nosave) \
|
2009-06-07 12:46:37 -06:00
|
|
|
. = ALIGN(PAGE_SIZE); \
|
|
|
|
|
VMLINUX_SYMBOL(__nosave_end) = .;
|
|
|
|
|
|
|
|
|
|
#define PAGE_ALIGNED_DATA(page_align) \
|
|
|
|
|
. = ALIGN(page_align); \
|
2010-02-19 17:03:37 -07:00
|
|
|
*(.data..page_aligned)
|
2009-06-07 12:46:37 -06:00
|
|
|
|
|
|
|
|
#define READ_MOSTLY_DATA(align) \
|
|
|
|
|
. = ALIGN(align); \
|
2010-02-19 17:03:44 -07:00
|
|
|
*(.data..read_mostly)
|
2009-06-07 12:46:37 -06:00
|
|
|
|
|
|
|
|
#define CACHELINE_ALIGNED_DATA(align) \
|
|
|
|
|
. = ALIGN(align); \
|
2010-02-19 17:03:34 -07:00
|
|
|
*(.data..cacheline_aligned)
|
2009-06-07 12:46:37 -06:00
|
|
|
|
2009-06-23 16:53:15 -06:00
|
|
|
#define INIT_TASK_DATA(align) \
|
2009-06-07 12:46:37 -06:00
|
|
|
. = ALIGN(align); \
|
2010-02-19 17:03:35 -07:00
|
|
|
*(.data..init_task)
|
2009-06-07 12:46:37 -06:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Read only Data
|
|
|
|
|
*/
|
|
|
|
|
#define RO_DATA_SECTION(align) \
|
2007-05-29 13:29:00 -06:00
|
|
|
. = ALIGN((align)); \
|
2005-04-16 16:20:36 -06:00
|
|
|
.rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
|
2006-12-06 18:14:03 -07:00
|
|
|
VMLINUX_SYMBOL(__start_rodata) = .; \
|
2005-04-16 16:20:36 -06:00
|
|
|
*(.rodata) *(.rodata.*) \
|
|
|
|
|
*(__vermagic) /* Kernel version magic */ \
|
2007-10-19 00:41:06 -06:00
|
|
|
*(__markers_strings) /* Markers: strings */ \
|
tracing: Kernel Tracepoints
Implementation of kernel tracepoints. Inspired from the Linux Kernel
Markers. Allows complete typing verification by declaring both tracing
statement inline functions and probe registration/unregistration static
inline functions within the same macro "DEFINE_TRACE". No format string
is required. See the tracepoint Documentation and Samples patches for
usage examples.
Taken from the documentation patch :
"A tracepoint placed in code provides a hook to call a function (probe)
that you can provide at runtime. A tracepoint can be "on" (a probe is
connected to it) or "off" (no probe is attached). When a tracepoint is
"off" it has no effect, except for adding a tiny time penalty (checking
a condition for a branch) and space penalty (adding a few bytes for the
function call at the end of the instrumented function and adds a data
structure in a separate section). When a tracepoint is "on", the
function you provide is called each time the tracepoint is executed, in
the execution context of the caller. When the function provided ends its
execution, it returns to the caller (continuing from the tracepoint
site).
You can put tracepoints at important locations in the code. They are
lightweight hooks that can pass an arbitrary number of parameters, which
prototypes are described in a tracepoint declaration placed in a header
file."
Addition and removal of tracepoints is synchronized by RCU using the
scheduler (and preempt_disable) as guarantees to find a quiescent state
(this is really RCU "classic"). The update side uses rcu_barrier_sched()
with call_rcu_sched() and the read/execute side uses
"preempt_disable()/preempt_enable()".
We make sure the previous array containing probes, which has been
scheduled for deletion by the rcu callback, is indeed freed before we
proceed to the next update. It therefore limits the rate of modification
of a single tracepoint to one update per RCU period. The objective here
is to permit fast batch add/removal of probes on _different_
tracepoints.
Changelog :
- Use #name ":" #proto as string to identify the tracepoint in the
tracepoint table. This will make sure not type mismatch happens due to
connexion of a probe with the wrong type to a tracepoint declared with
the same name in a different header.
- Add tracepoint_entry_free_old.
- Change __TO_TRACE to get rid of the 'i' iterator.
Masami Hiramatsu <mhiramat@redhat.com> :
Tested on x86-64.
Performance impact of a tracepoint : same as markers, except that it
adds about 70 bytes of instructions in an unlikely branch of each
instrumented function (the for loop, the stack setup and the function
call). It currently adds a memory read, a test and a conditional branch
at the instrumentation site (in the hot path). Immediate values will
eventually change this into a load immediate, test and branch, which
removes the memory read which will make the i-cache impact smaller
(changing the memory read for a load immediate removes 3-4 bytes per
site on x86_32 (depending on mov prefixes), or 7-8 bytes on x86_64, it
also saves the d-cache hit).
About the performance impact of tracepoints (which is comparable to
markers), even without immediate values optimizations, tests done by
Hideo Aoki on ia64 show no regression. His test case was using hackbench
on a kernel where scheduler instrumentation (about 5 events in code
scheduler code) was added.
Quoting Hideo Aoki about Markers :
I evaluated overhead of kernel marker using linux-2.6-sched-fixes git
tree, which includes several markers for LTTng, using an ia64 server.
While the immediate trace mark feature isn't implemented on ia64, there
is no major performance regression. So, I think that we don't have any
issues to propose merging marker point patches into Linus's tree from
the viewpoint of performance impact.
I prepared two kernels to evaluate. The first one was compiled without
CONFIG_MARKERS. The second one was enabled CONFIG_MARKERS.
I downloaded the original hackbench from the following URL:
http://devresources.linux-foundation.org/craiger/hackbench/src/hackbench.c
I ran hackbench 5 times in each condition and calculated the average and
difference between the kernels.
The parameter of hackbench: every 50 from 50 to 800
The number of CPUs of the server: 2, 4, and 8
Below is the results. As you can see, major performance regression
wasn't found in any case. Even if number of processes increases,
differences between marker-enabled kernel and marker- disabled kernel
doesn't increase. Moreover, if number of CPUs increases, the differences
doesn't increase either.
Curiously, marker-enabled kernel is better than marker-disabled kernel
in more than half cases, although I guess it comes from the difference
of memory access pattern.
* 2 CPUs
Number of | without | with | diff | diff |
processes | Marker [Sec] | Marker [Sec] | [Sec] | [%] |
--------------------------------------------------------------
50 | 4.811 | 4.872 | +0.061 | +1.27 |
100 | 9.854 | 10.309 | +0.454 | +4.61 |
150 | 15.602 | 15.040 | -0.562 | -3.6 |
200 | 20.489 | 20.380 | -0.109 | -0.53 |
250 | 25.798 | 25.652 | -0.146 | -0.56 |
300 | 31.260 | 30.797 | -0.463 | -1.48 |
350 | 36.121 | 35.770 | -0.351 | -0.97 |
400 | 42.288 | 42.102 | -0.186 | -0.44 |
450 | 47.778 | 47.253 | -0.526 | -1.1 |
500 | 51.953 | 52.278 | +0.325 | +0.63 |
550 | 58.401 | 57.700 | -0.701 | -1.2 |
600 | 63.334 | 63.222 | -0.112 | -0.18 |
650 | 68.816 | 68.511 | -0.306 | -0.44 |
700 | 74.667 | 74.088 | -0.579 | -0.78 |
750 | 78.612 | 79.582 | +0.970 | +1.23 |
800 | 85.431 | 85.263 | -0.168 | -0.2 |
--------------------------------------------------------------
* 4 CPUs
Number of | without | with | diff | diff |
processes | Marker [Sec] | Marker [Sec] | [Sec] | [%] |
--------------------------------------------------------------
50 | 2.586 | 2.584 | -0.003 | -0.1 |
100 | 5.254 | 5.283 | +0.030 | +0.56 |
150 | 8.012 | 8.074 | +0.061 | +0.76 |
200 | 11.172 | 11.000 | -0.172 | -1.54 |
250 | 13.917 | 14.036 | +0.119 | +0.86 |
300 | 16.905 | 16.543 | -0.362 | -2.14 |
350 | 19.901 | 20.036 | +0.135 | +0.68 |
400 | 22.908 | 23.094 | +0.186 | +0.81 |
450 | 26.273 | 26.101 | -0.172 | -0.66 |
500 | 29.554 | 29.092 | -0.461 | -1.56 |
550 | 32.377 | 32.274 | -0.103 | -0.32 |
600 | 35.855 | 35.322 | -0.533 | -1.49 |
650 | 39.192 | 38.388 | -0.804 | -2.05 |
700 | 41.744 | 41.719 | -0.025 | -0.06 |
750 | 45.016 | 44.496 | -0.520 | -1.16 |
800 | 48.212 | 47.603 | -0.609 | -1.26 |
--------------------------------------------------------------
* 8 CPUs
Number of | without | with | diff | diff |
processes | Marker [Sec] | Marker [Sec] | [Sec] | [%] |
--------------------------------------------------------------
50 | 2.094 | 2.072 | -0.022 | -1.07 |
100 | 4.162 | 4.273 | +0.111 | +2.66 |
150 | 6.485 | 6.540 | +0.055 | +0.84 |
200 | 8.556 | 8.478 | -0.078 | -0.91 |
250 | 10.458 | 10.258 | -0.200 | -1.91 |
300 | 12.425 | 12.750 | +0.325 | +2.62 |
350 | 14.807 | 14.839 | +0.032 | +0.22 |
400 | 16.801 | 16.959 | +0.158 | +0.94 |
450 | 19.478 | 19.009 | -0.470 | -2.41 |
500 | 21.296 | 21.504 | +0.208 | +0.98 |
550 | 23.842 | 23.979 | +0.137 | +0.57 |
600 | 26.309 | 26.111 | -0.198 | -0.75 |
650 | 28.705 | 28.446 | -0.259 | -0.9 |
700 | 31.233 | 31.394 | +0.161 | +0.52 |
750 | 34.064 | 33.720 | -0.344 | -1.01 |
800 | 36.320 | 36.114 | -0.206 | -0.57 |
--------------------------------------------------------------
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Acked-by: Masami Hiramatsu <mhiramat@redhat.com>
Acked-by: 'Peter Zijlstra' <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2008-07-18 10:16:16 -06:00
|
|
|
*(__tracepoints_strings)/* Tracepoints: strings */ \
|
2005-04-16 16:20:36 -06:00
|
|
|
} \
|
|
|
|
|
\
|
|
|
|
|
.rodata1 : AT(ADDR(.rodata1) - LOAD_OFFSET) { \
|
|
|
|
|
*(.rodata1) \
|
|
|
|
|
} \
|
|
|
|
|
\
|
2008-05-12 07:44:41 -06:00
|
|
|
BUG_TABLE \
|
|
|
|
|
\
|
2010-09-17 09:09:00 -06:00
|
|
|
JUMP_TABLE \
|
|
|
|
|
\
|
2005-04-16 16:20:36 -06:00
|
|
|
/* PCI quirks */ \
|
|
|
|
|
.pci_fixup : AT(ADDR(.pci_fixup) - LOAD_OFFSET) { \
|
|
|
|
|
VMLINUX_SYMBOL(__start_pci_fixups_early) = .; \
|
|
|
|
|
*(.pci_fixup_early) \
|
|
|
|
|
VMLINUX_SYMBOL(__end_pci_fixups_early) = .; \
|
|
|
|
|
VMLINUX_SYMBOL(__start_pci_fixups_header) = .; \
|
|
|
|
|
*(.pci_fixup_header) \
|
|
|
|
|
VMLINUX_SYMBOL(__end_pci_fixups_header) = .; \
|
|
|
|
|
VMLINUX_SYMBOL(__start_pci_fixups_final) = .; \
|
|
|
|
|
*(.pci_fixup_final) \
|
|
|
|
|
VMLINUX_SYMBOL(__end_pci_fixups_final) = .; \
|
|
|
|
|
VMLINUX_SYMBOL(__start_pci_fixups_enable) = .; \
|
|
|
|
|
*(.pci_fixup_enable) \
|
|
|
|
|
VMLINUX_SYMBOL(__end_pci_fixups_enable) = .; \
|
2006-12-04 16:14:45 -07:00
|
|
|
VMLINUX_SYMBOL(__start_pci_fixups_resume) = .; \
|
|
|
|
|
*(.pci_fixup_resume) \
|
|
|
|
|
VMLINUX_SYMBOL(__end_pci_fixups_resume) = .; \
|
2008-05-15 13:51:31 -06:00
|
|
|
VMLINUX_SYMBOL(__start_pci_fixups_resume_early) = .; \
|
|
|
|
|
*(.pci_fixup_resume_early) \
|
|
|
|
|
VMLINUX_SYMBOL(__end_pci_fixups_resume_early) = .; \
|
|
|
|
|
VMLINUX_SYMBOL(__start_pci_fixups_suspend) = .; \
|
|
|
|
|
*(.pci_fixup_suspend) \
|
|
|
|
|
VMLINUX_SYMBOL(__end_pci_fixups_suspend) = .; \
|
2005-04-16 16:20:36 -06:00
|
|
|
} \
|
|
|
|
|
\
|
2008-05-23 06:52:42 -06:00
|
|
|
/* Built-in firmware blobs */ \
|
|
|
|
|
.builtin_fw : AT(ADDR(.builtin_fw) - LOAD_OFFSET) { \
|
|
|
|
|
VMLINUX_SYMBOL(__start_builtin_fw) = .; \
|
|
|
|
|
*(.builtin_fw) \
|
|
|
|
|
VMLINUX_SYMBOL(__end_builtin_fw) = .; \
|
|
|
|
|
} \
|
|
|
|
|
\
|
2005-11-07 02:00:15 -07:00
|
|
|
/* RapidIO route ops */ \
|
2010-05-26 15:43:59 -06:00
|
|
|
.rio_ops : AT(ADDR(.rio_ops) - LOAD_OFFSET) { \
|
2010-05-26 15:44:03 -06:00
|
|
|
VMLINUX_SYMBOL(__start_rio_switch_ops) = .; \
|
|
|
|
|
*(.rio_switch_ops) \
|
|
|
|
|
VMLINUX_SYMBOL(__end_rio_switch_ops) = .; \
|
2005-11-07 02:00:15 -07:00
|
|
|
} \
|
|
|
|
|
\
|
2008-05-12 07:44:41 -06:00
|
|
|
TRACEDATA \
|
|
|
|
|
\
|
2005-04-16 16:20:36 -06:00
|
|
|
/* Kernel symbol table: Normal symbols */ \
|
|
|
|
|
__ksymtab : AT(ADDR(__ksymtab) - LOAD_OFFSET) { \
|
|
|
|
|
VMLINUX_SYMBOL(__start___ksymtab) = .; \
|
|
|
|
|
*(__ksymtab) \
|
|
|
|
|
VMLINUX_SYMBOL(__stop___ksymtab) = .; \
|
|
|
|
|
} \
|
|
|
|
|
\
|
|
|
|
|
/* Kernel symbol table: GPL-only symbols */ \
|
|
|
|
|
__ksymtab_gpl : AT(ADDR(__ksymtab_gpl) - LOAD_OFFSET) { \
|
|
|
|
|
VMLINUX_SYMBOL(__start___ksymtab_gpl) = .; \
|
|
|
|
|
*(__ksymtab_gpl) \
|
|
|
|
|
VMLINUX_SYMBOL(__stop___ksymtab_gpl) = .; \
|
|
|
|
|
} \
|
|
|
|
|
\
|
2006-06-28 05:26:45 -06:00
|
|
|
/* Kernel symbol table: Normal unused symbols */ \
|
|
|
|
|
__ksymtab_unused : AT(ADDR(__ksymtab_unused) - LOAD_OFFSET) { \
|
|
|
|
|
VMLINUX_SYMBOL(__start___ksymtab_unused) = .; \
|
|
|
|
|
*(__ksymtab_unused) \
|
|
|
|
|
VMLINUX_SYMBOL(__stop___ksymtab_unused) = .; \
|
|
|
|
|
} \
|
|
|
|
|
\
|
|
|
|
|
/* Kernel symbol table: GPL-only unused symbols */ \
|
|
|
|
|
__ksymtab_unused_gpl : AT(ADDR(__ksymtab_unused_gpl) - LOAD_OFFSET) { \
|
|
|
|
|
VMLINUX_SYMBOL(__start___ksymtab_unused_gpl) = .; \
|
|
|
|
|
*(__ksymtab_unused_gpl) \
|
|
|
|
|
VMLINUX_SYMBOL(__stop___ksymtab_unused_gpl) = .; \
|
|
|
|
|
} \
|
|
|
|
|
\
|
2006-03-20 14:17:13 -07:00
|
|
|
/* Kernel symbol table: GPL-future-only symbols */ \
|
|
|
|
|
__ksymtab_gpl_future : AT(ADDR(__ksymtab_gpl_future) - LOAD_OFFSET) { \
|
|
|
|
|
VMLINUX_SYMBOL(__start___ksymtab_gpl_future) = .; \
|
|
|
|
|
*(__ksymtab_gpl_future) \
|
|
|
|
|
VMLINUX_SYMBOL(__stop___ksymtab_gpl_future) = .; \
|
|
|
|
|
} \
|
|
|
|
|
\
|
2005-04-16 16:20:36 -06:00
|
|
|
/* Kernel symbol table: Normal symbols */ \
|
|
|
|
|
__kcrctab : AT(ADDR(__kcrctab) - LOAD_OFFSET) { \
|
|
|
|
|
VMLINUX_SYMBOL(__start___kcrctab) = .; \
|
|
|
|
|
*(__kcrctab) \
|
|
|
|
|
VMLINUX_SYMBOL(__stop___kcrctab) = .; \
|
|
|
|
|
} \
|
|
|
|
|
\
|
|
|
|
|
/* Kernel symbol table: GPL-only symbols */ \
|
|
|
|
|
__kcrctab_gpl : AT(ADDR(__kcrctab_gpl) - LOAD_OFFSET) { \
|
|
|
|
|
VMLINUX_SYMBOL(__start___kcrctab_gpl) = .; \
|
|
|
|
|
*(__kcrctab_gpl) \
|
|
|
|
|
VMLINUX_SYMBOL(__stop___kcrctab_gpl) = .; \
|
|
|
|
|
} \
|
|
|
|
|
\
|
2006-06-28 05:26:45 -06:00
|
|
|
/* Kernel symbol table: Normal unused symbols */ \
|
|
|
|
|
__kcrctab_unused : AT(ADDR(__kcrctab_unused) - LOAD_OFFSET) { \
|
|
|
|
|
VMLINUX_SYMBOL(__start___kcrctab_unused) = .; \
|
|
|
|
|
*(__kcrctab_unused) \
|
|
|
|
|
VMLINUX_SYMBOL(__stop___kcrctab_unused) = .; \
|
|
|
|
|
} \
|
|
|
|
|
\
|
|
|
|
|
/* Kernel symbol table: GPL-only unused symbols */ \
|
|
|
|
|
__kcrctab_unused_gpl : AT(ADDR(__kcrctab_unused_gpl) - LOAD_OFFSET) { \
|
|
|
|
|
VMLINUX_SYMBOL(__start___kcrctab_unused_gpl) = .; \
|
|
|
|
|
*(__kcrctab_unused_gpl) \
|
|
|
|
|
VMLINUX_SYMBOL(__stop___kcrctab_unused_gpl) = .; \
|
|
|
|
|
} \
|
|
|
|
|
\
|
2006-03-20 14:17:13 -07:00
|
|
|
/* Kernel symbol table: GPL-future-only symbols */ \
|
|
|
|
|
__kcrctab_gpl_future : AT(ADDR(__kcrctab_gpl_future) - LOAD_OFFSET) { \
|
|
|
|
|
VMLINUX_SYMBOL(__start___kcrctab_gpl_future) = .; \
|
|
|
|
|
*(__kcrctab_gpl_future) \
|
|
|
|
|
VMLINUX_SYMBOL(__stop___kcrctab_gpl_future) = .; \
|
|
|
|
|
} \
|
|
|
|
|
\
|
2005-04-16 16:20:36 -06:00
|
|
|
/* Kernel symbol table: strings */ \
|
|
|
|
|
__ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) { \
|
|
|
|
|
*(__ksymtab_strings) \
|
|
|
|
|
} \
|
|
|
|
|
\
|
2008-01-20 12:07:28 -07:00
|
|
|
/* __*init sections */ \
|
|
|
|
|
__init_rodata : AT(ADDR(__init_rodata) - LOAD_OFFSET) { \
|
2008-01-28 12:21:15 -07:00
|
|
|
*(.ref.rodata) \
|
2008-01-20 12:07:28 -07:00
|
|
|
DEV_KEEP(init.rodata) \
|
|
|
|
|
DEV_KEEP(exit.rodata) \
|
|
|
|
|
CPU_KEEP(init.rodata) \
|
|
|
|
|
CPU_KEEP(exit.rodata) \
|
|
|
|
|
MEM_KEEP(init.rodata) \
|
|
|
|
|
MEM_KEEP(exit.rodata) \
|
|
|
|
|
} \
|
|
|
|
|
\
|
2005-04-16 16:20:36 -06:00
|
|
|
/* Built-in module parameters. */ \
|
|
|
|
|
__param : AT(ADDR(__param) - LOAD_OFFSET) { \
|
|
|
|
|
VMLINUX_SYMBOL(__start___param) = .; \
|
|
|
|
|
*(__param) \
|
|
|
|
|
VMLINUX_SYMBOL(__stop___param) = .; \
|
2008-01-30 05:34:08 -07:00
|
|
|
. = ALIGN((align)); \
|
2006-12-06 18:14:03 -07:00
|
|
|
VMLINUX_SYMBOL(__end_rodata) = .; \
|
2006-09-27 02:51:02 -06:00
|
|
|
} \
|
2007-05-29 13:29:00 -06:00
|
|
|
. = ALIGN((align));
|
|
|
|
|
|
2009-06-07 12:46:37 -06:00
|
|
|
/* RODATA & RO_DATA provided for backward compatibility.
|
2007-05-29 13:29:00 -06:00
|
|
|
* All archs are supposed to use RO_DATA() */
|
2009-06-07 12:46:37 -06:00
|
|
|
#define RODATA RO_DATA_SECTION(4096)
|
|
|
|
|
#define RO_DATA(align) RO_DATA_SECTION(align)
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
|
#define SECURITY_INIT \
|
2005-06-25 15:57:46 -06:00
|
|
|
.security_initcall.init : AT(ADDR(.security_initcall.init) - LOAD_OFFSET) { \
|
2005-04-16 16:20:36 -06:00
|
|
|
VMLINUX_SYMBOL(__security_initcall_start) = .; \
|
|
|
|
|
*(.security_initcall.init) \
|
|
|
|
|
VMLINUX_SYMBOL(__security_initcall_end) = .; \
|
|
|
|
|
}
|
|
|
|
|
|
2007-05-12 16:31:33 -06:00
|
|
|
/* .text section. Map to function alignment to avoid address changes
|
|
|
|
|
* during second ld run in second ld pass when generating System.map */
|
|
|
|
|
#define TEXT_TEXT \
|
|
|
|
|
ALIGN_FUNCTION(); \
|
2008-06-18 05:36:01 -06:00
|
|
|
*(.text.hot) \
|
2007-05-17 12:14:48 -06:00
|
|
|
*(.text) \
|
2008-01-28 12:21:15 -07:00
|
|
|
*(.ref.text) \
|
2008-01-20 12:07:28 -07:00
|
|
|
DEV_KEEP(init.text) \
|
|
|
|
|
DEV_KEEP(exit.text) \
|
|
|
|
|
CPU_KEEP(init.text) \
|
|
|
|
|
CPU_KEEP(exit.text) \
|
|
|
|
|
MEM_KEEP(init.text) \
|
2008-06-18 05:36:01 -06:00
|
|
|
MEM_KEEP(exit.text) \
|
|
|
|
|
*(.text.unlikely)
|
2008-01-20 12:07:28 -07:00
|
|
|
|
2007-05-12 16:31:33 -06:00
|
|
|
|
2005-07-14 14:15:44 -06:00
|
|
|
/* sched.text is aling to function alignment to secure we have same
|
|
|
|
|
* address even at second ld pass when generating System.map */
|
2005-04-16 16:20:36 -06:00
|
|
|
#define SCHED_TEXT \
|
2005-07-14 14:15:44 -06:00
|
|
|
ALIGN_FUNCTION(); \
|
2005-04-16 16:20:36 -06:00
|
|
|
VMLINUX_SYMBOL(__sched_text_start) = .; \
|
|
|
|
|
*(.sched.text) \
|
|
|
|
|
VMLINUX_SYMBOL(__sched_text_end) = .;
|
|
|
|
|
|
2005-07-14 14:15:44 -06:00
|
|
|
/* spinlock.text is aling to function alignment to secure we have same
|
|
|
|
|
* address even at second ld pass when generating System.map */
|
2005-04-16 16:20:36 -06:00
|
|
|
#define LOCK_TEXT \
|
2005-07-14 14:15:44 -06:00
|
|
|
ALIGN_FUNCTION(); \
|
2005-04-16 16:20:36 -06:00
|
|
|
VMLINUX_SYMBOL(__lock_text_start) = .; \
|
|
|
|
|
*(.spinlock.text) \
|
|
|
|
|
VMLINUX_SYMBOL(__lock_text_end) = .;
|
2005-09-06 16:19:26 -06:00
|
|
|
|
|
|
|
|
#define KPROBES_TEXT \
|
|
|
|
|
ALIGN_FUNCTION(); \
|
|
|
|
|
VMLINUX_SYMBOL(__kprobes_text_start) = .; \
|
|
|
|
|
*(.kprobes.text) \
|
|
|
|
|
VMLINUX_SYMBOL(__kprobes_text_end) = .;
|
2005-09-10 11:44:54 -06:00
|
|
|
|
2008-12-09 15:53:16 -07:00
|
|
|
#ifdef CONFIG_FUNCTION_GRAPH_TRACER
|
|
|
|
|
#define IRQENTRY_TEXT \
|
|
|
|
|
ALIGN_FUNCTION(); \
|
|
|
|
|
VMLINUX_SYMBOL(__irqentry_text_start) = .; \
|
|
|
|
|
*(.irqentry.text) \
|
|
|
|
|
VMLINUX_SYMBOL(__irqentry_text_end) = .;
|
|
|
|
|
#else
|
|
|
|
|
#define IRQENTRY_TEXT
|
|
|
|
|
#endif
|
|
|
|
|
|
2008-02-19 13:00:18 -07:00
|
|
|
/* Section used for early init (in .S files) */
|
2009-06-14 14:10:41 -06:00
|
|
|
#define HEAD_TEXT *(.head.text)
|
2008-02-19 13:00:18 -07:00
|
|
|
|
2009-06-14 14:10:41 -06:00
|
|
|
#define HEAD_TEXT_SECTION \
|
2009-06-07 12:46:37 -06:00
|
|
|
.head.text : AT(ADDR(.head.text) - LOAD_OFFSET) { \
|
|
|
|
|
HEAD_TEXT \
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Exception table
|
|
|
|
|
*/
|
|
|
|
|
#define EXCEPTION_TABLE(align) \
|
|
|
|
|
. = ALIGN(align); \
|
|
|
|
|
__ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) { \
|
|
|
|
|
VMLINUX_SYMBOL(__start___ex_table) = .; \
|
|
|
|
|
*(__ex_table) \
|
|
|
|
|
VMLINUX_SYMBOL(__stop___ex_table) = .; \
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Init task
|
|
|
|
|
*/
|
2009-06-23 16:53:15 -06:00
|
|
|
#define INIT_TASK_DATA_SECTION(align) \
|
2009-06-07 12:46:37 -06:00
|
|
|
. = ALIGN(align); \
|
2010-07-13 03:39:42 -06:00
|
|
|
.data..init_task : AT(ADDR(.data..init_task) - LOAD_OFFSET) { \
|
2009-06-23 16:53:15 -06:00
|
|
|
INIT_TASK_DATA(align) \
|
2009-06-07 12:46:37 -06:00
|
|
|
}
|
2008-02-19 13:00:18 -07:00
|
|
|
|
2009-06-17 17:28:03 -06:00
|
|
|
#ifdef CONFIG_CONSTRUCTORS
|
2009-06-30 12:41:13 -06:00
|
|
|
#define KERNEL_CTORS() . = ALIGN(8); \
|
|
|
|
|
VMLINUX_SYMBOL(__ctors_start) = .; \
|
2009-06-17 17:28:03 -06:00
|
|
|
*(.ctors) \
|
|
|
|
|
VMLINUX_SYMBOL(__ctors_end) = .;
|
|
|
|
|
#else
|
|
|
|
|
#define KERNEL_CTORS()
|
|
|
|
|
#endif
|
|
|
|
|
|
2008-01-20 06:15:03 -07:00
|
|
|
/* init and exit section handling */
|
2008-01-20 12:07:28 -07:00
|
|
|
#define INIT_DATA \
|
|
|
|
|
*(.init.data) \
|
|
|
|
|
DEV_DISCARD(init.data) \
|
|
|
|
|
CPU_DISCARD(init.data) \
|
|
|
|
|
MEM_DISCARD(init.data) \
|
2009-06-17 17:28:03 -06:00
|
|
|
KERNEL_CTORS() \
|
2009-03-12 04:58:33 -06:00
|
|
|
*(.init.rodata) \
|
2009-07-27 12:23:50 -06:00
|
|
|
MCOUNT_REC() \
|
2009-03-12 04:58:33 -06:00
|
|
|
DEV_DISCARD(init.rodata) \
|
|
|
|
|
CPU_DISCARD(init.rodata) \
|
2009-02-05 09:51:38 -07:00
|
|
|
MEM_DISCARD(init.rodata)
|
2008-01-20 12:07:28 -07:00
|
|
|
|
|
|
|
|
#define INIT_TEXT \
|
|
|
|
|
*(.init.text) \
|
|
|
|
|
DEV_DISCARD(init.text) \
|
|
|
|
|
CPU_DISCARD(init.text) \
|
|
|
|
|
MEM_DISCARD(init.text)
|
|
|
|
|
|
|
|
|
|
#define EXIT_DATA \
|
|
|
|
|
*(.exit.data) \
|
|
|
|
|
DEV_DISCARD(exit.data) \
|
|
|
|
|
DEV_DISCARD(exit.rodata) \
|
|
|
|
|
CPU_DISCARD(exit.data) \
|
|
|
|
|
CPU_DISCARD(exit.rodata) \
|
|
|
|
|
MEM_DISCARD(exit.data) \
|
|
|
|
|
MEM_DISCARD(exit.rodata)
|
2008-01-20 06:15:03 -07:00
|
|
|
|
2008-01-20 12:07:28 -07:00
|
|
|
#define EXIT_TEXT \
|
|
|
|
|
*(.exit.text) \
|
|
|
|
|
DEV_DISCARD(exit.text) \
|
|
|
|
|
CPU_DISCARD(exit.text) \
|
|
|
|
|
MEM_DISCARD(exit.text)
|
2008-01-20 06:15:03 -07:00
|
|
|
|
2009-06-14 14:10:41 -06:00
|
|
|
#define EXIT_CALL \
|
|
|
|
|
*(.exitcall.exit)
|
|
|
|
|
|
2009-06-07 12:46:37 -06:00
|
|
|
/*
|
|
|
|
|
* bss (Block Started by Symbol) - uninitialized data
|
|
|
|
|
* zeroed during startup
|
|
|
|
|
*/
|
2009-07-12 16:23:33 -06:00
|
|
|
#define SBSS(sbss_align) \
|
|
|
|
|
. = ALIGN(sbss_align); \
|
2009-06-07 12:46:37 -06:00
|
|
|
.sbss : AT(ADDR(.sbss) - LOAD_OFFSET) { \
|
|
|
|
|
*(.sbss) \
|
|
|
|
|
*(.scommon) \
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#define BSS(bss_align) \
|
|
|
|
|
. = ALIGN(bss_align); \
|
|
|
|
|
.bss : AT(ADDR(.bss) - LOAD_OFFSET) { \
|
2010-02-19 17:03:38 -07:00
|
|
|
*(.bss..page_aligned) \
|
2009-06-07 12:46:37 -06:00
|
|
|
*(.dynbss) \
|
|
|
|
|
*(.bss) \
|
|
|
|
|
*(COMMON) \
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* DWARF debug sections.
|
|
|
|
|
* Symbols in the DWARF debugging sections are relative to
|
|
|
|
|
* the beginning of the section so we begin them at 0.
|
|
|
|
|
*/
|
2005-09-10 11:44:54 -06:00
|
|
|
#define DWARF_DEBUG \
|
|
|
|
|
/* DWARF 1 */ \
|
|
|
|
|
.debug 0 : { *(.debug) } \
|
|
|
|
|
.line 0 : { *(.line) } \
|
|
|
|
|
/* GNU DWARF 1 extensions */ \
|
|
|
|
|
.debug_srcinfo 0 : { *(.debug_srcinfo) } \
|
|
|
|
|
.debug_sfnames 0 : { *(.debug_sfnames) } \
|
|
|
|
|
/* DWARF 1.1 and DWARF 2 */ \
|
|
|
|
|
.debug_aranges 0 : { *(.debug_aranges) } \
|
|
|
|
|
.debug_pubnames 0 : { *(.debug_pubnames) } \
|
|
|
|
|
/* DWARF 2 */ \
|
|
|
|
|
.debug_info 0 : { *(.debug_info \
|
|
|
|
|
.gnu.linkonce.wi.*) } \
|
|
|
|
|
.debug_abbrev 0 : { *(.debug_abbrev) } \
|
|
|
|
|
.debug_line 0 : { *(.debug_line) } \
|
|
|
|
|
.debug_frame 0 : { *(.debug_frame) } \
|
|
|
|
|
.debug_str 0 : { *(.debug_str) } \
|
|
|
|
|
.debug_loc 0 : { *(.debug_loc) } \
|
|
|
|
|
.debug_macinfo 0 : { *(.debug_macinfo) } \
|
|
|
|
|
/* SGI/MIPS DWARF 2 extensions */ \
|
|
|
|
|
.debug_weaknames 0 : { *(.debug_weaknames) } \
|
|
|
|
|
.debug_funcnames 0 : { *(.debug_funcnames) } \
|
|
|
|
|
.debug_typenames 0 : { *(.debug_typenames) } \
|
|
|
|
|
.debug_varnames 0 : { *(.debug_varnames) } \
|
|
|
|
|
|
|
|
|
|
/* Stabs debugging sections. */
|
|
|
|
|
#define STABS_DEBUG \
|
|
|
|
|
.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) } \
|
|
|
|
|
.comment 0 : { *(.comment) }
|
2006-09-26 00:32:26 -06:00
|
|
|
|
2008-05-12 07:44:41 -06:00
|
|
|
#ifdef CONFIG_GENERIC_BUG
|
[PATCH] Generic BUG implementation
This patch adds common handling for kernel BUGs, for use by architectures as
they wish. The code is derived from arch/powerpc.
The advantages of having common BUG handling are:
- consistent BUG reporting across architectures
- shared implementation of out-of-line file/line data
- implement CONFIG_DEBUG_BUGVERBOSE consistently
This means that in inline impact of BUG is just the illegal instruction
itself, which is an improvement for i386 and x86-64.
A BUG is represented in the instruction stream as an illegal instruction,
which has file/line information associated with it. This extra information is
stored in the __bug_table section in the ELF file.
When the kernel gets an illegal instruction, it first confirms it might
possibly be from a BUG (ie, in kernel mode, the right illegal instruction).
It then calls report_bug(). This searches __bug_table for a matching
instruction pointer, and if found, prints the corresponding file/line
information. If report_bug() determines that it wasn't a BUG which caused the
trap, it returns BUG_TRAP_TYPE_NONE.
Some architectures (powerpc) implement WARN using the same mechanism; if the
illegal instruction was the result of a WARN, then report_bug(Q) returns
CONFIG_DEBUG_BUGVERBOSE; otherwise it returns BUG_TRAP_TYPE_BUG.
lib/bug.c keeps a list of loaded modules which can be searched for __bug_table
entries. The architecture must call
module_bug_finalize()/module_bug_cleanup() from its corresponding
module_finalize/cleanup functions.
Unsetting CONFIG_DEBUG_BUGVERBOSE will reduce the kernel size by some amount.
At the very least, filename and line information will not be recorded for each
but, but architectures may decide to store no extra information per BUG at
all.
Unfortunately, gcc doesn't have a general way to mark an asm() as noreturn, so
architectures will generally have to include an infinite loop (or similar) in
the BUG code, so that gcc knows execution won't continue beyond that point.
gcc does have a __builtin_trap() operator which may be useful to achieve the
same effect, unfortunately it cannot be used to actually implement the BUG
itself, because there's no way to get the instruction's address for use in
generating the __bug_table entry.
[randy.dunlap@oracle.com: Handle BUG=n, GENERIC_BUG=n to prevent build errors]
[bunk@stusta.de: include/linux/bug.h must always #include <linux/module.h]
Signed-off-by: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Andi Kleen <ak@muc.de>
Cc: Hugh Dickens <hugh@veritas.com>
Cc: Michael Ellerman <michael@ellerman.id.au>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-12-08 03:36:19 -07:00
|
|
|
#define BUG_TABLE \
|
|
|
|
|
. = ALIGN(8); \
|
|
|
|
|
__bug_table : AT(ADDR(__bug_table) - LOAD_OFFSET) { \
|
2008-07-31 01:07:29 -06:00
|
|
|
VMLINUX_SYMBOL(__start___bug_table) = .; \
|
[PATCH] Generic BUG implementation
This patch adds common handling for kernel BUGs, for use by architectures as
they wish. The code is derived from arch/powerpc.
The advantages of having common BUG handling are:
- consistent BUG reporting across architectures
- shared implementation of out-of-line file/line data
- implement CONFIG_DEBUG_BUGVERBOSE consistently
This means that in inline impact of BUG is just the illegal instruction
itself, which is an improvement for i386 and x86-64.
A BUG is represented in the instruction stream as an illegal instruction,
which has file/line information associated with it. This extra information is
stored in the __bug_table section in the ELF file.
When the kernel gets an illegal instruction, it first confirms it might
possibly be from a BUG (ie, in kernel mode, the right illegal instruction).
It then calls report_bug(). This searches __bug_table for a matching
instruction pointer, and if found, prints the corresponding file/line
information. If report_bug() determines that it wasn't a BUG which caused the
trap, it returns BUG_TRAP_TYPE_NONE.
Some architectures (powerpc) implement WARN using the same mechanism; if the
illegal instruction was the result of a WARN, then report_bug(Q) returns
CONFIG_DEBUG_BUGVERBOSE; otherwise it returns BUG_TRAP_TYPE_BUG.
lib/bug.c keeps a list of loaded modules which can be searched for __bug_table
entries. The architecture must call
module_bug_finalize()/module_bug_cleanup() from its corresponding
module_finalize/cleanup functions.
Unsetting CONFIG_DEBUG_BUGVERBOSE will reduce the kernel size by some amount.
At the very least, filename and line information will not be recorded for each
but, but architectures may decide to store no extra information per BUG at
all.
Unfortunately, gcc doesn't have a general way to mark an asm() as noreturn, so
architectures will generally have to include an infinite loop (or similar) in
the BUG code, so that gcc knows execution won't continue beyond that point.
gcc does have a __builtin_trap() operator which may be useful to achieve the
same effect, unfortunately it cannot be used to actually implement the BUG
itself, because there's no way to get the instruction's address for use in
generating the __bug_table entry.
[randy.dunlap@oracle.com: Handle BUG=n, GENERIC_BUG=n to prevent build errors]
[bunk@stusta.de: include/linux/bug.h must always #include <linux/module.h]
Signed-off-by: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Andi Kleen <ak@muc.de>
Cc: Hugh Dickens <hugh@veritas.com>
Cc: Michael Ellerman <michael@ellerman.id.au>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-12-08 03:36:19 -07:00
|
|
|
*(__bug_table) \
|
2008-07-31 01:07:29 -06:00
|
|
|
VMLINUX_SYMBOL(__stop___bug_table) = .; \
|
[PATCH] Generic BUG implementation
This patch adds common handling for kernel BUGs, for use by architectures as
they wish. The code is derived from arch/powerpc.
The advantages of having common BUG handling are:
- consistent BUG reporting across architectures
- shared implementation of out-of-line file/line data
- implement CONFIG_DEBUG_BUGVERBOSE consistently
This means that in inline impact of BUG is just the illegal instruction
itself, which is an improvement for i386 and x86-64.
A BUG is represented in the instruction stream as an illegal instruction,
which has file/line information associated with it. This extra information is
stored in the __bug_table section in the ELF file.
When the kernel gets an illegal instruction, it first confirms it might
possibly be from a BUG (ie, in kernel mode, the right illegal instruction).
It then calls report_bug(). This searches __bug_table for a matching
instruction pointer, and if found, prints the corresponding file/line
information. If report_bug() determines that it wasn't a BUG which caused the
trap, it returns BUG_TRAP_TYPE_NONE.
Some architectures (powerpc) implement WARN using the same mechanism; if the
illegal instruction was the result of a WARN, then report_bug(Q) returns
CONFIG_DEBUG_BUGVERBOSE; otherwise it returns BUG_TRAP_TYPE_BUG.
lib/bug.c keeps a list of loaded modules which can be searched for __bug_table
entries. The architecture must call
module_bug_finalize()/module_bug_cleanup() from its corresponding
module_finalize/cleanup functions.
Unsetting CONFIG_DEBUG_BUGVERBOSE will reduce the kernel size by some amount.
At the very least, filename and line information will not be recorded for each
but, but architectures may decide to store no extra information per BUG at
all.
Unfortunately, gcc doesn't have a general way to mark an asm() as noreturn, so
architectures will generally have to include an infinite loop (or similar) in
the BUG code, so that gcc knows execution won't continue beyond that point.
gcc does have a __builtin_trap() operator which may be useful to achieve the
same effect, unfortunately it cannot be used to actually implement the BUG
itself, because there's no way to get the instruction's address for use in
generating the __bug_table entry.
[randy.dunlap@oracle.com: Handle BUG=n, GENERIC_BUG=n to prevent build errors]
[bunk@stusta.de: include/linux/bug.h must always #include <linux/module.h]
Signed-off-by: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Andi Kleen <ak@muc.de>
Cc: Hugh Dickens <hugh@veritas.com>
Cc: Michael Ellerman <michael@ellerman.id.au>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-12-08 03:36:19 -07:00
|
|
|
}
|
2008-05-12 07:44:41 -06:00
|
|
|
#else
|
|
|
|
|
#define BUG_TABLE
|
|
|
|
|
#endif
|
[PATCH] Generic BUG implementation
This patch adds common handling for kernel BUGs, for use by architectures as
they wish. The code is derived from arch/powerpc.
The advantages of having common BUG handling are:
- consistent BUG reporting across architectures
- shared implementation of out-of-line file/line data
- implement CONFIG_DEBUG_BUGVERBOSE consistently
This means that in inline impact of BUG is just the illegal instruction
itself, which is an improvement for i386 and x86-64.
A BUG is represented in the instruction stream as an illegal instruction,
which has file/line information associated with it. This extra information is
stored in the __bug_table section in the ELF file.
When the kernel gets an illegal instruction, it first confirms it might
possibly be from a BUG (ie, in kernel mode, the right illegal instruction).
It then calls report_bug(). This searches __bug_table for a matching
instruction pointer, and if found, prints the corresponding file/line
information. If report_bug() determines that it wasn't a BUG which caused the
trap, it returns BUG_TRAP_TYPE_NONE.
Some architectures (powerpc) implement WARN using the same mechanism; if the
illegal instruction was the result of a WARN, then report_bug(Q) returns
CONFIG_DEBUG_BUGVERBOSE; otherwise it returns BUG_TRAP_TYPE_BUG.
lib/bug.c keeps a list of loaded modules which can be searched for __bug_table
entries. The architecture must call
module_bug_finalize()/module_bug_cleanup() from its corresponding
module_finalize/cleanup functions.
Unsetting CONFIG_DEBUG_BUGVERBOSE will reduce the kernel size by some amount.
At the very least, filename and line information will not be recorded for each
but, but architectures may decide to store no extra information per BUG at
all.
Unfortunately, gcc doesn't have a general way to mark an asm() as noreturn, so
architectures will generally have to include an infinite loop (or similar) in
the BUG code, so that gcc knows execution won't continue beyond that point.
gcc does have a __builtin_trap() operator which may be useful to achieve the
same effect, unfortunately it cannot be used to actually implement the BUG
itself, because there's no way to get the instruction's address for use in
generating the __bug_table entry.
[randy.dunlap@oracle.com: Handle BUG=n, GENERIC_BUG=n to prevent build errors]
[bunk@stusta.de: include/linux/bug.h must always #include <linux/module.h]
Signed-off-by: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Andi Kleen <ak@muc.de>
Cc: Hugh Dickens <hugh@veritas.com>
Cc: Michael Ellerman <michael@ellerman.id.au>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-12-08 03:36:19 -07:00
|
|
|
|
2010-09-17 09:09:00 -06:00
|
|
|
#define JUMP_TABLE \
|
|
|
|
|
. = ALIGN(8); \
|
|
|
|
|
__jump_table : AT(ADDR(__jump_table) - LOAD_OFFSET) { \
|
|
|
|
|
VMLINUX_SYMBOL(__start___jump_table) = .; \
|
|
|
|
|
*(__jump_table) \
|
|
|
|
|
VMLINUX_SYMBOL(__stop___jump_table) = .; \
|
|
|
|
|
}
|
|
|
|
|
|
2008-05-12 07:44:41 -06:00
|
|
|
#ifdef CONFIG_PM_TRACE
|
|
|
|
|
#define TRACEDATA \
|
|
|
|
|
. = ALIGN(4); \
|
|
|
|
|
.tracedata : AT(ADDR(.tracedata) - LOAD_OFFSET) { \
|
2008-07-31 01:07:29 -06:00
|
|
|
VMLINUX_SYMBOL(__tracedata_start) = .; \
|
2008-05-12 07:44:41 -06:00
|
|
|
*(.tracedata) \
|
2008-07-31 01:07:29 -06:00
|
|
|
VMLINUX_SYMBOL(__tracedata_end) = .; \
|
2008-05-12 07:44:41 -06:00
|
|
|
}
|
|
|
|
|
#else
|
|
|
|
|
#define TRACEDATA
|
|
|
|
|
#endif
|
|
|
|
|
|
2006-09-26 00:32:26 -06:00
|
|
|
#define NOTES \
|
2007-07-19 02:48:36 -06:00
|
|
|
.notes : AT(ADDR(.notes) - LOAD_OFFSET) { \
|
|
|
|
|
VMLINUX_SYMBOL(__start_notes) = .; \
|
|
|
|
|
*(.note.*) \
|
|
|
|
|
VMLINUX_SYMBOL(__stop_notes) = .; \
|
|
|
|
|
}
|
2006-10-27 12:41:44 -06:00
|
|
|
|
2009-06-07 12:46:37 -06:00
|
|
|
#define INIT_SETUP(initsetup_align) \
|
|
|
|
|
. = ALIGN(initsetup_align); \
|
|
|
|
|
VMLINUX_SYMBOL(__setup_start) = .; \
|
|
|
|
|
*(.init.setup) \
|
|
|
|
|
VMLINUX_SYMBOL(__setup_end) = .;
|
|
|
|
|
|
2006-10-27 12:41:44 -06:00
|
|
|
#define INITCALLS \
|
2008-07-25 20:45:11 -06:00
|
|
|
*(.initcallearly.init) \
|
2008-07-31 01:07:29 -06:00
|
|
|
VMLINUX_SYMBOL(__early_initcall_end) = .; \
|
2006-11-20 12:47:18 -07:00
|
|
|
*(.initcall0.init) \
|
|
|
|
|
*(.initcall0s.init) \
|
2006-10-27 12:41:44 -06:00
|
|
|
*(.initcall1.init) \
|
2006-10-27 12:42:37 -06:00
|
|
|
*(.initcall1s.init) \
|
2006-10-27 12:41:44 -06:00
|
|
|
*(.initcall2.init) \
|
2006-10-27 12:42:37 -06:00
|
|
|
*(.initcall2s.init) \
|
2006-10-27 12:41:44 -06:00
|
|
|
*(.initcall3.init) \
|
2006-10-27 12:42:37 -06:00
|
|
|
*(.initcall3s.init) \
|
2006-10-27 12:41:44 -06:00
|
|
|
*(.initcall4.init) \
|
2006-10-27 12:42:37 -06:00
|
|
|
*(.initcall4s.init) \
|
2006-10-27 12:41:44 -06:00
|
|
|
*(.initcall5.init) \
|
2006-10-27 12:42:37 -06:00
|
|
|
*(.initcall5s.init) \
|
2006-12-11 13:12:04 -07:00
|
|
|
*(.initcallrootfs.init) \
|
2006-10-27 12:41:44 -06:00
|
|
|
*(.initcall6.init) \
|
2006-10-27 12:42:37 -06:00
|
|
|
*(.initcall6s.init) \
|
|
|
|
|
*(.initcall7.init) \
|
|
|
|
|
*(.initcall7s.init)
|
2006-10-27 12:41:44 -06:00
|
|
|
|
2009-06-07 12:46:37 -06:00
|
|
|
#define INIT_CALLS \
|
|
|
|
|
VMLINUX_SYMBOL(__initcall_start) = .; \
|
|
|
|
|
INITCALLS \
|
|
|
|
|
VMLINUX_SYMBOL(__initcall_end) = .;
|
|
|
|
|
|
|
|
|
|
#define CON_INITCALL \
|
|
|
|
|
VMLINUX_SYMBOL(__con_initcall_start) = .; \
|
|
|
|
|
*(.con_initcall.init) \
|
|
|
|
|
VMLINUX_SYMBOL(__con_initcall_end) = .;
|
|
|
|
|
|
|
|
|
|
#define SECURITY_INITCALL \
|
|
|
|
|
VMLINUX_SYMBOL(__security_initcall_start) = .; \
|
|
|
|
|
*(.security_initcall.init) \
|
|
|
|
|
VMLINUX_SYMBOL(__security_initcall_end) = .;
|
|
|
|
|
|
|
|
|
|
#ifdef CONFIG_BLK_DEV_INITRD
|
|
|
|
|
#define INIT_RAM_FS \
|
2010-10-26 15:22:30 -06:00
|
|
|
. = ALIGN(4); \
|
2009-06-07 12:46:37 -06:00
|
|
|
VMLINUX_SYMBOL(__initramfs_start) = .; \
|
|
|
|
|
*(.init.ramfs) \
|
initramfs: fix initramfs size calculation
The size of a built-in initramfs is calculated in init/initramfs.c by
"__initramfs_end - __initramfs_start". Those symbols are defined in the
linker script include/asm-generic/vmlinux.lds.h:
#define INIT_RAM_FS \
. = ALIGN(PAGE_SIZE); \
VMLINUX_SYMBOL(__initramfs_start) = .; \
*(.init.ramfs) \
VMLINUX_SYMBOL(__initramfs_end) = .;
If the initramfs file has an odd number of bytes, the "__initramfs_end"
symbol points to an odd address, for example, the symbols in the
System.map might look like:
0000000000572000 T __initramfs_start
00000000005bcd05 T __initramfs_end <-- odd address
At least on s390 this causes a problem:
Certain s390 instructions, especially instructions for loading addresses
(larl) or branch addresses must be on even addresses. The compiler loads
the symbol addresses with the "larl" instruction. This instruction sets
the last bit to 0 and, therefore, for odd size files, the calculated size
is one byte less than it should be:
0000000000540a9c <populate_rootfs>:
540a9c: eb cf f0 78 00 24 stmg %r12,%r15,120(%r15),
540aa2: c0 10 00 01 8a af larl %r1,572000 <__initramfs_start>
540aa8: c0 c0 00 03 e1 2e larl %r12,5bcd04 <initramfs_end>
(Instead of 5bcd05)
...
540abe: 1b c1 sr %r12,%r1
To fix the problem, this patch introduces the global variable
__initramfs_size, which is calculated in the "usr/initramfs_data.S" file.
The populate_rootfs() function can then use the start marker of the
.init.ramfs section and the value of __initramfs_size for loading the
initramfs. Because the start marker and size is sufficient, the
__initramfs_end symbol is no longer needed and is removed.
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Reviewed-by: WANG Cong <xiyou.wangcong@gmail.com>
Acked-by: Michal Marek <mmarek@suse.cz>
Acked-by: "H. Peter Anvin" <hpa@zytor.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Michal Marek <mmarek@suse.cz>
2010-09-17 16:24:11 -06:00
|
|
|
. = ALIGN(8); \
|
|
|
|
|
*(.init.ramfs.info)
|
2009-06-07 12:46:37 -06:00
|
|
|
#else
|
2009-06-22 08:32:31 -06:00
|
|
|
#define INIT_RAM_FS
|
2009-06-07 12:46:37 -06:00
|
|
|
#endif
|
|
|
|
|
|
linker script: unify usage of discard definition
Discarded sections in different archs share some commonality but have
considerable differences. This led to linker script for each arch
implementing its own /DISCARD/ definition, which makes maintaining
tedious and adding new entries error-prone.
This patch makes all linker scripts to move discard definitions to the
end of the linker script and use the common DISCARDS macro. As ld
uses the first matching section definition, archs can include default
discarded sections by including them earlier in the linker script.
ia64 is notable because it first throws away some ia64 specific
subsections and then include the rest of the sections into the final
image, so those sections must be discarded before the inclusion.
defconfig compile tested for x86, x86-64, powerpc, powerpc64, ia64,
alpha, sparc, sparc64 and s390. Michal Simek tested microblaze.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Tested-by: Michal Simek <monstr@monstr.eu>
Cc: linux-arch@vger.kernel.org
Cc: Michal Simek <monstr@monstr.eu>
Cc: microblaze-uclinux@itee.uq.edu.au
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Tony Luck <tony.luck@intel.com>
2009-07-08 20:27:40 -06:00
|
|
|
/*
|
|
|
|
|
* Default discarded sections.
|
|
|
|
|
*
|
|
|
|
|
* Some archs want to discard exit text/data at runtime rather than
|
|
|
|
|
* link time due to cross-section references such as alt instructions,
|
|
|
|
|
* bug table, eh_frame, etc. DISCARDS must be the last of output
|
|
|
|
|
* section definitions so that such archs put those in earlier section
|
|
|
|
|
* definitions.
|
|
|
|
|
*/
|
2009-06-24 00:13:38 -06:00
|
|
|
#define DISCARDS \
|
|
|
|
|
/DISCARD/ : { \
|
|
|
|
|
EXIT_TEXT \
|
|
|
|
|
EXIT_DATA \
|
linker script: unify usage of discard definition
Discarded sections in different archs share some commonality but have
considerable differences. This led to linker script for each arch
implementing its own /DISCARD/ definition, which makes maintaining
tedious and adding new entries error-prone.
This patch makes all linker scripts to move discard definitions to the
end of the linker script and use the common DISCARDS macro. As ld
uses the first matching section definition, archs can include default
discarded sections by including them earlier in the linker script.
ia64 is notable because it first throws away some ia64 specific
subsections and then include the rest of the sections into the final
image, so those sections must be discarded before the inclusion.
defconfig compile tested for x86, x86-64, powerpc, powerpc64, ia64,
alpha, sparc, sparc64 and s390. Michal Simek tested microblaze.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Tested-by: Michal Simek <monstr@monstr.eu>
Cc: linux-arch@vger.kernel.org
Cc: Michal Simek <monstr@monstr.eu>
Cc: microblaze-uclinux@itee.uq.edu.au
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Tony Luck <tony.luck@intel.com>
2009-07-08 20:27:40 -06:00
|
|
|
EXIT_CALL \
|
2009-06-24 00:13:38 -06:00
|
|
|
*(.discard) \
|
2010-07-22 23:58:01 -06:00
|
|
|
*(.discard.*) \
|
2009-06-24 00:13:38 -06:00
|
|
|
}
|
|
|
|
|
|
2009-01-13 04:41:35 -07:00
|
|
|
/**
|
2009-01-18 20:21:28 -07:00
|
|
|
* PERCPU_VADDR - define output section for percpu area
|
2009-01-13 04:41:35 -07:00
|
|
|
* @vaddr: explicit base address (optional)
|
|
|
|
|
* @phdr: destination PHDR (optional)
|
|
|
|
|
*
|
|
|
|
|
* Macro which expands to output section for percpu area. If @vaddr
|
|
|
|
|
* is not blank, it specifies explicit base address and all percpu
|
|
|
|
|
* symbols will be offset from the given address. If blank, @vaddr
|
|
|
|
|
* always equals @laddr + LOAD_OFFSET.
|
|
|
|
|
*
|
|
|
|
|
* @phdr defines the output PHDR to use if not blank. Be warned that
|
|
|
|
|
* output PHDR is sticky. If @phdr is specified, the next output
|
|
|
|
|
* section in the linker script will go there too. @phdr should have
|
|
|
|
|
* a leading colon.
|
|
|
|
|
*
|
2009-01-30 00:32:22 -07:00
|
|
|
* Note that this macros defines __per_cpu_load as an absolute symbol.
|
|
|
|
|
* If there is no need to put the percpu section at a predetermined
|
|
|
|
|
* address, use PERCPU().
|
2009-01-13 04:41:35 -07:00
|
|
|
*/
|
|
|
|
|
#define PERCPU_VADDR(vaddr, phdr) \
|
2009-01-29 09:10:12 -07:00
|
|
|
VMLINUX_SYMBOL(__per_cpu_load) = .; \
|
2010-02-19 17:03:43 -07:00
|
|
|
.data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \
|
2009-01-18 20:21:28 -07:00
|
|
|
- LOAD_OFFSET) { \
|
|
|
|
|
VMLINUX_SYMBOL(__per_cpu_start) = .; \
|
2010-02-19 17:03:43 -07:00
|
|
|
*(.data..percpu..first) \
|
2010-10-19 21:07:02 -06:00
|
|
|
. = ALIGN(PAGE_SIZE); \
|
2010-02-19 17:03:43 -07:00
|
|
|
*(.data..percpu..page_aligned) \
|
2010-10-19 21:07:02 -06:00
|
|
|
*(.data..percpu..readmostly) \
|
2010-02-19 17:03:43 -07:00
|
|
|
*(.data..percpu) \
|
|
|
|
|
*(.data..percpu..shared_aligned) \
|
2009-01-18 20:21:28 -07:00
|
|
|
VMLINUX_SYMBOL(__per_cpu_end) = .; \
|
|
|
|
|
} phdr \
|
2010-02-19 17:03:43 -07:00
|
|
|
. = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);
|
2009-01-13 04:41:35 -07:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* PERCPU - define output section for percpu area, simple version
|
|
|
|
|
* @align: required alignment
|
|
|
|
|
*
|
|
|
|
|
* Align to @align and outputs output section for percpu area. This
|
|
|
|
|
* macro doesn't maniuplate @vaddr or @phdr and __per_cpu_load and
|
|
|
|
|
* __per_cpu_start will be identical.
|
2009-01-30 00:32:22 -07:00
|
|
|
*
|
|
|
|
|
* This macro is equivalent to ALIGN(align); PERCPU_VADDR( , ) except
|
|
|
|
|
* that __per_cpu_load is defined as a relative symbol against
|
2010-02-19 17:03:43 -07:00
|
|
|
* .data..percpu which is required for relocatable x86_32
|
2009-01-30 00:32:22 -07:00
|
|
|
* configuration.
|
2009-01-13 04:41:35 -07:00
|
|
|
*/
|
2007-07-19 02:48:12 -06:00
|
|
|
#define PERCPU(align) \
|
|
|
|
|
. = ALIGN(align); \
|
2010-02-19 17:03:43 -07:00
|
|
|
.data..percpu : AT(ADDR(.data..percpu) - LOAD_OFFSET) { \
|
2009-01-30 00:32:22 -07:00
|
|
|
VMLINUX_SYMBOL(__per_cpu_load) = .; \
|
|
|
|
|
VMLINUX_SYMBOL(__per_cpu_start) = .; \
|
2010-02-19 17:03:43 -07:00
|
|
|
*(.data..percpu..first) \
|
2010-10-19 21:07:02 -06:00
|
|
|
. = ALIGN(PAGE_SIZE); \
|
2010-02-19 17:03:43 -07:00
|
|
|
*(.data..percpu..page_aligned) \
|
2010-10-21 01:15:00 -06:00
|
|
|
*(.data..percpu..readmostly) \
|
2010-02-19 17:03:43 -07:00
|
|
|
*(.data..percpu) \
|
|
|
|
|
*(.data..percpu..shared_aligned) \
|
2009-01-30 00:32:22 -07:00
|
|
|
VMLINUX_SYMBOL(__per_cpu_end) = .; \
|
|
|
|
|
}
|
2009-06-07 12:46:37 -06:00
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Definition of the high level *_SECTION macros
|
|
|
|
|
* They will fit only a subset of the architectures
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Writeable data.
|
|
|
|
|
* All sections are combined in a single .data section.
|
|
|
|
|
* The sections following CONSTRUCTORS are arranged so their
|
|
|
|
|
* typical alignment matches.
|
|
|
|
|
* A cacheline is typical/always less than a PAGE_SIZE so
|
|
|
|
|
* the sections that has this restriction (or similar)
|
|
|
|
|
* is located before the ones requiring PAGE_SIZE alignment.
|
|
|
|
|
* NOSAVE_DATA starts and ends with a PAGE_SIZE alignment which
|
|
|
|
|
* matches the requirment of PAGE_ALIGNED_DATA.
|
|
|
|
|
*
|
2009-06-14 14:10:41 -06:00
|
|
|
* use 0 as page_align if page_aligned data is not used */
|
2009-06-23 10:04:36 -06:00
|
|
|
#define RW_DATA_SECTION(cacheline, pagealigned, inittask) \
|
2009-06-07 12:46:37 -06:00
|
|
|
. = ALIGN(PAGE_SIZE); \
|
|
|
|
|
.data : AT(ADDR(.data) - LOAD_OFFSET) { \
|
2009-06-23 16:53:15 -06:00
|
|
|
INIT_TASK_DATA(inittask) \
|
2009-09-24 08:36:16 -06:00
|
|
|
NOSAVE_DATA \
|
|
|
|
|
PAGE_ALIGNED_DATA(pagealigned) \
|
2009-06-07 12:46:37 -06:00
|
|
|
CACHELINE_ALIGNED_DATA(cacheline) \
|
|
|
|
|
READ_MOSTLY_DATA(cacheline) \
|
|
|
|
|
DATA_DATA \
|
|
|
|
|
CONSTRUCTORS \
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#define INIT_TEXT_SECTION(inittext_align) \
|
|
|
|
|
. = ALIGN(inittext_align); \
|
|
|
|
|
.init.text : AT(ADDR(.init.text) - LOAD_OFFSET) { \
|
|
|
|
|
VMLINUX_SYMBOL(_sinittext) = .; \
|
|
|
|
|
INIT_TEXT \
|
|
|
|
|
VMLINUX_SYMBOL(_einittext) = .; \
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#define INIT_DATA_SECTION(initsetup_align) \
|
|
|
|
|
.init.data : AT(ADDR(.init.data) - LOAD_OFFSET) { \
|
|
|
|
|
INIT_DATA \
|
|
|
|
|
INIT_SETUP(initsetup_align) \
|
|
|
|
|
INIT_CALLS \
|
|
|
|
|
CON_INITCALL \
|
|
|
|
|
SECURITY_INITCALL \
|
|
|
|
|
INIT_RAM_FS \
|
|
|
|
|
}
|
|
|
|
|
|
2009-07-12 16:23:33 -06:00
|
|
|
#define BSS_SECTION(sbss_align, bss_align, stop_align) \
|
|
|
|
|
. = ALIGN(sbss_align); \
|
|
|
|
|
VMLINUX_SYMBOL(__bss_start) = .; \
|
|
|
|
|
SBSS(sbss_align) \
|
2009-06-07 12:46:37 -06:00
|
|
|
BSS(bss_align) \
|
2009-07-12 16:23:33 -06:00
|
|
|
. = ALIGN(stop_align); \
|
|
|
|
|
VMLINUX_SYMBOL(__bss_stop) = .;
|
