From: Christophe Leroy <christophe.leroy@csgroup.eu>
To: Naveen N Rao <naveen@kernel.org>,
"linuxppc-dev@lists.ozlabs.org" <linuxppc-dev@lists.ozlabs.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Subject: Re: [PATCH 14/17] powerpc/ftrace: Replace use of ftrace_call_replace() with ftrace_create_branch_inst()
Date: Fri, 23 Jun 2023 05:32:21 +0000 [thread overview]
Message-ID: <a09d469f-3368-c3e8-c36f-5a50b4da9f4e@csgroup.eu> (raw)
In-Reply-To: <953513b88fa922ba7a66d772dc1310710efe9177.1687166935.git.naveen@kernel.org>
Le 19/06/2023 à 11:47, Naveen N Rao a écrit :
> ftrace_create_branch_inst() is clearer about its intent than
> ftrace_call_replace().
>
> Signed-off-by: Naveen N Rao <naveen@kernel.org>
Reviewed-by: Christophe Leroy <christophe.leroy@csgroup.eu>
> ---
> arch/powerpc/kernel/trace/ftrace.c | 17 ++---------------
> 1 file changed, 2 insertions(+), 15 deletions(-)
>
> diff --git a/arch/powerpc/kernel/trace/ftrace.c b/arch/powerpc/kernel/trace/ftrace.c
> index c37e22c6c26521..422dd760fbe013 100644
> --- a/arch/powerpc/kernel/trace/ftrace.c
> +++ b/arch/powerpc/kernel/trace/ftrace.c
> @@ -41,19 +41,6 @@ static ppc_inst_t ftrace_create_branch_inst(unsigned long ip, unsigned long addr
> return op;
> }
>
> -static ppc_inst_t
> -ftrace_call_replace(unsigned long ip, unsigned long addr, int link)
> -{
> - ppc_inst_t op;
> -
> - addr = ppc_function_entry((void *)addr);
> -
> - /* if (link) set op to 'bl' else 'b' */
> - create_branch(&op, (u32 *)ip, addr, link ? BRANCH_SET_LINK : 0);
> -
> - return op;
> -}
> -
> static inline int ftrace_read_inst(unsigned long ip, ppc_inst_t *op)
> {
> if (copy_inst_from_kernel_nofault(op, (void *)ip)) {
> @@ -275,14 +262,14 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
> int ret;
>
> old = ppc_inst_read((u32 *)&ftrace_call);
> - new = ftrace_call_replace(ip, (unsigned long)func, 1);
> + new = ftrace_create_branch_inst(ip, ppc_function_entry(func), 1);
> ret = ftrace_modify_code(ip, old, new);
>
> /* Also update the regs callback function */
> if (IS_ENABLED(CONFIG_DYNAMIC_FTRACE_WITH_REGS) && !ret) {
> ip = (unsigned long)(&ftrace_regs_call);
> old = ppc_inst_read((u32 *)&ftrace_regs_call);
> - new = ftrace_call_replace(ip, (unsigned long)func, 1);
> + new = ftrace_create_branch_inst(ip, ppc_function_entry(func), 1);
> ret = ftrace_modify_code(ip, old, new);
> }
>
next prev parent reply other threads:[~2023-06-23 5:34 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-19 9:47 [PATCH 00/17] powerpc/ftrace: refactor and add support for -fpatchable-function-entry Naveen N Rao
2023-06-19 9:47 ` [PATCH 01/17] powerpc/ftrace: Fix dropping weak symbols with older toolchains Naveen N Rao
2023-06-23 5:10 ` Christophe Leroy
2023-06-19 9:47 ` [PATCH 02/17] powerpc/module: Remove unused .ftrace.tramp section Naveen N Rao
2023-06-23 5:12 ` Christophe Leroy
2023-06-19 9:47 ` [PATCH 03/17] powerpc64/ftrace: Move ELFv1 and -pg support code into a separate file Naveen N Rao
2023-06-23 5:13 ` Christophe Leroy
2023-06-19 9:47 ` [PATCH 04/17] powerpc/ftrace: Simplify function_graph support in ftrace.c Naveen N Rao
2023-06-23 5:14 ` Christophe Leroy
2023-06-19 9:47 ` [PATCH 05/17] powerpc/ftrace: Use FTRACE_REGS_ADDR to identify the correct ftrace trampoline Naveen N Rao
2023-06-23 5:15 ` Christophe Leroy
2023-06-19 9:47 ` [PATCH 06/17] powerpc/ftrace: Extend ftrace support for large kernels to ppc32 Naveen N Rao
2023-06-23 5:21 ` Christophe Leroy
2023-06-19 9:47 ` [PATCH 07/17] powerpc/ftrace: Consolidate ftrace support into fewer files Naveen N Rao
2023-06-23 5:25 ` Christophe Leroy
2023-06-28 7:32 ` Naveen N Rao
2023-06-19 9:47 ` [PATCH 08/17] powerpc/ftrace: Refactor ftrace_modify_code() Naveen N Rao
2023-06-23 5:27 ` Christophe Leroy
2023-06-19 9:47 ` [PATCH 09/17] powerpc/ftrace: Stop re-purposing linker generated long branches for ftrace Naveen N Rao
2023-06-23 5:28 ` Christophe Leroy
2023-06-19 9:47 ` [PATCH 10/17] powerpc/ftrace: Add separate ftrace_init_nop() with additional validation Naveen N Rao
2023-06-23 5:29 ` Christophe Leroy
2023-06-19 9:47 ` [PATCH 11/17] powerpc/ftrace: Simplify ftrace_make_nop() Naveen N Rao
2023-06-23 5:30 ` Christophe Leroy
2023-06-19 9:47 ` [PATCH 12/17] powerpc/ftrace: Simplify ftrace_make_call() Naveen N Rao
2023-06-23 5:30 ` Christophe Leroy
2023-06-19 9:47 ` [PATCH 13/17] powerpc/ftrace: Simplify ftrace_modify_call() Naveen N Rao
2023-06-23 5:31 ` Christophe Leroy
2023-06-19 9:47 ` [PATCH 14/17] powerpc/ftrace: Replace use of ftrace_call_replace() with ftrace_create_branch_inst() Naveen N Rao
2023-06-23 5:32 ` Christophe Leroy [this message]
2023-06-19 9:47 ` [PATCH 15/17] powerpc/ftrace: Implement ftrace_replace_code() Naveen N Rao
2023-06-23 5:32 ` Christophe Leroy
2023-06-19 9:47 ` [PATCH 16/17] powerpc/ftrace: Add support for -fpatchable-function-entry Naveen N Rao
2023-06-23 5:37 ` Christophe Leroy
2023-06-28 7:40 ` Naveen N Rao
2023-06-19 9:47 ` [PATCH 17/17] powerpc/ftrace: Create a dummy stackframe to fix stack unwind Naveen N Rao
2023-06-23 5:40 ` Christophe Leroy
2023-06-28 7:43 ` Naveen N Rao
2023-08-23 11:55 ` [PATCH 00/17] powerpc/ftrace: refactor and add support for -fpatchable-function-entry Michael Ellerman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a09d469f-3368-c3e8-c36f-5a50b4da9f4e@csgroup.eu \
--to=christophe.leroy@csgroup.eu \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=naveen@kernel.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).