From: Donglin Peng <pengdonglin@sangfor.com.cn>
To: mhiramat@kernel.org, rostedt@goodmis.org, linux@armlinux.org.uk,
mark.rutland@arm.com, will@kernel.org, catalin.marinas@arm.com,
palmer@dabbelt.com, paul.walmsley@sifive.com, tglx@linutronix.de,
dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com,
chenhuacai@kernel.org, zhangqing@loongson.cn, kernel@xen0n.name,
mingo@redhat.com, peterz@infradead.org, xiehuan09@gmail.com,
dinghui@sangfor.com.cn, huangcun@sangfor.com.cn,
dolinux.peng@gmail.com
Cc: linux-trace-kernel@vger.kernel.org, loongarch@lists.linux.dev,
linux-riscv@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Donglin Peng <pengdonglin@sangfor.com.cn>
Subject: [PATCH v8 7/8] LoongArch: ftrace: Enable HAVE_FUNCTION_GRAPH_RETVAL
Date: Tue, 28 Mar 2023 06:43:18 -0700 [thread overview]
Message-ID: <20230328134319.2185812-8-pengdonglin@sangfor.com.cn> (raw)
In-Reply-To: <20230328134319.2185812-1-pengdonglin@sangfor.com.cn>
The commit d4815c5d1bbd ("function_graph: Support recording and
printing the return value of function") laid the groundwork for the
for the funcgraph-retval, and this modification makes it available
on the LoongArch platform.
We introduce a new structure called fgraph_ret_regs for the LoongArch
platform to hold return registers and the frame pointer. We then fill
its content in the return_to_handler and pass its address to the
function ftrace_return_to_handler to record the return value.
Signed-off-by: Donglin Peng <pengdonglin@sangfor.com.cn>
---
v8:
- Modify the control range of CONFIG_HAVE_FUNCTION_GRAPH_RETVAL
---
arch/loongarch/Kconfig | 1 +
arch/loongarch/include/asm/ftrace.h | 18 ++++++++++++++++++
arch/loongarch/kernel/mcount.S | 6 ++++--
arch/loongarch/kernel/mcount_dyn.S | 7 ++++---
4 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/arch/loongarch/Kconfig b/arch/loongarch/Kconfig
index 7fd51257e0ed..4bf60132869b 100644
--- a/arch/loongarch/Kconfig
+++ b/arch/loongarch/Kconfig
@@ -99,6 +99,7 @@ config LOONGARCH
select HAVE_FAST_GUP
select HAVE_FTRACE_MCOUNT_RECORD
select HAVE_FUNCTION_ARG_ACCESS_API
+ select HAVE_FUNCTION_GRAPH_RETVAL if HAVE_FUNCTION_GRAPH_TRACER
select HAVE_FUNCTION_GRAPH_TRACER
select HAVE_FUNCTION_TRACER
select HAVE_GENERIC_VDSO
diff --git a/arch/loongarch/include/asm/ftrace.h b/arch/loongarch/include/asm/ftrace.h
index 3418d32d4fc7..433c6218888b 100644
--- a/arch/loongarch/include/asm/ftrace.h
+++ b/arch/loongarch/include/asm/ftrace.h
@@ -63,4 +63,22 @@ void ftrace_graph_func(unsigned long ip, unsigned long parent_ip,
#endif /* CONFIG_FUNCTION_TRACER */
+#ifndef __ASSEMBLY__
+struct fgraph_ret_regs {
+ unsigned long a0;
+ unsigned long a1;
+ unsigned long fp;
+};
+
+static inline unsigned long fgraph_ret_regs_return_value(struct fgraph_ret_regs *ret_regs)
+{
+ return ret_regs->a0;
+}
+
+static inline unsigned long fgraph_ret_regs_frame_pointer(struct fgraph_ret_regs *ret_regs)
+{
+ return ret_regs->fp;
+}
+#endif
+
#endif /* _ASM_LOONGARCH_FTRACE_H */
diff --git a/arch/loongarch/kernel/mcount.S b/arch/loongarch/kernel/mcount.S
index 8cdc1563cd33..3e405c0212c0 100644
--- a/arch/loongarch/kernel/mcount.S
+++ b/arch/loongarch/kernel/mcount.S
@@ -79,10 +79,12 @@ SYM_FUNC_START(ftrace_graph_caller)
SYM_FUNC_END(ftrace_graph_caller)
SYM_FUNC_START(return_to_handler)
- PTR_ADDI sp, sp, -2 * SZREG
+ PTR_ADDI sp, sp, -3 * SZREG
PTR_S a0, sp, 0
PTR_S a1, sp, SZREG
+ PTR_S zero, sp, 2 * SZREG
+ move a0, sp
bl ftrace_return_to_handler
/* Restore the real parent address: a0 -> ra */
@@ -90,7 +92,7 @@ SYM_FUNC_START(return_to_handler)
PTR_L a0, sp, 0
PTR_L a1, sp, SZREG
- PTR_ADDI sp, sp, 2 * SZREG
+ PTR_ADDI sp, sp, 3 * SZREG
jr ra
SYM_FUNC_END(return_to_handler)
#endif /* CONFIG_FUNCTION_GRAPH_TRACER */
diff --git a/arch/loongarch/kernel/mcount_dyn.S b/arch/loongarch/kernel/mcount_dyn.S
index bbabf06244c2..ab85a953c6d3 100644
--- a/arch/loongarch/kernel/mcount_dyn.S
+++ b/arch/loongarch/kernel/mcount_dyn.S
@@ -131,18 +131,19 @@ SYM_CODE_END(ftrace_graph_caller)
SYM_CODE_START(return_to_handler)
/* Save return value regs */
- PTR_ADDI sp, sp, -2 * SZREG
+ PTR_ADDI sp, sp, -3 * SZREG
PTR_S a0, sp, 0
PTR_S a1, sp, SZREG
+ PTR_S zero, sp, 2 * SZREG
- move a0, zero
+ move a0, sp
bl ftrace_return_to_handler
move ra, a0
/* Restore return value regs */
PTR_L a0, sp, 0
PTR_L a1, sp, SZREG
- PTR_ADDI sp, sp, 2 * SZREG
+ PTR_ADDI sp, sp, 3 * SZREG
jr ra
SYM_CODE_END(return_to_handler)
--
2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Donglin Peng <pengdonglin@sangfor.com.cn>
To: mhiramat@kernel.org, rostedt@goodmis.org, linux@armlinux.org.uk,
mark.rutland@arm.com, will@kernel.org, catalin.marinas@arm.com,
palmer@dabbelt.com, paul.walmsley@sifive.com, tglx@linutronix.de,
dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com,
chenhuacai@kernel.org, zhangqing@loongson.cn, kernel@xen0n.name,
mingo@redhat.com, peterz@infradead.org, xiehuan09@gmail.com,
dinghui@sangfor.com.cn, huangcun@sangfor.com.cn,
dolinux.peng@gmail.com
Cc: linux-trace-kernel@vger.kernel.org, loongarch@lists.linux.dev,
linux-riscv@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Donglin Peng <pengdonglin@sangfor.com.cn>
Subject: [PATCH v8 7/8] LoongArch: ftrace: Enable HAVE_FUNCTION_GRAPH_RETVAL
Date: Tue, 28 Mar 2023 06:43:18 -0700 [thread overview]
Message-ID: <20230328134319.2185812-8-pengdonglin@sangfor.com.cn> (raw)
In-Reply-To: <20230328134319.2185812-1-pengdonglin@sangfor.com.cn>
The commit d4815c5d1bbd ("function_graph: Support recording and
printing the return value of function") laid the groundwork for the
for the funcgraph-retval, and this modification makes it available
on the LoongArch platform.
We introduce a new structure called fgraph_ret_regs for the LoongArch
platform to hold return registers and the frame pointer. We then fill
its content in the return_to_handler and pass its address to the
function ftrace_return_to_handler to record the return value.
Signed-off-by: Donglin Peng <pengdonglin@sangfor.com.cn>
---
v8:
- Modify the control range of CONFIG_HAVE_FUNCTION_GRAPH_RETVAL
---
arch/loongarch/Kconfig | 1 +
arch/loongarch/include/asm/ftrace.h | 18 ++++++++++++++++++
arch/loongarch/kernel/mcount.S | 6 ++++--
arch/loongarch/kernel/mcount_dyn.S | 7 ++++---
4 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/arch/loongarch/Kconfig b/arch/loongarch/Kconfig
index 7fd51257e0ed..4bf60132869b 100644
--- a/arch/loongarch/Kconfig
+++ b/arch/loongarch/Kconfig
@@ -99,6 +99,7 @@ config LOONGARCH
select HAVE_FAST_GUP
select HAVE_FTRACE_MCOUNT_RECORD
select HAVE_FUNCTION_ARG_ACCESS_API
+ select HAVE_FUNCTION_GRAPH_RETVAL if HAVE_FUNCTION_GRAPH_TRACER
select HAVE_FUNCTION_GRAPH_TRACER
select HAVE_FUNCTION_TRACER
select HAVE_GENERIC_VDSO
diff --git a/arch/loongarch/include/asm/ftrace.h b/arch/loongarch/include/asm/ftrace.h
index 3418d32d4fc7..433c6218888b 100644
--- a/arch/loongarch/include/asm/ftrace.h
+++ b/arch/loongarch/include/asm/ftrace.h
@@ -63,4 +63,22 @@ void ftrace_graph_func(unsigned long ip, unsigned long parent_ip,
#endif /* CONFIG_FUNCTION_TRACER */
+#ifndef __ASSEMBLY__
+struct fgraph_ret_regs {
+ unsigned long a0;
+ unsigned long a1;
+ unsigned long fp;
+};
+
+static inline unsigned long fgraph_ret_regs_return_value(struct fgraph_ret_regs *ret_regs)
+{
+ return ret_regs->a0;
+}
+
+static inline unsigned long fgraph_ret_regs_frame_pointer(struct fgraph_ret_regs *ret_regs)
+{
+ return ret_regs->fp;
+}
+#endif
+
#endif /* _ASM_LOONGARCH_FTRACE_H */
diff --git a/arch/loongarch/kernel/mcount.S b/arch/loongarch/kernel/mcount.S
index 8cdc1563cd33..3e405c0212c0 100644
--- a/arch/loongarch/kernel/mcount.S
+++ b/arch/loongarch/kernel/mcount.S
@@ -79,10 +79,12 @@ SYM_FUNC_START(ftrace_graph_caller)
SYM_FUNC_END(ftrace_graph_caller)
SYM_FUNC_START(return_to_handler)
- PTR_ADDI sp, sp, -2 * SZREG
+ PTR_ADDI sp, sp, -3 * SZREG
PTR_S a0, sp, 0
PTR_S a1, sp, SZREG
+ PTR_S zero, sp, 2 * SZREG
+ move a0, sp
bl ftrace_return_to_handler
/* Restore the real parent address: a0 -> ra */
@@ -90,7 +92,7 @@ SYM_FUNC_START(return_to_handler)
PTR_L a0, sp, 0
PTR_L a1, sp, SZREG
- PTR_ADDI sp, sp, 2 * SZREG
+ PTR_ADDI sp, sp, 3 * SZREG
jr ra
SYM_FUNC_END(return_to_handler)
#endif /* CONFIG_FUNCTION_GRAPH_TRACER */
diff --git a/arch/loongarch/kernel/mcount_dyn.S b/arch/loongarch/kernel/mcount_dyn.S
index bbabf06244c2..ab85a953c6d3 100644
--- a/arch/loongarch/kernel/mcount_dyn.S
+++ b/arch/loongarch/kernel/mcount_dyn.S
@@ -131,18 +131,19 @@ SYM_CODE_END(ftrace_graph_caller)
SYM_CODE_START(return_to_handler)
/* Save return value regs */
- PTR_ADDI sp, sp, -2 * SZREG
+ PTR_ADDI sp, sp, -3 * SZREG
PTR_S a0, sp, 0
PTR_S a1, sp, SZREG
+ PTR_S zero, sp, 2 * SZREG
- move a0, zero
+ move a0, sp
bl ftrace_return_to_handler
move ra, a0
/* Restore return value regs */
PTR_L a0, sp, 0
PTR_L a1, sp, SZREG
- PTR_ADDI sp, sp, 2 * SZREG
+ PTR_ADDI sp, sp, 3 * SZREG
jr ra
SYM_CODE_END(return_to_handler)
--
2.25.1
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
WARNING: multiple messages have this Message-ID (diff)
From: Donglin Peng <pengdonglin@sangfor.com.cn>
To: mhiramat@kernel.org, rostedt@goodmis.org, linux@armlinux.org.uk,
mark.rutland@arm.com, will@kernel.org, catalin.marinas@arm.com,
palmer@dabbelt.com, paul.walmsley@sifive.com, tglx@linutronix.de,
dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com,
chenhuacai@kernel.org, zhangqing@loongson.cn, kernel@xen0n.name,
mingo@redhat.com, peterz@infradead.org, xiehuan09@gmail.com,
dinghui@sangfor.com.cn, huangcun@sangfor.com.cn,
dolinux.peng@gmail.com
Cc: linux-trace-kernel@vger.kernel.org, loongarch@lists.linux.dev,
linux-riscv@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Donglin Peng <pengdonglin@sangfor.com.cn>
Subject: [PATCH v8 7/8] LoongArch: ftrace: Enable HAVE_FUNCTION_GRAPH_RETVAL
Date: Tue, 28 Mar 2023 06:43:18 -0700 [thread overview]
Message-ID: <20230328134319.2185812-8-pengdonglin@sangfor.com.cn> (raw)
In-Reply-To: <20230328134319.2185812-1-pengdonglin@sangfor.com.cn>
The commit d4815c5d1bbd ("function_graph: Support recording and
printing the return value of function") laid the groundwork for the
for the funcgraph-retval, and this modification makes it available
on the LoongArch platform.
We introduce a new structure called fgraph_ret_regs for the LoongArch
platform to hold return registers and the frame pointer. We then fill
its content in the return_to_handler and pass its address to the
function ftrace_return_to_handler to record the return value.
Signed-off-by: Donglin Peng <pengdonglin@sangfor.com.cn>
---
v8:
- Modify the control range of CONFIG_HAVE_FUNCTION_GRAPH_RETVAL
---
arch/loongarch/Kconfig | 1 +
arch/loongarch/include/asm/ftrace.h | 18 ++++++++++++++++++
arch/loongarch/kernel/mcount.S | 6 ++++--
arch/loongarch/kernel/mcount_dyn.S | 7 ++++---
4 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/arch/loongarch/Kconfig b/arch/loongarch/Kconfig
index 7fd51257e0ed..4bf60132869b 100644
--- a/arch/loongarch/Kconfig
+++ b/arch/loongarch/Kconfig
@@ -99,6 +99,7 @@ config LOONGARCH
select HAVE_FAST_GUP
select HAVE_FTRACE_MCOUNT_RECORD
select HAVE_FUNCTION_ARG_ACCESS_API
+ select HAVE_FUNCTION_GRAPH_RETVAL if HAVE_FUNCTION_GRAPH_TRACER
select HAVE_FUNCTION_GRAPH_TRACER
select HAVE_FUNCTION_TRACER
select HAVE_GENERIC_VDSO
diff --git a/arch/loongarch/include/asm/ftrace.h b/arch/loongarch/include/asm/ftrace.h
index 3418d32d4fc7..433c6218888b 100644
--- a/arch/loongarch/include/asm/ftrace.h
+++ b/arch/loongarch/include/asm/ftrace.h
@@ -63,4 +63,22 @@ void ftrace_graph_func(unsigned long ip, unsigned long parent_ip,
#endif /* CONFIG_FUNCTION_TRACER */
+#ifndef __ASSEMBLY__
+struct fgraph_ret_regs {
+ unsigned long a0;
+ unsigned long a1;
+ unsigned long fp;
+};
+
+static inline unsigned long fgraph_ret_regs_return_value(struct fgraph_ret_regs *ret_regs)
+{
+ return ret_regs->a0;
+}
+
+static inline unsigned long fgraph_ret_regs_frame_pointer(struct fgraph_ret_regs *ret_regs)
+{
+ return ret_regs->fp;
+}
+#endif
+
#endif /* _ASM_LOONGARCH_FTRACE_H */
diff --git a/arch/loongarch/kernel/mcount.S b/arch/loongarch/kernel/mcount.S
index 8cdc1563cd33..3e405c0212c0 100644
--- a/arch/loongarch/kernel/mcount.S
+++ b/arch/loongarch/kernel/mcount.S
@@ -79,10 +79,12 @@ SYM_FUNC_START(ftrace_graph_caller)
SYM_FUNC_END(ftrace_graph_caller)
SYM_FUNC_START(return_to_handler)
- PTR_ADDI sp, sp, -2 * SZREG
+ PTR_ADDI sp, sp, -3 * SZREG
PTR_S a0, sp, 0
PTR_S a1, sp, SZREG
+ PTR_S zero, sp, 2 * SZREG
+ move a0, sp
bl ftrace_return_to_handler
/* Restore the real parent address: a0 -> ra */
@@ -90,7 +92,7 @@ SYM_FUNC_START(return_to_handler)
PTR_L a0, sp, 0
PTR_L a1, sp, SZREG
- PTR_ADDI sp, sp, 2 * SZREG
+ PTR_ADDI sp, sp, 3 * SZREG
jr ra
SYM_FUNC_END(return_to_handler)
#endif /* CONFIG_FUNCTION_GRAPH_TRACER */
diff --git a/arch/loongarch/kernel/mcount_dyn.S b/arch/loongarch/kernel/mcount_dyn.S
index bbabf06244c2..ab85a953c6d3 100644
--- a/arch/loongarch/kernel/mcount_dyn.S
+++ b/arch/loongarch/kernel/mcount_dyn.S
@@ -131,18 +131,19 @@ SYM_CODE_END(ftrace_graph_caller)
SYM_CODE_START(return_to_handler)
/* Save return value regs */
- PTR_ADDI sp, sp, -2 * SZREG
+ PTR_ADDI sp, sp, -3 * SZREG
PTR_S a0, sp, 0
PTR_S a1, sp, SZREG
+ PTR_S zero, sp, 2 * SZREG
- move a0, zero
+ move a0, sp
bl ftrace_return_to_handler
move ra, a0
/* Restore return value regs */
PTR_L a0, sp, 0
PTR_L a1, sp, SZREG
- PTR_ADDI sp, sp, 2 * SZREG
+ PTR_ADDI sp, sp, 3 * SZREG
jr ra
SYM_CODE_END(return_to_handler)
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2023-03-28 13:43 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-28 13:43 [PATCH v8 0/8] function_graph: Support recording and printing the return value of function Donglin Peng
2023-03-28 13:43 ` Donglin Peng
2023-03-28 13:43 ` Donglin Peng
2023-03-28 13:43 ` [PATCH v8 1/8] " Donglin Peng
2023-03-28 13:43 ` Donglin Peng
2023-03-28 13:43 ` Donglin Peng
2023-03-28 13:43 ` [PATCH v8 2/8] tracing: Add documentation for funcgraph-retval and funcgraph-retval-hex Donglin Peng
2023-03-28 13:43 ` Donglin Peng
2023-03-28 13:43 ` Donglin Peng
2023-03-28 13:43 ` [PATCH v8 3/8] ARM: ftrace: Enable HAVE_FUNCTION_GRAPH_RETVAL Donglin Peng
2023-03-28 13:43 ` Donglin Peng
2023-03-28 13:43 ` Donglin Peng
2023-03-28 14:02 ` Russell King (Oracle)
2023-03-28 14:02 ` Russell King (Oracle)
2023-03-28 14:02 ` Russell King (Oracle)
2023-03-29 1:15 ` Donglin Peng
2023-03-29 1:15 ` Donglin Peng
2023-03-29 1:15 ` Donglin Peng
2023-03-28 13:43 ` [PATCH v8 4/8] arm64: " Donglin Peng
2023-03-28 13:43 ` Donglin Peng
2023-03-28 13:43 ` Donglin Peng
2023-03-28 13:43 ` [PATCH v8 5/8] riscv: " Donglin Peng
2023-03-28 13:43 ` Donglin Peng
2023-03-28 13:43 ` Donglin Peng
2023-03-28 13:43 ` [PATCH v8 6/8] x86/ftrace: " Donglin Peng
2023-03-28 13:43 ` Donglin Peng
2023-03-28 13:43 ` Donglin Peng
2023-03-28 13:43 ` Donglin Peng [this message]
2023-03-28 13:43 ` [PATCH v8 7/8] LoongArch: ftrace: " Donglin Peng
2023-03-28 13:43 ` Donglin Peng
2023-03-29 4:08 ` Qing Zhang
2023-03-29 4:08 ` Qing Zhang
2023-03-29 4:08 ` Qing Zhang
2023-03-29 4:31 ` Donglin Peng
2023-03-29 4:31 ` Donglin Peng
2023-03-29 4:31 ` Donglin Peng
2023-03-28 13:43 ` [PATCH v8 8/8] selftests/ftrace: Add funcgraph-retval test case Donglin Peng
2023-03-28 13:43 ` Donglin Peng
2023-03-28 13:43 ` Donglin Peng
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=20230328134319.2185812-8-pengdonglin@sangfor.com.cn \
--to=pengdonglin@sangfor.com.cn \
--cc=catalin.marinas@arm.com \
--cc=chenhuacai@kernel.org \
--cc=dave.hansen@linux.intel.com \
--cc=dinghui@sangfor.com.cn \
--cc=dolinux.peng@gmail.com \
--cc=hpa@zytor.com \
--cc=huangcun@sangfor.com.cn \
--cc=kernel@xen0n.name \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=loongarch@lists.linux.dev \
--cc=mark.rutland@arm.com \
--cc=mhiramat@kernel.org \
--cc=mingo@redhat.com \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
--cc=will@kernel.org \
--cc=x86@kernel.org \
--cc=xiehuan09@gmail.com \
--cc=zhangqing@loongson.cn \
/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 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.