From: Sven Schnelle <svens@linux.ibm.com>
To: Steven Rostedt <rostedt@goodmis.org>,
Masami Hiramatsu <mhiramat@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
Heiko Carstens <hca@linux.ibm.com>,
Vasily Gorbik <gor@linux.ibm.com>,
Alexander Gordeev <agordeev@linux.ibm.com>,
Christian Borntraeger <borntraeger@linux.ibm.com>
Cc: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org,
linux-s390@vger.kernel.org
Subject: [PATCH 3/7] s390/tracing: pass ftrace_regs to function_graph_enter()
Date: Wed, 4 Sep 2024 08:58:57 +0200 [thread overview]
Message-ID: <20240904065908.1009086-4-svens@linux.ibm.com> (raw)
In-Reply-To: <20240904065908.1009086-1-svens@linux.ibm.com>
Will be used later to print function arguments in the function
graph tracer.
Signed-off-by: Sven Schnelle <svens@linux.ibm.com>
---
arch/s390/kernel/entry.h | 4 +++-
arch/s390/kernel/ftrace.c | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/arch/s390/kernel/entry.h b/arch/s390/kernel/entry.h
index 21969520f947..d0a5fbaad987 100644
--- a/arch/s390/kernel/entry.h
+++ b/arch/s390/kernel/entry.h
@@ -5,6 +5,7 @@
#include <linux/percpu.h>
#include <linux/types.h>
#include <linux/signal.h>
+#include <linux/ftrace.h>
#include <asm/extable.h>
#include <asm/ptrace.h>
#include <asm/idle.h>
@@ -41,7 +42,8 @@ void do_restart(void *arg);
void __init startup_init(void);
void die(struct pt_regs *regs, const char *str);
int setup_profiling_timer(unsigned int multiplier);
-unsigned long prepare_ftrace_return(unsigned long parent, unsigned long sp, unsigned long ip);
+unsigned long prepare_ftrace_return(unsigned long parent, unsigned long sp, unsigned long ip,
+ struct ftrace_regs *regs);
struct s390_mmap_arg_struct;
struct fadvise64_64_args;
diff --git a/arch/s390/kernel/ftrace.c b/arch/s390/kernel/ftrace.c
index cf9ee90ae216..dd77b656d9b9 100644
--- a/arch/s390/kernel/ftrace.c
+++ b/arch/s390/kernel/ftrace.c
@@ -266,14 +266,14 @@ void ftrace_arch_code_modify_post_process(void)
* in current thread info.
*/
unsigned long prepare_ftrace_return(unsigned long ra, unsigned long sp,
- unsigned long ip)
+ unsigned long ip, struct ftrace_regs *regs)
{
if (unlikely(ftrace_graph_is_dead()))
goto out;
if (unlikely(atomic_read(¤t->tracing_graph_pause)))
goto out;
ip -= MCOUNT_INSN_SIZE;
- if (!function_graph_enter(ra, ip, 0, (void *) sp, NULL))
+ if (!function_graph_enter(ra, ip, 0, (void *) sp, regs))
ra = (unsigned long) return_to_handler;
out:
return ra;
--
2.43.0
next prev parent reply other threads:[~2024-09-04 6:59 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-04 6:58 [PATCH 0/7] add function arguments to ftrace Sven Schnelle
2024-09-04 6:58 ` [PATCH 1/7] tracing: add ftrace_regs to function_graph_enter() Sven Schnelle
2024-09-04 6:58 ` [PATCH 2/7] x86/tracing: pass " Sven Schnelle
2024-09-05 8:58 ` kernel test robot
2024-09-04 6:58 ` Sven Schnelle [this message]
2024-09-04 6:58 ` [PATCH 4/7] Add print_function_args() Sven Schnelle
2024-09-08 15:17 ` Masami Hiramatsu
2024-09-09 3:13 ` Donglin Peng
2024-09-04 6:58 ` [PATCH 5/7] tracing: add config option for print arguments in ftrace Sven Schnelle
2024-09-06 3:36 ` Zheng Yejian
2024-09-08 13:30 ` Masami Hiramatsu
2024-09-09 8:16 ` Sven Schnelle
2024-09-09 13:56 ` Masami Hiramatsu
2024-09-04 6:59 ` [PATCH 6/7] tracing: add support for function argument to graph tracer Sven Schnelle
2024-09-05 8:05 ` kernel test robot
2024-09-05 8:36 ` kernel test robot
2024-10-04 22:40 ` Steven Rostedt
2024-10-07 6:37 ` Sven Schnelle
2024-09-04 6:59 ` [PATCH 7/7] tracing: add arguments to function tracer Sven Schnelle
2024-09-06 3:49 ` Zheng Yejian
2024-10-04 22:43 ` Steven Rostedt
2024-09-05 15:16 ` [PATCH 0/7] add function arguments to ftrace Steven Rostedt
2024-09-06 6:18 ` Sven Schnelle
2024-09-06 14:07 ` Steven Rostedt
2024-09-08 13:28 ` Masami Hiramatsu
2024-09-09 7:52 ` Sven Schnelle
2024-09-13 6:03 ` Sven Schnelle
2024-09-20 8:17 ` Masami Hiramatsu
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=20240904065908.1009086-4-svens@linux.ibm.com \
--to=svens@linux.ibm.com \
--cc=agordeev@linux.ibm.com \
--cc=borntraeger@linux.ibm.com \
--cc=gor@linux.ibm.com \
--cc=hca@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mathieu.desnoyers@efficios.com \
--cc=mhiramat@kernel.org \
--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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome