From: Christophe Leroy <christophe.leroy@csgroup.eu> To: Josh Poimboeuf <jpoimboe@redhat.com>, Jiri Kosina <jikos@kernel.org>, Miroslav Benes <mbenes@suse.cz>, Petr Mladek <pmladek@suse.com>, Joe Lawrence <joe.lawrence@redhat.com>, Steven Rostedt <rostedt@goodmis.org>, Ingo Molnar <mingo@redhat.com>, "Naveen N . Rao" <naveen.n.rao@linux.vnet.ibm.com> Cc: Christophe Leroy <christophe.leroy@csgroup.eu>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, "linuxppc-dev@lists.ozlabs.org" <linuxppc-dev@lists.ozlabs.org>, "live-patching@vger.kernel.org" <live-patching@vger.kernel.org> Subject: [PATCH v2 10/13] powerpc/ftrace: Refactor ftrace_{en/dis}able_ftrace_graph_caller Date: Mon, 20 Dec 2021 16:38:31 +0000 [thread overview] Message-ID: <f37785a531f1a8f201e1b3da45997a5c77e9d820.1640017960.git.christophe.leroy@csgroup.eu> (raw) In-Reply-To: <cover.1640017960.git.christophe.leroy@csgroup.eu> ftrace_enable_ftrace_graph_caller() and ftrace_disable_ftrace_graph_caller() have common code. They will have even more common code after following patch. Refactor into a single ftrace_modify_ftrace_graph_caller() function. Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> --- arch/powerpc/kernel/trace/ftrace.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/arch/powerpc/kernel/trace/ftrace.c b/arch/powerpc/kernel/trace/ftrace.c index 80b6285769f2..ce673764cb69 100644 --- a/arch/powerpc/kernel/trace/ftrace.c +++ b/arch/powerpc/kernel/trace/ftrace.c @@ -910,30 +910,27 @@ int __init ftrace_dyn_arch_init(void) extern void ftrace_graph_call(void); extern void ftrace_graph_stub(void); -int ftrace_enable_ftrace_graph_caller(void) +static int ftrace_modify_ftrace_graph_caller(bool enable) { unsigned long ip = (unsigned long)(&ftrace_graph_call); unsigned long addr = (unsigned long)(&ftrace_graph_caller); unsigned long stub = (unsigned long)(&ftrace_graph_stub); ppc_inst_t old, new; - old = ftrace_call_replace(ip, stub, 0); - new = ftrace_call_replace(ip, addr, 0); + old = ftrace_call_replace(ip, enable ? stub : addr, 0); + new = ftrace_call_replace(ip, enable ? addr : stub, 0); return ftrace_modify_code(ip, old, new); } -int ftrace_disable_ftrace_graph_caller(void) +int ftrace_enable_ftrace_graph_caller(void) { - unsigned long ip = (unsigned long)(&ftrace_graph_call); - unsigned long addr = (unsigned long)(&ftrace_graph_caller); - unsigned long stub = (unsigned long)(&ftrace_graph_stub); - ppc_inst_t old, new; - - old = ftrace_call_replace(ip, addr, 0); - new = ftrace_call_replace(ip, stub, 0); + return ftrace_modify_ftrace_graph_caller(true); +} - return ftrace_modify_code(ip, old, new); +int ftrace_disable_ftrace_graph_caller(void) +{ + return ftrace_modify_ftrace_graph_caller(false); } /* -- 2.33.1
WARNING: multiple messages have this Message-ID (diff)
From: Christophe Leroy <christophe.leroy@csgroup.eu> To: Josh Poimboeuf <jpoimboe@redhat.com>, Jiri Kosina <jikos@kernel.org>, Miroslav Benes <mbenes@suse.cz>, Petr Mladek <pmladek@suse.com>, Joe Lawrence <joe.lawrence@redhat.com>, Steven Rostedt <rostedt@goodmis.org>, Ingo Molnar <mingo@redhat.com>, "Naveen N . Rao" <naveen.n.rao@linux.vnet.ibm.com> Cc: "live-patching@vger.kernel.org" <live-patching@vger.kernel.org>, "linuxppc-dev@lists.ozlabs.org" <linuxppc-dev@lists.ozlabs.org>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org> Subject: [PATCH v2 10/13] powerpc/ftrace: Refactor ftrace_{en/dis}able_ftrace_graph_caller Date: Mon, 20 Dec 2021 16:38:31 +0000 [thread overview] Message-ID: <f37785a531f1a8f201e1b3da45997a5c77e9d820.1640017960.git.christophe.leroy@csgroup.eu> (raw) In-Reply-To: <cover.1640017960.git.christophe.leroy@csgroup.eu> ftrace_enable_ftrace_graph_caller() and ftrace_disable_ftrace_graph_caller() have common code. They will have even more common code after following patch. Refactor into a single ftrace_modify_ftrace_graph_caller() function. Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> --- arch/powerpc/kernel/trace/ftrace.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/arch/powerpc/kernel/trace/ftrace.c b/arch/powerpc/kernel/trace/ftrace.c index 80b6285769f2..ce673764cb69 100644 --- a/arch/powerpc/kernel/trace/ftrace.c +++ b/arch/powerpc/kernel/trace/ftrace.c @@ -910,30 +910,27 @@ int __init ftrace_dyn_arch_init(void) extern void ftrace_graph_call(void); extern void ftrace_graph_stub(void); -int ftrace_enable_ftrace_graph_caller(void) +static int ftrace_modify_ftrace_graph_caller(bool enable) { unsigned long ip = (unsigned long)(&ftrace_graph_call); unsigned long addr = (unsigned long)(&ftrace_graph_caller); unsigned long stub = (unsigned long)(&ftrace_graph_stub); ppc_inst_t old, new; - old = ftrace_call_replace(ip, stub, 0); - new = ftrace_call_replace(ip, addr, 0); + old = ftrace_call_replace(ip, enable ? stub : addr, 0); + new = ftrace_call_replace(ip, enable ? addr : stub, 0); return ftrace_modify_code(ip, old, new); } -int ftrace_disable_ftrace_graph_caller(void) +int ftrace_enable_ftrace_graph_caller(void) { - unsigned long ip = (unsigned long)(&ftrace_graph_call); - unsigned long addr = (unsigned long)(&ftrace_graph_caller); - unsigned long stub = (unsigned long)(&ftrace_graph_stub); - ppc_inst_t old, new; - - old = ftrace_call_replace(ip, addr, 0); - new = ftrace_call_replace(ip, stub, 0); + return ftrace_modify_ftrace_graph_caller(true); +} - return ftrace_modify_code(ip, old, new); +int ftrace_disable_ftrace_graph_caller(void) +{ + return ftrace_modify_ftrace_graph_caller(false); } /* -- 2.33.1
next prev parent reply other threads:[~2021-12-20 16:38 UTC|newest] Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-12-20 16:37 [PATCH v2 00/13] Implement livepatch on PPC32 and more Christophe Leroy 2021-12-20 16:37 ` Christophe Leroy 2021-12-20 16:38 ` [PATCH v2 01/13] livepatch: Fix build failure on 32 bits processors Christophe Leroy 2021-12-20 16:38 ` Christophe Leroy 2021-12-22 13:47 ` Miroslav Benes 2021-12-22 13:47 ` Miroslav Benes 2022-01-04 19:35 ` Joe Lawrence 2022-01-04 19:35 ` Joe Lawrence 2021-12-20 16:38 ` [PATCH v2 02/13] tracing: Fix selftest config check for function graph start up test Christophe Leroy 2021-12-20 16:38 ` Christophe Leroy 2022-02-24 13:43 ` Christophe Leroy 2022-02-24 13:43 ` Christophe Leroy 2022-02-24 14:53 ` Steven Rostedt 2022-02-24 14:53 ` Steven Rostedt 2022-02-24 15:13 ` Christophe Leroy 2022-02-24 15:13 ` Christophe Leroy 2022-02-24 15:17 ` Steven Rostedt 2022-02-24 15:17 ` Steven Rostedt 2022-02-25 2:42 ` Michael Ellerman 2022-02-25 2:42 ` Michael Ellerman 2021-12-20 16:38 ` [PATCH v2 03/13] powerpc/module_32: Fix livepatching for RO modules Christophe Leroy 2021-12-20 16:38 ` Christophe Leroy 2022-01-04 19:44 ` Joe Lawrence 2022-01-04 19:44 ` Joe Lawrence 2021-12-20 16:38 ` [PATCH v2 04/13] powerpc/ftrace: Add support for livepatch to PPC32 Christophe Leroy 2021-12-20 16:38 ` Christophe Leroy 2021-12-22 14:00 ` Miroslav Benes 2021-12-22 14:00 ` Miroslav Benes 2021-12-20 16:38 ` [PATCH v2 05/13] powerpc/ftrace: Don't save again LR in ftrace_regs_caller() on PPC32 Christophe Leroy 2021-12-20 16:38 ` Christophe Leroy 2021-12-20 16:38 ` [PATCH v2 06/13] powerpc/ftrace: Simplify PPC32's return_to_handler() Christophe Leroy 2021-12-20 16:38 ` Christophe Leroy 2021-12-20 16:38 ` [PATCH v2 07/13] powerpc/ftrace: Prepare PPC32's ftrace_caller() for CONFIG_DYNAMIC_FTRACE_WITH_ARGS Christophe Leroy 2021-12-20 16:38 ` Christophe Leroy 2021-12-20 16:38 ` [PATCH v2 08/13] powerpc/ftrace: Prepare PPC64's " Christophe Leroy 2021-12-20 16:38 ` Christophe Leroy 2022-02-14 15:19 ` Naveen N. Rao 2022-02-14 15:19 ` Naveen N. Rao 2021-12-20 16:38 ` [PATCH v2 09/13] powerpc/ftrace: Implement CONFIG_DYNAMIC_FTRACE_WITH_ARGS Christophe Leroy 2021-12-20 16:38 ` Christophe Leroy 2021-12-22 14:19 ` Miroslav Benes 2021-12-22 14:19 ` Miroslav Benes 2021-12-22 14:19 ` Miroslav Benes 2022-02-14 15:25 ` Naveen N. Rao 2022-02-14 15:25 ` Naveen N. Rao 2022-02-15 8:00 ` Christophe Leroy 2022-02-15 8:00 ` Christophe Leroy 2022-02-15 11:05 ` Michael Ellerman 2022-02-15 11:05 ` Michael Ellerman 2022-02-15 13:36 ` Naveen N. Rao 2022-02-15 13:36 ` Naveen N. Rao 2022-02-15 14:28 ` Christophe Leroy 2022-02-15 14:28 ` Christophe Leroy 2022-02-15 14:51 ` Christophe Leroy 2022-02-15 14:51 ` Christophe Leroy 2022-02-15 16:25 ` Naveen N. Rao 2022-02-15 16:25 ` Naveen N. Rao 2022-02-16 13:04 ` Heiko Carstens 2022-02-16 13:04 ` Heiko Carstens 2022-02-16 13:27 ` Sven Schnelle 2022-02-16 13:27 ` Sven Schnelle 2022-02-15 14:38 ` Steven Rostedt 2022-02-15 14:38 ` Steven Rostedt 2022-02-15 16:26 ` Naveen N. Rao 2022-02-15 16:26 ` Naveen N. Rao 2021-12-20 16:38 ` Christophe Leroy [this message] 2021-12-20 16:38 ` [PATCH v2 10/13] powerpc/ftrace: Refactor ftrace_{en/dis}able_ftrace_graph_caller Christophe Leroy 2021-12-20 16:38 ` [PATCH v2 11/13] powerpc/ftrace: directly call of function graph tracer by ftrace caller Christophe Leroy 2021-12-20 16:38 ` Christophe Leroy 2022-02-14 17:24 ` Naveen N. Rao 2022-02-14 17:24 ` Naveen N. Rao 2022-02-14 19:03 ` Steven Rostedt 2022-02-14 19:03 ` Steven Rostedt 2021-12-20 16:38 ` [PATCH v2 12/13] powerpc/ftrace: Prepare ftrace_64_mprofile.S for reuse by PPC32 Christophe Leroy 2021-12-20 16:38 ` Christophe Leroy 2022-02-14 17:51 ` Naveen N. Rao 2022-02-14 17:51 ` Naveen N. Rao 2022-02-15 8:33 ` Christophe Leroy 2022-02-15 8:33 ` Christophe Leroy 2021-12-20 16:38 ` [PATCH v2 13/13] powerpc/ftrace: Remove ftrace_32.S Christophe Leroy 2021-12-20 16:38 ` Christophe Leroy 2022-02-11 7:41 ` [PATCH] Fixup for next-test 3a1a8f078670 ("powerpc/ftrace: Remove ftrace_32.S") Christophe Leroy 2022-02-11 7:41 ` Christophe Leroy 2022-02-16 12:26 ` [PATCH v2 00/13] Implement livepatch on PPC32 and more 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=f37785a531f1a8f201e1b3da45997a5c77e9d820.1640017960.git.christophe.leroy@csgroup.eu \ --to=christophe.leroy@csgroup.eu \ --cc=jikos@kernel.org \ --cc=joe.lawrence@redhat.com \ --cc=jpoimboe@redhat.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=live-patching@vger.kernel.org \ --cc=mbenes@suse.cz \ --cc=mingo@redhat.com \ --cc=naveen.n.rao@linux.vnet.ibm.com \ --cc=pmladek@suse.com \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.