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
Thread-Topic: [PATCH v2 10/13] powerpc/ftrace: Refactor
 ftrace_{en/dis}able_ftrace_graph_caller
Thread-Index: AQHX9cAGmx9IDhU2XE6F7yRDPjZy2g==
Date:   Mon, 20 Dec 2021 16:38:31 +0000
Message-ID: <f37785a531f1a8f201e1b3da45997a5c77e9d820.1640017960.git.christophe.leroy@csgroup.eu>
References: <cover.1640017960.git.christophe.leroy@csgroup.eu>
In-Reply-To: <cover.1640017960.git.christophe.leroy@csgroup.eu>
Accept-Language: fr-FR, en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?YMulNDEx/s7T3xr/Yzp9JBIZpnkFckNYfgGiSqtnbe1bOvUNRufx6GDmx8?=
 =?iso-8859-1?Q?a1C5g+1SY0k8HgkWlYfNHFGzWDYRQ8rXEVZqLIXFJYXgmRUyyH+2N7J/Cw?=
 =?iso-8859-1?Q?a2/rSvBTF0qhFWPegwxH1H7W+5YsoY2ZivAnjMBB418/RqKrfJhTvudygU?=
 =?iso-8859-1?Q?4SOzaWB90vFEluYqECtcHdAduqcGaEo+qJinY76o2Y6rKt3wx7dPpqMEvA?=
 =?iso-8859-1?Q?xCaThs/w6KHa0vpDjQm5dBXUBwkQccuWhA1+c70SzQgNACbAuXlntAi6mp?=
 =?iso-8859-1?Q?HBJhxq7cTMjhOrwP0fDZVTm1w9ltW0gri06U0MqWjwa0z2Y7m2e3f+lY9w?=
 =?iso-8859-1?Q?yHvOO0a2l3j8AhxRB2HEXF9kWoai+Q/EHqyVuVtgxfyfrth5KOgkblHcnw?=
 =?iso-8859-1?Q?Xk3STvUv1tbpIEGykyIcRbuIeMWJuPmrocg4Wl/7TGJrRX9wMO11bKxygZ?=
 =?iso-8859-1?Q?YjYJxZKr8cfMknnfcGIccr4DzKrAl0pNdQf3TkSmXrnLiZfDnELwJr5AAG?=
 =?iso-8859-1?Q?KOIs3IVKRPeT1EfpzGh2ZC7CyAiDe3WCzXAEXcXN5RpmQw8B5SXco/K8/l?=
 =?iso-8859-1?Q?Pf6Lz3ilifcFB0akLr1QA1ICpCiC2K7kMvUgVSBYSpNehzDYh8obcl04u8?=
 =?iso-8859-1?Q?gcdKfzBEqdvNTdlVayhn/nwUwnVOWcC+qioFx3xHyLoRaHGf5+tMeCS0SJ?=
 =?iso-8859-1?Q?tqJNtHlGmg7w6BpZV1mwHNahnnAiiLUVXUGzgIVMihLfwi6nRDKTW0l5dK?=
 =?iso-8859-1?Q?bL4m3gpzIcN+JqdIZ/5+yLQAh8xth39lHUMBZa/ZqXhfCgHNZhAkUYIz/O?=
 =?iso-8859-1?Q?JGGxhMwv+/9Hv3W71Tcn8K9m4P4Egu6CQko6l1XBXL5g2hQUdA4h0M3Fpo?=
 =?iso-8859-1?Q?twezn5kKlwTQdAga4h5ztoLM/dUjJnpI/6cSBz9bKAkLHPFiZoVXaumnT1?=
 =?iso-8859-1?Q?7V5/vlcRlDJAN9KVnNM0NKz7TJIsibodxQW8ab23ogPjRhVv/rnqVYVhMZ?=
 =?iso-8859-1?Q?SsGQJhnjXj+KnlRrDp3OY4GWser/ExQ2iAQn+N8b8FR3mmkGPUpF2dT1pI?=
 =?iso-8859-1?Q?82E8zb8HAeGFbHiv9JF3y/M/jJd/alGcC6h9uTG4idKXLP0fL3CQbPoEyG?=
 =?iso-8859-1?Q?f5e+aheBGF70eDap6KNQodUMmAYsd6GoI3j/l8wTLb8XrysbRvgMko1E9Y?=
 =?iso-8859-1?Q?b2q40W1G+OvWYT6n6/V7IoLQXFbkGlOLuS6ohZFpohfoxiSHfwj2LBiBiW?=
 =?iso-8859-1?Q?uWj2RpG1hd2wl0auGn8jc9Sg68k1cmypKL4GnNwcEImxnjCpsLiHK8O2pC?=
 =?iso-8859-1?Q?F+5hw484NNXCGknmp6MoNS38qIY4wL+Xa18LLzCGbGZ6nkPs6akEHPSwNx?=
 =?iso-8859-1?Q?Rk6hmM9vqNAIHFLZiJnxPfOftT9lO2OhvYGNp7Utmh1EOn414gdqrfelO+?=
 =?iso-8859-1?Q?f//yMEVYxA6assct7Uk7Z0sukkw7qkLAhhfeCUzimjXFI31p43iMhx81NP?=
 =?iso-8859-1?Q?5x94R0s5pZdtJ69ZuvfDuf/ri8Mx9mEDRUB5PJkm8aa+BMOi3lgGt1bQtD?=
 =?iso-8859-1?Q?rlNOA8XRVyUKeMG5weguvBna2F+O/rLjeu6zhJJtVsiSVv3qk3BxZPURNm?=
 =?iso-8859-1?Q?AMAwBvf/CQAKFP9AbgpdILL2GIFJTqm7ejexta+XqH1v5VTjWuv1BVvOIn?=
 =?iso-8859-1?Q?hSBSDQTx38BqECC6UbCL97Ab1XQ2C63sd5R2ELCfjFPEkuoW1+YaF8d2VH?=
 =?iso-8859-1?Q?/5MoKALSrBl7COYXZObFNP7r8=3D?=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: 8BIT
MIME-Version: 1.0
X-OriginatorOrg: csgroup.eu
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-Network-Message-Id: 3dd04941-70d2-4b4e-5a42-08d9c3d7289a
X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Dec 2021 16:38:31.5756
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 9914def7-b676-4fda-8815-5d49fb3b45c8
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: hhhBE1R9yHi3oIEw7owcC0VeH5ui+srYpDgwnH1C+PnLn1kpBbO944LI4UR0TXh4mkXmPCem5n3gUg187TvkFJ99z3NPccxz503coePE3hc=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MRZP264MB2924
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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