@@ -274,6 +274,8 @@ config PPC
select HAVE_REGS_AND_STACK_ACCESS_API
select HAVE_RELIABLE_STACKTRACE
select HAVE_RSEQ
+ select HAVE_SAMPLE_FTRACE_DIRECT if HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS
+ select HAVE_SAMPLE_FTRACE_DIRECT_MULTI if HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS
select HAVE_SETUP_PER_CPU_AREA if PPC64
select HAVE_SOFTIRQ_ON_OWN_STACK
select HAVE_STACKPROTECTOR if PPC32 && $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=r2)
@@ -2,7 +2,7 @@
#include <linux/module.h>
#include <linux/kthread.h>
#include <linux/ftrace.h>
-#ifndef CONFIG_ARM64
+#if !defined(CONFIG_ARM64) && !defined(CONFIG_PPC32)
#include <asm/asm-offsets.h>
#endif
@@ -164,6 +164,98 @@ asm (
#endif /* CONFIG_LOONGARCH */
+#ifdef CONFIG_PPC32
+
+asm (
+" .pushsection .text, \"ax\", @progbits\n"
+" .type my_tramp1, @function\n"
+" .globl my_tramp1\n"
+" my_tramp1:"
+" stw 0, 4(1)\n"
+" stwu 1, -16(1)\n"
+" mflr 0\n"
+" stw 0, 4(1)\n"
+" stwu 1, -16(1)\n"
+" bl my_direct_func1\n"
+" lwz 0, 20(1)\n"
+" mtlr 0\n"
+" addi 1, 1, 32\n"
+" lwz 0, 4(1)\n"
+" blr\n"
+" .size my_tramp1, .-my_tramp1\n"
+
+" .type my_tramp2, @function\n"
+" .globl my_tramp2\n"
+" my_tramp2:"
+" stw 0, 4(1)\n"
+" stwu 1, -16(1)\n"
+" mflr 0\n"
+" stw 0, 4(1)\n"
+" stwu 1, -16(1)\n"
+" bl my_direct_func2\n"
+" lwz 0, 20(1)\n"
+" mtlr 0\n"
+" addi 1, 1, 32\n"
+" lwz 0, 4(1)\n"
+" blr\n"
+" .size my_tramp2, .-my_tramp2\n"
+" .popsection\n"
+);
+
+#endif /* CONFIG_PPC32 */
+
+#ifdef CONFIG_PPC64
+
+asm (
+" .pushsection .text, \"ax\", @progbits\n"
+" .type my_tramp1, @function\n"
+" .globl my_tramp1\n"
+" my_tramp1:"
+" std 0, 16(1)\n"
+" stdu 1, -32(1)\n"
+" mflr 0\n"
+" std 0, 16(1)\n"
+" stdu 1, -32(1)\n"
+" std 2, 24(1)\n"
+" bcl 20, 31, 1f\n"
+" 1: mflr 12\n"
+" ld 2, (2f - 1b)(12)\n"
+" bl my_direct_func1\n"
+" ld 2, 24(1)\n"
+" ld 0, 48(1)\n"
+" mtlr 0\n"
+" addi 1, 1, 64\n"
+" ld 0, 16(1)\n"
+" blr\n"
+" 2: .quad .TOC.@tocbase\n"
+" .size my_tramp1, .-my_tramp1\n"
+
+" .type my_tramp2, @function\n"
+" .globl my_tramp2\n"
+" my_tramp2:"
+" std 0, 16(1)\n"
+" stdu 1, -32(1)\n"
+" mflr 0\n"
+" std 0, 16(1)\n"
+" stdu 1, -32(1)\n"
+" std 2, 24(1)\n"
+" bcl 20, 31, 1f\n"
+" 1: mflr 12\n"
+" ld 2, (2f - 1b)(12)\n"
+" bl my_direct_func2\n"
+" ld 2, 24(1)\n"
+" ld 0, 48(1)\n"
+" mtlr 0\n"
+" addi 1, 1, 64\n"
+" ld 0, 16(1)\n"
+" blr\n"
+" 2: .quad .TOC.@tocbase\n"
+" .size my_tramp2, .-my_tramp2\n"
+" .popsection\n"
+);
+
+#endif /* CONFIG_PPC64 */
+
static struct ftrace_ops direct;
static unsigned long my_tramp = (unsigned long)my_tramp1;
@@ -2,7 +2,7 @@
#include <linux/module.h>
#include <linux/kthread.h>
#include <linux/ftrace.h>
-#ifndef CONFIG_ARM64
+#if !defined(CONFIG_ARM64) && !defined(CONFIG_PPC32)
#include <asm/asm-offsets.h>
#endif
@@ -184,6 +184,114 @@ asm (
#endif /* CONFIG_LOONGARCH */
+#ifdef CONFIG_PPC32
+
+asm (
+" .pushsection .text, \"ax\", @progbits\n"
+" .type my_tramp1, @function\n"
+" .globl my_tramp1\n"
+" my_tramp1:"
+" stw 0, 4(1)\n"
+" stwu 1, -16(1)\n"
+" mflr 0\n"
+" stw 0, 4(1)\n"
+" stwu 1, -24(1)\n"
+" stw 3, 16(1)\n"
+" mr 3, 0\n"
+" addi 3, 3, 16\n"
+" bl my_direct_func1\n"
+" lwz 3, 16(1)\n"
+" lwz 0, 28(1)\n"
+" mtlr 0\n"
+" addi 1, 1, 40\n"
+" lwz 0, 4(1)\n"
+" blr\n"
+" .size my_tramp1, .-my_tramp1\n"
+
+" .type my_tramp2, @function\n"
+" .globl my_tramp2\n"
+" my_tramp2:"
+" stw 0, 4(1)\n"
+" stwu 1, -16(1)\n"
+" mflr 0\n"
+" stw 0, 4(1)\n"
+" stwu 1, -24(1)\n"
+" stw 3, 16(1)\n"
+" mr 3, 0\n"
+" addi 3, 3, 16\n"
+" bl my_direct_func2\n"
+" lwz 3, 16(1)\n"
+" lwz 0, 28(1)\n"
+" mtlr 0\n"
+" addi 1, 1, 40\n"
+" lwz 0, 4(1)\n"
+" blr\n"
+" .size my_tramp2, .-my_tramp2\n"
+" .popsection\n"
+);
+
+#endif /* CONFIG_PPC32 */
+
+#ifdef CONFIG_PPC64
+
+asm (
+" .pushsection .text, \"ax\", @progbits\n"
+" .type my_tramp1, @function\n"
+" .globl my_tramp1\n"
+" my_tramp1:"
+" std 0, 16(1)\n"
+" stdu 1, -32(1)\n"
+" mflr 0\n"
+" std 0, 16(1)\n"
+" stdu 1, -48(1)\n"
+" std 2, 24(1)\n"
+" bcl 20, 31, 1f\n"
+" 1: mflr 12\n"
+" ld 2, (2f - 1b)(12)\n"
+" std 3, 32(1)\n"
+" mr 3, 0\n"
+" addi 3, 3, 20\n"
+" bl my_direct_func1\n"
+" ld 3, 32(1)\n"
+" ld 2, 24(1)\n"
+" ld 0, 64(1)\n"
+" mtlr 0\n"
+" addi 1, 1, 80\n"
+" ld 0, 16(1)\n"
+" blr\n"
+" 2: .quad .TOC.@tocbase\n"
+" .size my_tramp1, .-my_tramp1\n"
+
+" .type my_tramp2, @function\n"
+" .globl my_tramp2\n"
+" my_tramp2:"
+" std 0, 16(1)\n"
+" stdu 1, -32(1)\n"
+" mflr 0\n"
+" std 0, 16(1)\n"
+" stdu 1, -48(1)\n"
+" std 2, 24(1)\n"
+" bcl 20, 31, 1f\n"
+" 1: mflr 12\n"
+" ld 2, (2f - 1b)(12)\n"
+" std 3, 32(1)\n"
+" mr 3, 0\n"
+" addi 3, 3, 20\n"
+" bl my_direct_func2\n"
+" ld 3, 32(1)\n"
+" ld 2, 24(1)\n"
+" ld 0, 64(1)\n"
+" mtlr 0\n"
+" addi 1, 1, 80\n"
+" ld 0, 16(1)\n"
+" blr\n"
+" 2: .quad .TOC.@tocbase\n"
+" .size my_tramp2, .-my_tramp2\n"
+" .popsection\n"
+);
+
+#endif /* CONFIG_PPC64 */
+
static unsigned long my_tramp = (unsigned long)my_tramp1;
static unsigned long tramps[2] = {
(unsigned long)my_tramp1,
@@ -4,7 +4,7 @@
#include <linux/mm.h> /* for handle_mm_fault() */
#include <linux/ftrace.h>
#include <linux/sched/stat.h>
-#ifndef CONFIG_ARM64
+#if !defined(CONFIG_ARM64) && !defined(CONFIG_PPC32)
#include <asm/asm-offsets.h>
#endif
@@ -116,6 +116,68 @@ asm (
#endif /* CONFIG_LOONGARCH */
+#ifdef CONFIG_PPC32
+
+asm (
+" .pushsection .text, \"ax\", @progbits\n"
+" .type my_tramp, @function\n"
+" .globl my_tramp\n"
+" my_tramp:"
+" stw 0, 4(1)\n"
+" stwu 1, -16(1)\n"
+" mflr 0\n"
+" stw 0, 4(1)\n"
+" stwu 1, -24(1)\n"
+" stw 3, 16(1)\n"
+" mr 3, 0\n"
+" addi 3, 3, 16\n"
+" bl my_direct_func\n"
+" lwz 3, 16(1)\n"
+" lwz 0, 28(1)\n"
+" mtlr 0\n"
+" addi 1, 1, 40\n"
+" lwz 0, 4(1)\n"
+" blr\n"
+" .size my_tramp, .-my_tramp\n"
+" .popsection\n"
+);
+
+#endif /* CONFIG_PPC32 */
+
+#ifdef CONFIG_PPC64
+
+asm (
+" .pushsection .text, \"ax\", @progbits\n"
+" .type my_tramp, @function\n"
+" .globl my_tramp\n"
+" my_tramp:"
+" std 0, 16(1)\n"
+" stdu 1, -32(1)\n"
+" mflr 0\n"
+" std 0, 16(1)\n"
+" stdu 1, -48(1)\n"
+" std 2, 24(1)\n"
+" bcl 20, 31, 1f\n"
+" 1: mflr 12\n"
+" ld 2, (2f - 1b)(12)\n"
+" std 3, 32(1)\n"
+" mr 3, 0\n"
+" addi 3, 3, 20\n"
+" bl my_direct_func\n"
+" ld 3, 32(1)\n"
+" ld 2, 24(1)\n"
+" ld 0, 64(1)\n"
+" mtlr 0\n"
+" addi 1, 1, 80\n"
+" ld 0, 16(1)\n"
+" blr\n"
+" 2: .quad .TOC.@tocbase\n"
+" .size my_tramp, .-my_tramp\n"
+" .popsection\n"
+);
+
+#endif /* CONFIG_PPC64 */
+
static struct ftrace_ops direct;
static int __init ftrace_direct_multi_init(void)
@@ -3,7 +3,7 @@
#include <linux/mm.h> /* for handle_mm_fault() */
#include <linux/ftrace.h>
-#ifndef CONFIG_ARM64
+#if !defined(CONFIG_ARM64) && !defined(CONFIG_PPC32)
#include <asm/asm-offsets.h>
#endif
@@ -125,6 +125,76 @@ asm (
#endif /* CONFIG_LOONGARCH */
+#ifdef CONFIG_PPC32
+
+asm (
+" .pushsection .text, \"ax\", @progbits\n"
+" .type my_tramp, @function\n"
+" .globl my_tramp\n"
+" my_tramp:"
+" stw 0, 4(1)\n"
+" stwu 1, -16(1)\n"
+" mflr 0\n"
+" stw 0, 4(1)\n"
+" stwu 1, -32(1)\n"
+" stw 3, 16(1)\n"
+" stw 4, 20(1)\n"
+" stw 5, 24(1)\n"
+" stw 6, 28(1)\n"
+" bl my_direct_func\n"
+" lwz 6, 28(1)\n"
+" lwz 5, 24(1)\n"
+" lwz 4, 20(1)\n"
+" lwz 3, 16(1)\n"
+" lwz 0, 36(1)\n"
+" mtlr 0\n"
+" addi 1, 1, 48\n"
+" lwz 0, 4(1)\n"
+" blr\n"
+" .size my_tramp, .-my_tramp\n"
+" .popsection\n"
+);
+
+#endif /* CONFIG_PPC32 */
+
+#ifdef CONFIG_PPC64
+
+asm (
+" .pushsection .text, \"ax\", @progbits\n"
+" .type my_tramp, @function\n"
+" .globl my_tramp\n"
+" my_tramp:"
+" std 0, 16(1)\n"
+" stdu 1, -32(1)\n"
+" mflr 0\n"
+" std 0, 16(1)\n"
+" stdu 1, -64(1)\n"
+" std 2, 24(1)\n"
+" bcl 20, 31, 1f\n"
+" 1: mflr 12\n"
+" ld 2, (2f - 1b)(12)\n"
+" std 3, 32(1)\n"
+" std 4, 40(1)\n"
+" std 5, 48(1)\n"
+" std 6, 56(1)\n"
+" bl my_direct_func\n"
+" ld 6, 56(1)\n"
+" ld 5, 48(1)\n"
+" ld 4, 40(1)\n"
+" ld 3, 32(1)\n"
+" ld 2, 24(1)\n"
+" ld 0, 80(1)\n"
+" mtlr 0\n"
+" addi 1, 1, 96\n"
+" ld 0, 16(1)\n"
+" blr\n"
+" 2: .quad .TOC.@tocbase\n"
+" .size my_tramp, .-my_tramp\n"
+" .popsection\n"
+);
+
+#endif /* CONFIG_PPC64 */
+
static struct ftrace_ops direct;
static int __init ftrace_direct_init(void)
@@ -3,7 +3,7 @@
#include <linux/sched.h> /* for wake_up_process() */
#include <linux/ftrace.h>
-#ifndef CONFIG_ARM64
+#if !defined(CONFIG_ARM64) && !defined(CONFIG_PPC32)
#include <asm/asm-offsets.h>
#endif
@@ -110,6 +110,65 @@ asm (
#endif /* CONFIG_LOONGARCH */
+#ifdef CONFIG_PPC32
+
+asm (
+" .pushsection .text, \"ax\", @progbits\n"
+" .type my_tramp, @function\n"
+" .globl my_tramp\n"
+" my_tramp:"
+" stw 0, 4(1)\n"
+" stwu 1, -16(1)\n"
+" mflr 0\n"
+" stw 0, 4(1)\n"
+" stwu 1, -24(1)\n"
+" stw 3, 16(1)\n"
+" bl my_direct_func\n"
+" lwz 3, 16(1)\n"
+" lwz 0, 28(1)\n"
+" mtlr 0\n"
+" addi 1, 1, 40\n"
+" lwz 0, 4(1)\n"
+" blr\n"
+" .size my_tramp, .-my_tramp\n"
+" .popsection\n"
+);
+
+#endif /* CONFIG_PPC32 */
+
+#ifdef CONFIG_PPC64
+
+asm (
+" .pushsection .text, \"ax\", @progbits\n"
+" .type my_tramp, @function\n"
+" .globl my_tramp\n"
+" my_tramp:"
+" std 0, 16(1)\n"
+" stdu 1, -32(1)\n"
+" mflr 0\n"
+" std 0, 16(1)\n"
+" stdu 1, -48(1)\n"
+" std 2, 24(1)\n"
+" bcl 20, 31, 1f\n"
+" 1: mflr 12\n"
+" ld 2, (2f - 1b)(12)\n"
+" std 3, 32(1)\n"
+" bl my_direct_func\n"
+" ld 3, 32(1)\n"
+" ld 2, 24(1)\n"
+" ld 0, 64(1)\n"
+" mtlr 0\n"
+" addi 1, 1, 80\n"
+" ld 0, 16(1)\n"
+" blr\n"
+" 2: .quad .TOC.@tocbase\n"
+" .size my_tramp, .-my_tramp\n"
+" .popsection\n"
+);
+
+#endif /* CONFIG_PPC64 */
+
+
static struct ftrace_ops direct;
static int __init ftrace_direct_init(void)
Add powerpc 32-bit and 64-bit samples for ftrace direct. This serves to show the sample instruction sequence to be used by ftrace direct calls to adhere to the ftrace ABI. On 64-bit powerpc, TOC setup requires some additional work. Signed-off-by: Naveen N Rao <naveen@kernel.org> --- arch/powerpc/Kconfig | 2 + samples/ftrace/ftrace-direct-modify.c | 94 ++++++++++++++++- samples/ftrace/ftrace-direct-multi-modify.c | 110 +++++++++++++++++++- samples/ftrace/ftrace-direct-multi.c | 64 +++++++++++- samples/ftrace/ftrace-direct-too.c | 72 ++++++++++++- samples/ftrace/ftrace-direct.c | 61 ++++++++++- 6 files changed, 398 insertions(+), 5 deletions(-)