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 09/13] powerpc/ftrace: Implement
 CONFIG_DYNAMIC_FTRACE_WITH_ARGS
Thread-Topic: [PATCH v2 09/13] powerpc/ftrace: Implement
 CONFIG_DYNAMIC_FTRACE_WITH_ARGS
Thread-Index: AQHX9cAEWTCD8cHnLE+YV5TEx6NNVg==
Date:   Mon, 20 Dec 2021 16:38:28 +0000
Message-ID: <5831f711a778fcd6eb51eb5898f1faae4378b35b.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?u+h1DKg03mn3h8dyvag2mL1q4w3+lFf7RRyjim/eBFO1S9ZQwtqDIYqkwS?=
 =?iso-8859-1?Q?XLiiD0DiCSj4n2VVP4DVkBFWOewAd2x4J1HOQB93O9bhBzCoRvp6+J/FO6?=
 =?iso-8859-1?Q?gFYs3v0I+LAujJtF9fFoNGm11bG7VQnQyQZb9fXN3VCT3RWwNaiUUaDgGW?=
 =?iso-8859-1?Q?9BIZPkxSk/xMZJrHWmRVs88w0KR6fo4e4SVkvAsWVPTRM5L00y5FM5Bm4c?=
 =?iso-8859-1?Q?qGtWm6QamRoacU5pNX6Oat8CL4Cs/n5J7g7oJ9UUoIGXHJ9EdhWuivMCwM?=
 =?iso-8859-1?Q?smQmx6JfEGLtAAWK8H4UqBqwhD+aRMapRpcrIyscW8pycxi5yqD0HLQVrN?=
 =?iso-8859-1?Q?WQnESZ+vqtULTFV88HWwwncrdDDt5AyG8baDJEld2ynddI3ZL9kYFofGu5?=
 =?iso-8859-1?Q?bNSYjgHDKP/AeQwJ/srCKkxPYqZW2NxWBS3tAc2aYBA/2T5ncTv02FeK+Q?=
 =?iso-8859-1?Q?S7hrvKXw+RO5c0msOlKlboN9u8OsHenJ4ZBiGqRaVrzFJqxwYkUX3XvR/M?=
 =?iso-8859-1?Q?bhsU7DPcOOzhFGUUWg9BXMdlOVxeI67J7gV9CIKydAjsqSZ44kYMSZUXrY?=
 =?iso-8859-1?Q?PKEsUrJni6yZU8oevr50eiJXwnzstcXxcJQi5KuGOvOHLwKL2bvD7jcuwJ?=
 =?iso-8859-1?Q?GcKRxYGXsioFrAKz1TEnC8zVscTbaHGDV3ZrzcBT8cN3ZjGTo+YKyt38vc?=
 =?iso-8859-1?Q?/fEpWJxoMYu8chp8T8z86n9HF22suwQybnCyNA8SGx/MrR5aZpubjRgkqP?=
 =?iso-8859-1?Q?NP4bRk8pw43kzjVqXsFrEiac8FZJpRSoNgXPQc/kYi9AqvDTKO7HorfTpx?=
 =?iso-8859-1?Q?Tp0AOQgrdKBYlAJQx62G1jtt89kcSFEIoFYmG+AKK6rRXJ4P8sdbj8/FcH?=
 =?iso-8859-1?Q?eMTFG99/MBB0VWJEOibKECfnkv3EOIiGQjb/SGIyIBK0owKxQymUFrF3Az?=
 =?iso-8859-1?Q?itg4MpAzFss2CtmV61WQe9Filla8Zoo18Bw6586vjKkxYXNzbpzk0fUMHj?=
 =?iso-8859-1?Q?626DDBpGCKDLRTcP+KTIJOHBMXN/k/73Pzvd1Xp3/jz0rNKNSRRFNNwk8c?=
 =?iso-8859-1?Q?Q0IxZ/B5+ElfmG9Pl+Lviyo8IjznS5ZcT/4hDtEGh+ygMIcv3AbsTwUV2+?=
 =?iso-8859-1?Q?nYtDLmDLSdQkumxftK83bmEu7PCMWo17EJVHZU0h8vtxyCbvva3ymMtP7Z?=
 =?iso-8859-1?Q?TNPjRymAw6N7u6vQ1F0w09tkDmU4dIQGBU2G0wHlAVa5sBXL2LCWTRszCp?=
 =?iso-8859-1?Q?lBgzhnwjDlXKlvsE8cHMPwWPDdpSJ4SpbPeLPlVRx1P8B+8U/0oBhMVrgT?=
 =?iso-8859-1?Q?WGCrLrV/v57kwA7G9ycVLD7OiDccp6BFD6t6E36WJE02kpcPlWr04q1Iov?=
 =?iso-8859-1?Q?VH4hsVccnLSxCmviY4fUD79WqDsXYiZKhtYAWFx+NqB5D8ezyZd80e4P00?=
 =?iso-8859-1?Q?FNDynCl9Uwh7/X6RQwyI1PsZqFcy2JatvL1dW6KCRH4T6EbNCIgQA32tME?=
 =?iso-8859-1?Q?2PV44SzzHHIi1rf5rvywq7BXaUEruggUBGn2AEbyAJUvvf60nqBP80vMm0?=
 =?iso-8859-1?Q?+/ffF/3oWFOY7uf+9oedBGDyVUnPHiXbSbrIElHH/4+u/9h+8fqpSRU36A?=
 =?iso-8859-1?Q?qJHDqtfpfCzckz3uSgwDYDj9nnACgUg50GsJERzk7VNHb7/JCo35Pzw8+d?=
 =?iso-8859-1?Q?++hkYtaqTJQjTjqS2Vj5V+8TDrD/6rIA6RbQM1g2sqDxCHqTcLjxinehe8?=
 =?iso-8859-1?Q?/Acr6scwZm59ynceWgS0e5WwA=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: ca5a6680-ab6c-4e48-5883-08d9c3d726aa
X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Dec 2021 16:38:28.3093
 (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: VROQGSk8qPPxs42WBYxXsoyahGwSeOfCj6P+klKhEqPNKtVrrS88A4iwgC9H3oYTeYBfyQcOwR6mQHPJ4a204vksu5+zo9xiEgqsJz9tPq0=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MR1P264MB2161
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Implement CONFIG_DYNAMIC_FTRACE_WITH_ARGS. It accelerates the call
of livepatching.

Also note that powerpc being the last one to convert to
CONFIG_DYNAMIC_FTRACE_WITH_ARGS, it will now be possible to remove
klp_arch_set_pc() on all architectures.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
 arch/powerpc/Kconfig                 |  1 +
 arch/powerpc/include/asm/ftrace.h    | 17 +++++++++++++++++
 arch/powerpc/include/asm/livepatch.h |  4 +---
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index cdac2115eb00..e2b1792b2aae 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -210,6 +210,7 @@ config PPC
 	select HAVE_DEBUG_KMEMLEAK
 	select HAVE_DEBUG_STACKOVERFLOW
 	select HAVE_DYNAMIC_FTRACE
+	select HAVE_DYNAMIC_FTRACE_WITH_ARGS	if MPROFILE_KERNEL || PPC32
 	select HAVE_DYNAMIC_FTRACE_WITH_REGS	if MPROFILE_KERNEL || PPC32
 	select HAVE_EBPF_JIT
 	select HAVE_EFFICIENT_UNALIGNED_ACCESS	if !(CPU_LITTLE_ENDIAN && POWER7_CPU)
diff --git a/arch/powerpc/include/asm/ftrace.h b/arch/powerpc/include/asm/ftrace.h
index b3f6184f77ea..45c3d6f11daa 100644
--- a/arch/powerpc/include/asm/ftrace.h
+++ b/arch/powerpc/include/asm/ftrace.h
@@ -22,6 +22,23 @@ static inline unsigned long ftrace_call_adjust(unsigned long addr)
 struct dyn_arch_ftrace {
 	struct module *mod;
 };
+
+#ifdef CONFIG_DYNAMIC_FTRACE_WITH_ARGS
+struct ftrace_regs {
+	struct pt_regs regs;
+};
+
+static __always_inline struct pt_regs *arch_ftrace_get_regs(struct ftrace_regs *fregs)
+{
+	return &fregs->regs;
+}
+
+static __always_inline void ftrace_instruction_pointer_set(struct ftrace_regs *fregs,
+							   unsigned long ip)
+{
+	regs_set_return_ip(&fregs->regs, ip);
+}
+#endif
 #endif /* __ASSEMBLY__ */
 
 #ifdef CONFIG_DYNAMIC_FTRACE_WITH_REGS
diff --git a/arch/powerpc/include/asm/livepatch.h b/arch/powerpc/include/asm/livepatch.h
index 37af961eb74c..6f10de6af6e3 100644
--- a/arch/powerpc/include/asm/livepatch.h
+++ b/arch/powerpc/include/asm/livepatch.h
@@ -14,9 +14,7 @@
 #ifdef CONFIG_LIVEPATCH
 static inline void klp_arch_set_pc(struct ftrace_regs *fregs, unsigned long ip)
 {
-	struct pt_regs *regs = ftrace_get_regs(fregs);
-
-	regs_set_return_ip(regs, ip);
+	ftrace_instruction_pointer_set(fregs, ip);
 }
 
 #define klp_get_ftrace_location klp_get_ftrace_location
-- 
2.33.1