* [PATCH Resend] ARM64:ftrace: fix ftrace_modify_graph_caller for branch replace
@ 2015-02-13 4:06 Pratyush Anand
2015-02-17 0:12 ` AKASHI Takahiro
0 siblings, 1 reply; 2+ messages in thread
From: Pratyush Anand @ 2015-02-13 4:06 UTC (permalink / raw)
To: linux-arm-kernel
ftrace_enable_ftrace_graph_caller and ftrace_disable_ftrace_graph_caller
should replace B(jmp) instruction and not BL(call) instruction.
commit 9f1ae7596aad("arm64: Correct ftrace calls to
aarch64_insn_gen_branch_imm()") did a typo and used
AARCH64_INSN_BRANCH_LINK instead of AARCH64_INSN_BRANCH_NOLINK.
Signed-off-by: Pratyush Anand <panand@redhat.com>
---
arch/arm64/kernel/ftrace.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/kernel/ftrace.c b/arch/arm64/kernel/ftrace.c
index cf8556ae09d0..c851be795080 100644
--- a/arch/arm64/kernel/ftrace.c
+++ b/arch/arm64/kernel/ftrace.c
@@ -156,7 +156,7 @@ static int ftrace_modify_graph_caller(bool enable)
branch = aarch64_insn_gen_branch_imm(pc,
(unsigned long)ftrace_graph_caller,
- AARCH64_INSN_BRANCH_LINK);
+ AARCH64_INSN_BRANCH_NOLINK);
nop = aarch64_insn_gen_nop();
if (enable)
--
2.1.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH Resend] ARM64:ftrace: fix ftrace_modify_graph_caller for branch replace
2015-02-13 4:06 [PATCH Resend] ARM64:ftrace: fix ftrace_modify_graph_caller for branch replace Pratyush Anand
@ 2015-02-17 0:12 ` AKASHI Takahiro
0 siblings, 0 replies; 2+ messages in thread
From: AKASHI Takahiro @ 2015-02-17 0:12 UTC (permalink / raw)
To: linux-arm-kernel
On 02/13/2015 01:06 PM, Pratyush Anand wrote:
> ftrace_enable_ftrace_graph_caller and ftrace_disable_ftrace_graph_caller
> should replace B(jmp) instruction and not BL(call) instruction.
Thanks. I originally intended to use "b".
("bl" may also work anyway 'cause link register will be saved/restored
around ftrace_caller().)
-Takahiro AKASHI
> commit 9f1ae7596aad("arm64: Correct ftrace calls to
> aarch64_insn_gen_branch_imm()") did a typo and used
> AARCH64_INSN_BRANCH_LINK instead of AARCH64_INSN_BRANCH_NOLINK.
>
> Signed-off-by: Pratyush Anand <panand@redhat.com>
> ---
> arch/arm64/kernel/ftrace.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm64/kernel/ftrace.c b/arch/arm64/kernel/ftrace.c
> index cf8556ae09d0..c851be795080 100644
> --- a/arch/arm64/kernel/ftrace.c
> +++ b/arch/arm64/kernel/ftrace.c
> @@ -156,7 +156,7 @@ static int ftrace_modify_graph_caller(bool enable)
>
> branch = aarch64_insn_gen_branch_imm(pc,
> (unsigned long)ftrace_graph_caller,
> - AARCH64_INSN_BRANCH_LINK);
> + AARCH64_INSN_BRANCH_NOLINK);
> nop = aarch64_insn_gen_nop();
>
> if (enable)
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-02-17 0:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-02-13 4:06 [PATCH Resend] ARM64:ftrace: fix ftrace_modify_graph_caller for branch replace Pratyush Anand
2015-02-17 0:12 ` AKASHI Takahiro
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).