From: "Masami Hiramatsu (Google)" <mhiramat@kernel.org>
To: Alexei Starovoitov <alexei.starovoitov@gmail.com>,
Steven Rostedt <rostedt@goodmis.org>,
Florent Revest <revest@chromium.org>
Cc: linux-trace-kernel@vger.kernel.org,
LKML <linux-kernel@vger.kernel.org>,
Martin KaFai Lau <martin.lau@linux.dev>,
bpf <bpf@vger.kernel.org>, Sven Schnelle <svens@linux.ibm.com>,
Alexei Starovoitov <ast@kernel.org>, Jiri Olsa <jolsa@kernel.org>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Alan Maguire <alan.maguire@oracle.com>,
Mark Rutland <mark.rutland@arm.com>,
Peter Zijlstra <peterz@infradead.org>,
Thomas Gleixner <tglx@linutronix.de>, Guo Ren <guoren@kernel.org>
Subject: [PATCH v7 24/36] x86/ftrace: Enable HAVE_FUNCTION_GRAPH_FREGS
Date: Wed, 7 Feb 2024 00:11:56 +0900 [thread overview]
Message-ID: <170723231592.502590.12367006830540525214.stgit@devnote2> (raw)
In-Reply-To: <170723204881.502590.11906735097521170661.stgit@devnote2>
From: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Support HAVE_FUNCTION_GRAPH_FREGS on x86-64, which saves ftrace_regs
on the stack in ftrace_graph return trampoline so that the callbacks
can access registers via ftrace_regs APIs.
Note that this only recovers 'rax' and 'rdx' registers because other
registers are not used anymore and recovered by caller. 'rax' and
'rdx' will be used for passing the return value.
Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
---
Changes in v3:
- Add a comment about rip.
Changes in v2:
- Save rsp register and drop clearing orig_ax.
---
arch/x86/Kconfig | 3 ++-
arch/x86/kernel/ftrace_64.S | 37 +++++++++++++++++++++++++++++--------
2 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 5edec175b9bf..ccf17d8b6f5f 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -223,7 +223,8 @@ config X86
select HAVE_FAST_GUP
select HAVE_FENTRY if X86_64 || DYNAMIC_FTRACE
select HAVE_FTRACE_MCOUNT_RECORD
- select HAVE_FUNCTION_GRAPH_RETVAL if HAVE_FUNCTION_GRAPH_TRACER
+ select HAVE_FUNCTION_GRAPH_FREGS if HAVE_DYNAMIC_FTRACE_WITH_ARGS
+ select HAVE_FUNCTION_GRAPH_RETVAL if !HAVE_DYNAMIC_FTRACE_WITH_ARGS
select HAVE_FUNCTION_GRAPH_TRACER if X86_32 || (X86_64 && DYNAMIC_FTRACE)
select HAVE_FUNCTION_TRACER
select HAVE_GCC_PLUGINS
diff --git a/arch/x86/kernel/ftrace_64.S b/arch/x86/kernel/ftrace_64.S
index 214f30e9f0c0..8a16f774604e 100644
--- a/arch/x86/kernel/ftrace_64.S
+++ b/arch/x86/kernel/ftrace_64.S
@@ -348,21 +348,42 @@ STACK_FRAME_NON_STANDARD_FP(__fentry__)
SYM_CODE_START(return_to_handler)
UNWIND_HINT_UNDEFINED
ANNOTATE_NOENDBR
- subq $24, %rsp
+ /*
+ * Save the registers requires for ftrace_regs;
+ * rax, rcx, rdx, rdi, rsi, r8, r9 and rbp
+ */
+ subq $(FRAME_SIZE), %rsp
+ movq %rax, RAX(%rsp)
+ movq %rcx, RCX(%rsp)
+ movq %rdx, RDX(%rsp)
+ movq %rsi, RSI(%rsp)
+ movq %rdi, RDI(%rsp)
+ movq %r8, R8(%rsp)
+ movq %r9, R9(%rsp)
+ movq %rbp, RBP(%rsp)
+ /*
+ * orig_ax is not cleared because it is used for indicating the direct
+ * trampoline in the fentry. And rip is not set because we don't know
+ * the correct return address here.
+ */
+
+ leaq FRAME_SIZE(%rsp), %rcx
+ movq %rcx, RSP(%rsp)
- /* Save the return values */
- movq %rax, (%rsp)
- movq %rdx, 8(%rsp)
- movq %rbp, 16(%rsp)
movq %rsp, %rdi
call ftrace_return_to_handler
movq %rax, %rdi
- movq 8(%rsp), %rdx
- movq (%rsp), %rax
- addq $24, %rsp
+ /*
+ * Restore only rax and rdx because other registers are not used
+ * for return value nor callee saved. Caller will reuse/recover it.
+ */
+ movq RDX(%rsp), %rdx
+ movq RAX(%rsp), %rax
+
+ addq $(FRAME_SIZE), %rsp
/*
* Jump back to the old return address. This cannot be JMP_NOSPEC rdi
* since IBT would demand that contain ENDBR, which simply isn't so for
next prev parent reply other threads:[~2024-02-06 15:12 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-06 15:07 [PATCH v7 00/36] tracing: fprobe: function_graph: Multi-function graph and fprobe on fgraph Masami Hiramatsu (Google)
2024-02-06 15:07 ` [PATCH v7 01/36] ftrace: Fix DIRECT_CALLS to use SAVE_REGS by default Masami Hiramatsu (Google)
2024-02-06 15:07 ` [PATCH v7 02/36] tracing: Add a comment about ftrace_regs definition Masami Hiramatsu (Google)
2024-02-06 15:08 ` [PATCH v7 03/36] tracing: Rename ftrace_regs_return_value to ftrace_regs_get_return_value Masami Hiramatsu (Google)
2024-02-06 15:08 ` [PATCH v7 04/36] x86: tracing: Add ftrace_regs definition in the header Masami Hiramatsu (Google)
2024-02-06 15:08 ` [PATCH v7 05/36] function_graph: Convert ret_stack to a series of longs Masami Hiramatsu (Google)
2024-02-06 15:08 ` [PATCH v7 06/36] fgraph: Use BUILD_BUG_ON() to make sure we have structures divisible by long Masami Hiramatsu (Google)
2024-02-06 15:08 ` [PATCH v7 07/36] function_graph: Add an array structure that will allow multiple callbacks Masami Hiramatsu (Google)
2024-02-06 15:08 ` [PATCH v7 08/36] function_graph: Allow multiple users to attach to function graph Masami Hiramatsu (Google)
2024-02-06 15:09 ` [PATCH v7 09/36] function_graph: Remove logic around ftrace_graph_entry and return Masami Hiramatsu (Google)
2024-02-06 15:09 ` [PATCH v7 10/36] ftrace/function_graph: Pass fgraph_ops to function graph callbacks Masami Hiramatsu (Google)
2024-02-14 1:42 ` Steven Rostedt
2024-02-14 13:28 ` Masami Hiramatsu
2024-02-06 15:09 ` [PATCH v7 11/36] ftrace: Allow function_graph tracer to be enabled in instances Masami Hiramatsu (Google)
2024-02-06 15:09 ` [PATCH v7 12/36] ftrace: Allow ftrace startup flags exist without dynamic ftrace Masami Hiramatsu (Google)
2024-02-06 15:09 ` [PATCH v7 13/36] function_graph: Have the instances use their own ftrace_ops for filtering Masami Hiramatsu (Google)
2024-02-07 14:02 ` Masami Hiramatsu
2024-02-06 15:10 ` [PATCH v7 14/36] function_graph: Use a simple LRU for fgraph_array index number Masami Hiramatsu (Google)
2024-02-14 18:04 ` Steven Rostedt
2024-02-14 23:48 ` Masami Hiramatsu
2024-02-06 15:10 ` [PATCH v7 15/36] function_graph: Add "task variables" per task for fgraph_ops Masami Hiramatsu (Google)
2024-02-06 15:10 ` [PATCH v7 16/36] function_graph: Move set_graph_function tests to shadow stack global var Masami Hiramatsu (Google)
2024-02-06 15:10 ` [PATCH v7 17/36] function_graph: Move graph depth stored data " Masami Hiramatsu (Google)
2024-02-06 15:10 ` [PATCH v7 18/36] function_graph: Move graph notrace bit " Masami Hiramatsu (Google)
2024-02-06 15:11 ` [PATCH v7 19/36] function_graph: Implement fgraph_reserve_data() and fgraph_retrieve_data() Masami Hiramatsu (Google)
2024-02-14 18:59 ` Steven Rostedt
2024-02-14 23:45 ` Masami Hiramatsu
2024-02-14 23:54 ` Steven Rostedt
2024-02-16 7:40 ` Masami Hiramatsu
2024-02-06 15:11 ` [PATCH v7 20/36] function_graph: Improve push operation for several interrupts Masami Hiramatsu (Google)
2024-02-15 14:57 ` Steven Rostedt
2024-02-17 15:53 ` Masami Hiramatsu
2024-02-06 15:11 ` [PATCH v7 21/36] function_graph: Add selftest for passing local variables Masami Hiramatsu (Google)
2024-02-15 15:02 ` Steven Rostedt
2024-02-16 8:41 ` Masami Hiramatsu
2024-02-06 15:11 ` [PATCH v7 22/36] function_graph: Add a new entry handler with parent_ip and ftrace_regs Masami Hiramatsu (Google)
2024-02-15 15:38 ` Steven Rostedt
2024-02-19 16:07 ` Steven Rostedt
2024-02-06 15:11 ` [PATCH v7 23/36] function_graph: Add a new exit " Masami Hiramatsu (Google)
2024-02-15 15:39 ` Steven Rostedt
2024-02-16 8:42 ` Masami Hiramatsu
2024-02-15 15:49 ` Steven Rostedt
2024-02-16 8:43 ` Masami Hiramatsu
2024-02-15 16:04 ` Steven Rostedt
2024-02-16 8:51 ` Masami Hiramatsu
2024-02-18 2:53 ` Masami Hiramatsu
2024-02-19 14:04 ` Masami Hiramatsu
2024-02-06 15:11 ` Masami Hiramatsu (Google) [this message]
2024-02-15 16:08 ` [PATCH v7 24/36] x86/ftrace: Enable HAVE_FUNCTION_GRAPH_FREGS Steven Rostedt
2024-02-16 8:54 ` Masami Hiramatsu
2024-02-06 15:12 ` [PATCH v7 25/36] arm64: ftrace: " Masami Hiramatsu (Google)
2024-02-15 16:10 ` Steven Rostedt
2024-02-16 12:49 ` Masami Hiramatsu
2024-02-06 15:12 ` [PATCH v7 26/36] fprobe: Use ftrace_regs in fprobe entry handler Masami Hiramatsu (Google)
2024-02-06 15:12 ` [PATCH v7 27/36] fprobe: Use ftrace_regs in fprobe exit handler Masami Hiramatsu (Google)
2024-02-06 15:12 ` [PATCH v7 28/36] tracing: Add ftrace_partial_regs() for converting ftrace_regs to pt_regs Masami Hiramatsu (Google)
2024-02-15 16:11 ` Steven Rostedt
2024-02-16 13:09 ` Masami Hiramatsu
2024-02-16 14:24 ` Steven Rostedt
2024-02-06 15:12 ` [PATCH v7 29/36] tracing: Add ftrace_fill_perf_regs() for perf event Masami Hiramatsu (Google)
2024-02-06 15:13 ` [PATCH v7 30/36] tracing/fprobe: Enable fprobe events with CONFIG_DYNAMIC_FTRACE_WITH_ARGS Masami Hiramatsu (Google)
2024-02-06 15:13 ` [PATCH v7 31/36] bpf: Enable kprobe_multi feature if CONFIG_FPROBE is enabled Masami Hiramatsu (Google)
2024-02-06 15:13 ` [PATCH v7 32/36] fprobe: Rewrite fprobe on function-graph tracer Masami Hiramatsu (Google)
2024-02-06 15:13 ` [PATCH v7 33/36] tracing/fprobe: Remove nr_maxactive from fprobe Masami Hiramatsu (Google)
2024-02-06 15:13 ` [PATCH v7 34/36] selftests: ftrace: Remove obsolate maxactive syntax check Masami Hiramatsu (Google)
2024-02-06 15:13 ` [PATCH v7 35/36] selftests/ftrace: Add a test case for repeating register/unregister fprobe Masami Hiramatsu (Google)
2024-02-06 15:14 ` [PATCH v7 36/36] Documentation: probes: Update fprobe on function-graph tracer Masami Hiramatsu (Google)
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=170723231592.502590.12367006830540525214.stgit@devnote2 \
--to=mhiramat@kernel.org \
--cc=acme@kernel.org \
--cc=alan.maguire@oracle.com \
--cc=alexei.starovoitov@gmail.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=guoren@kernel.org \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=martin.lau@linux.dev \
--cc=peterz@infradead.org \
--cc=revest@chromium.org \
--cc=rostedt@goodmis.org \
--cc=svens@linux.ibm.com \
--cc=tglx@linutronix.de \
/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;
as well as URLs for NNTP newsgroup(s).