Commit e2d591d2 authored by Mark Brown's avatar Mark Brown Committed by Catalin Marinas

arm64: entry-ftrace.S: Convert to modern annotations for assembly functions

In an effort to clarify and simplify the annotation of assembly functions
in the kernel new macros have been introduced. These replace ENTRY and
ENDPROC and also add a new annotation for static functions which previously
had no ENTRY equivalent. Update the annotations in the core kernel code to
the new macros.
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent e7bf6972
...@@ -91,11 +91,11 @@ ENTRY(ftrace_common) ...@@ -91,11 +91,11 @@ ENTRY(ftrace_common)
ldr_l x2, function_trace_op // op ldr_l x2, function_trace_op // op
mov x3, sp // regs mov x3, sp // regs
GLOBAL(ftrace_call) SYM_INNER_LABEL(ftrace_call, SYM_L_GLOBAL)
bl ftrace_stub bl ftrace_stub
#ifdef CONFIG_FUNCTION_GRAPH_TRACER #ifdef CONFIG_FUNCTION_GRAPH_TRACER
GLOBAL(ftrace_graph_call) // ftrace_graph_caller(); SYM_INNER_LABEL(ftrace_graph_call, SYM_L_GLOBAL) // ftrace_graph_caller();
nop // If enabled, this will be replaced nop // If enabled, this will be replaced
// "b ftrace_graph_caller" // "b ftrace_graph_caller"
#endif #endif
...@@ -218,7 +218,7 @@ ENDPROC(ftrace_graph_caller) ...@@ -218,7 +218,7 @@ ENDPROC(ftrace_graph_caller)
* - tracer function to probe instrumented function's entry, * - tracer function to probe instrumented function's entry,
* - ftrace_graph_caller to set up an exit hook * - ftrace_graph_caller to set up an exit hook
*/ */
ENTRY(_mcount) SYM_FUNC_START(_mcount)
mcount_enter mcount_enter
ldr_l x2, ftrace_trace_function ldr_l x2, ftrace_trace_function
...@@ -242,7 +242,7 @@ skip_ftrace_call: // } ...@@ -242,7 +242,7 @@ skip_ftrace_call: // }
b.ne ftrace_graph_caller // ftrace_graph_caller(); b.ne ftrace_graph_caller // ftrace_graph_caller();
#endif /* CONFIG_FUNCTION_GRAPH_TRACER */ #endif /* CONFIG_FUNCTION_GRAPH_TRACER */
mcount_exit mcount_exit
ENDPROC(_mcount) SYM_FUNC_END(_mcount)
EXPORT_SYMBOL(_mcount) EXPORT_SYMBOL(_mcount)
NOKPROBE(_mcount) NOKPROBE(_mcount)
...@@ -253,9 +253,9 @@ NOKPROBE(_mcount) ...@@ -253,9 +253,9 @@ NOKPROBE(_mcount)
* and later on, NOP to branch to ftrace_caller() when enabled or branch to * and later on, NOP to branch to ftrace_caller() when enabled or branch to
* NOP when disabled per-function base. * NOP when disabled per-function base.
*/ */
ENTRY(_mcount) SYM_FUNC_START(_mcount)
ret ret
ENDPROC(_mcount) SYM_FUNC_END(_mcount)
EXPORT_SYMBOL(_mcount) EXPORT_SYMBOL(_mcount)
NOKPROBE(_mcount) NOKPROBE(_mcount)
...@@ -268,24 +268,24 @@ NOKPROBE(_mcount) ...@@ -268,24 +268,24 @@ NOKPROBE(_mcount)
* - tracer function to probe instrumented function's entry, * - tracer function to probe instrumented function's entry,
* - ftrace_graph_caller to set up an exit hook * - ftrace_graph_caller to set up an exit hook
*/ */
ENTRY(ftrace_caller) SYM_FUNC_START(ftrace_caller)
mcount_enter mcount_enter
mcount_get_pc0 x0 // function's pc mcount_get_pc0 x0 // function's pc
mcount_get_lr x1 // function's lr mcount_get_lr x1 // function's lr
GLOBAL(ftrace_call) // tracer(pc, lr); SYM_INNER_LABEL(ftrace_call, SYM_L_GLOBAL) // tracer(pc, lr);
nop // This will be replaced with "bl xxx" nop // This will be replaced with "bl xxx"
// where xxx can be any kind of tracer. // where xxx can be any kind of tracer.
#ifdef CONFIG_FUNCTION_GRAPH_TRACER #ifdef CONFIG_FUNCTION_GRAPH_TRACER
GLOBAL(ftrace_graph_call) // ftrace_graph_caller(); SYM_INNER_LABEL(ftrace_graph_call) // ftrace_graph_caller();
nop // If enabled, this will be replaced nop // If enabled, this will be replaced
// "b ftrace_graph_caller" // "b ftrace_graph_caller"
#endif #endif
mcount_exit mcount_exit
ENDPROC(ftrace_caller) SYM_FUNC_END(ftrace_caller)
#endif /* CONFIG_DYNAMIC_FTRACE */ #endif /* CONFIG_DYNAMIC_FTRACE */
#ifdef CONFIG_FUNCTION_GRAPH_TRACER #ifdef CONFIG_FUNCTION_GRAPH_TRACER
...@@ -298,20 +298,20 @@ ENDPROC(ftrace_caller) ...@@ -298,20 +298,20 @@ ENDPROC(ftrace_caller)
* the call stack in order to intercept instrumented function's return path * the call stack in order to intercept instrumented function's return path
* and run return_to_handler() later on its exit. * and run return_to_handler() later on its exit.
*/ */
ENTRY(ftrace_graph_caller) SYM_FUNC_START(ftrace_graph_caller)
mcount_get_pc x0 // function's pc mcount_get_pc x0 // function's pc
mcount_get_lr_addr x1 // pointer to function's saved lr mcount_get_lr_addr x1 // pointer to function's saved lr
mcount_get_parent_fp x2 // parent's fp mcount_get_parent_fp x2 // parent's fp
bl prepare_ftrace_return // prepare_ftrace_return(pc, &lr, fp) bl prepare_ftrace_return // prepare_ftrace_return(pc, &lr, fp)
mcount_exit mcount_exit
ENDPROC(ftrace_graph_caller) SYM_FUNC_END(ftrace_graph_caller)
#endif /* CONFIG_FUNCTION_GRAPH_TRACER */ #endif /* CONFIG_FUNCTION_GRAPH_TRACER */
#endif /* CONFIG_DYNAMIC_FTRACE_WITH_REGS */ #endif /* CONFIG_DYNAMIC_FTRACE_WITH_REGS */
ENTRY(ftrace_stub) SYM_FUNC_START(ftrace_stub)
ret ret
ENDPROC(ftrace_stub) SYM_FUNC_END(ftrace_stub)
#ifdef CONFIG_FUNCTION_GRAPH_TRACER #ifdef CONFIG_FUNCTION_GRAPH_TRACER
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment