[RFC,23/32] function_graph: Add a new exit handler with parent_ip and ftrace_regs

Message ID	169920066851.482486.17730951166172619260.stgit@devnote2 (mailing list archive)
State	Superseded
Headers	show Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A487C3C28; Sun, 5 Nov 2023 16:11:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="r0T5omuk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 70CD2C433C7; Sun, 5 Nov 2023 16:11:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699200675; bh=jG7ymSTJt2pOrHfOUVqQ7eTEuAUumsUaG6MXhuKCWzc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=r0T5omuklfLoUmQqMg+rXOMSSNbY/Cbw1OpcsjU6AcZb/VpvgBDSyEFREJz2FBkYF MTH20F4bneRLq+bGlm9lnSCa23FSwvi6HQLsfPDWKqPtKfJ5CadXhj+koK7qx+8g8I LdmUuo6VqLJT2VnXGeetvVCeXiYnw4NiK3ZyyKFhuXTxYf6/kmS3lh3CW6aIbdF4Di nZef1GgIj0UOTzDauZOHZYpjJbnZh1iggLXqRhaQv87tYv10Vo4SP1HEN/PHslrB5s lhdLELn6U/qbVkZXbznTJsJVxpgzQ/sUscSCRBl0aykMbqZxXOX5KmecPyL85dSi7b S8JssNdqbI0CQ== 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: [RFC PATCH 23/32] function_graph: Add a new exit handler with parent_ip and ftrace_regs Date: Mon, 6 Nov 2023 01:11:08 +0900 Message-Id: <169920066851.482486.17730951166172619260.stgit@devnote2> X-Mailer: git-send-email 2.34.1 In-Reply-To: <169920038849.482486.15796387219966662967.stgit@devnote2> References: <169920038849.482486.15796387219966662967.stgit@devnote2> User-Agent: StGit/0.19 Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: <linux-trace-kernel.vger.kernel.org> List-Subscribe: <mailto:linux-trace-kernel+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:linux-trace-kernel+unsubscribe@vger.kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit
Series	tracing: fprobe: function_graph: Multi-function graph and fprobe on fgraph \| expand [RFC,00/32] tracing: fprobe: function_graph: Multi-function graph and fprobe on fgraph [RFC,01/32] seq_buf: Export seq_buf_puts() [RFC,02/32] function_graph: Convert ret_stack to a series of longs [RFC,03/32] fgraph: Use BUILD_BUG_ON() to make sure we have structures divisible by long [RFC,04/32] function_graph: Add an array structure that will allow multiple callbacks [RFC,05/32] function_graph: Allow multiple users to attach to function graph [RFC,06/32] function_graph: Remove logic around ftrace_graph_entry and return [RFC,07/32] ftrace/function_graph: Pass fgraph_ops to function graph callbacks [RFC,08/32] ftrace: Allow function_graph tracer to be enabled in instances [RFC,09/32] ftrace: Allow ftrace startup flags exist without dynamic ftrace [RFC,10/32] function_graph: Have the instances use their own ftrace_ops for filtering [RFC,11/32] function_graph: Add "task variables" per task for fgraph_ops [RFC,12/32] function_graph: Move set_graph_function tests to shadow stack global var [RFC,13/32] function_graph: Move graph depth stored data to shadow stack global var [RFC,14/32] function_graph: Move graph notrace bit to shadow stack global var [RFC,15/32] function_graph: Implement fgraph_reserve_data() and fgraph_retrieve_data() [RFC,16/32] function_graph: Add selftest for passing local variables [RFC,17/32] function_graph: Fix to update curr_ret_stack with ARRAY entry size [RFC,18/32] function_graph: Fix to initalize ftrace_ops for fgraph with ftrace_graph_func [RFC,19/32] function_graph: Fix to check the return value of ftrace_pop_return_trace() [RFC,20/32] function_graph: Pass the size of reserved data when retrieving it [RFC,21/32] function_graph: Expand the max reserved data size [RFC,22/32] function_graph: Add a new entry handler with parent_ip and ftrace_regs [RFC,23/32] function_graph: Add a new exit handler with parent_ip and ftrace_regs [RFC,24/32] x86/ftrace: Enable HAVE_FUNCTION_GRAPH_FREGS [RFC,25/32] fprobe: Use ftrace_regs in fprobe entry handler [RFC,26/32] fprobe: Use ftrace_regs in fprobe exit handler [RFC,27/32] tracing: Add ftrace_partial_regs() for converting ftrace_regs to pt_regs [RFC,28/32] tracing: Add ftrace_fill_perf_regs() for perf event [RFC,29/32] fprobe: Rewrite fprobe on function-graph tracer [RFC,30/32] tracing/fprobe: Enable fprobe events with CONFIG_DYNAMIC_FTRACE_WITH_ARGS [RFC,31/32] bpf: Enable kprobe_multi feature if CONFIG_FPROBE is enabled [RFC,32/32] Documentation: probes: Update fprobe on function-graph tracer

diff --git a/arch/x86/include/asm/ftrace.h b/arch/x86/include/asm/ftrace.h index 897cf02c20b1..74b1d245c38b 100644 --- a/arch/x86/include/asm/ftrace.h +++ b/arch/x86/include/asm/ftrace.h @@ -66,6 +66,8 @@ arch_ftrace_get_regs(struct ftrace_regs *fregs) override_function_with_return(&(fregs)->regs) #define ftrace_regs_query_register_offset(name) \ regs_query_register_offset(name) +#define ftrace_regs_get_frame_pointer(fregs) \ + frame_pointer(&(fregs)->regs) struct ftrace_ops; #define ftrace_graph_func ftrace_graph_func diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index a6fd930d3500..0c036c5d7c12 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h @@ -43,7 +43,9 @@ struct dyn_ftrace; char *arch_ftrace_match_adjust(char *str, const char *search); -#ifdef CONFIG_HAVE_FUNCTION_GRAPH_RETVAL +#ifdef CONFIG_HAVE_FUNCTION_GRAPH_FREGS +unsigned long ftrace_return_to_handler(struct ftrace_regs *fregs); +#elif defined(CONFIG_HAVE_FUNCTION_GRAPH_RETVAL) struct fgraph_ret_regs; unsigned long ftrace_return_to_handler(struct fgraph_ret_regs *ret_regs); #else @@ -131,6 +133,7 @@ struct ftrace_regs { #define ftrace_regs_set_instruction_pointer(fregs, ip) do { } while (0) #endif /* CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS */ + static __always_inline struct pt_regs *ftrace_get_regs(struct ftrace_regs *fregs) { if (!fregs) @@ -1041,6 +1044,10 @@ typedef int (*trace_func_graph_regs_ent_t)(unsigned long func, unsigned long parent_ip, struct ftrace_regs *fregs, struct fgraph_ops *); /* entry w/ regs */ +typedef void (*trace_func_graph_regs_ret_t)(unsigned long func, + unsigned long parent_ip, + struct ftrace_regs *, + struct fgraph_ops *); /* return w/ regs */ extern int ftrace_graph_entry_stub(struct ftrace_graph_ent *trace, struct fgraph_ops *gops); @@ -1050,6 +1057,7 @@ struct fgraph_ops { trace_func_graph_ent_t entryfunc; trace_func_graph_ret_t retfunc; trace_func_graph_regs_ent_t entryregfunc; + trace_func_graph_regs_ret_t retregfunc; struct ftrace_ops ops; /* for the hash lists */ void *private; int idx; diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig index 61c541c36596..308b3bec01b1 100644 --- a/kernel/trace/Kconfig +++ b/kernel/trace/Kconfig @@ -34,6 +34,9 @@ config HAVE_FUNCTION_GRAPH_TRACER config HAVE_FUNCTION_GRAPH_RETVAL bool +config HAVE_FUNCTION_GRAPH_FREGS + bool + config HAVE_DYNAMIC_FTRACE bool help @@ -232,7 +235,7 @@ config FUNCTION_GRAPH_TRACER config FUNCTION_GRAPH_RETVAL bool "Kernel Function Graph Return Value" - depends on HAVE_FUNCTION_GRAPH_RETVAL + depends on HAVE_FUNCTION_GRAPH_RETVAL || HAVE_FUNCTION_GRAPH_FREGS depends on FUNCTION_GRAPH_TRACER default n help diff --git a/kernel/trace/fgraph.c b/kernel/trace/fgraph.c index 2623a5987f52..c76fb2f33437 100644 --- a/kernel/trace/fgraph.c +++ b/kernel/trace/fgraph.c @@ -624,8 +624,7 @@ int function_graph_enter_regs(unsigned long ret, unsigned long func, /* Retrieve a function return address to the trace stack on thread info.*/ static struct ftrace_ret_stack * -ftrace_pop_return_trace(struct ftrace_graph_ret *trace, unsigned long *ret, - unsigned long frame_pointer) +ftrace_pop_return_trace(unsigned long *ret, unsigned long frame_pointer) { struct ftrace_ret_stack *ret_stack; int index; @@ -670,10 +669,6 @@ ftrace_pop_return_trace(struct ftrace_graph_ret *trace, unsigned long *ret, #endif *ret = ret_stack->ret; - trace->func = ret_stack->func; - trace->calltime = ret_stack->calltime; - trace->overrun = atomic_read(&current->trace_overrun); - trace->depth = current->curr_ret_depth; /* * We still want to trace interrupts coming in if * max_depth is set to 1. Make sure the decrement is @@ -712,22 +707,43 @@ static struct notifier_block ftrace_suspend_notifier = { /* fgraph_ret_regs is not defined without CONFIG_FUNCTION_GRAPH_RETVAL */ struct fgraph_ret_regs; +static void fgraph_call_retfunc(struct ftrace_regs *fregs, + struct fgraph_ret_regs *ret_regs, + struct ftrace_ret_stack *ret_stack, + struct fgraph_ops *gops) +{ + struct ftrace_graph_ret trace; + + trace.func = ret_stack->func; + trace.calltime = ret_stack->calltime; + trace.overrun = atomic_read(&current->trace_overrun); + trace.depth = current->curr_ret_depth; + trace.rettime = trace_clock_local(); +#ifdef CONFIG_FUNCTION_GRAPH_RETVAL + if (fregs) + trace.retval = ftrace_regs_return_value(fregs); + else + trace.retval = fgraph_ret_regs_return_value(ret_regs); +#endif + gops->retfunc(&trace, gops); +} + /* * Send the trace to the ring-buffer. * @return the original return address. */ -static unsigned long __ftrace_return_to_handler(struct fgraph_ret_regs *ret_regs, +static unsigned long __ftrace_return_to_handler(struct ftrace_regs *fregs, + struct fgraph_ret_regs *ret_regs, unsigned long frame_pointer) { struct ftrace_ret_stack *ret_stack; - struct ftrace_graph_ret trace; - unsigned long ret; + struct fgraph_ops *gops; int curr_ret_stack; + unsigned long ret; int stop_at; int index; - int idx; - ret_stack = ftrace_pop_return_trace(&trace, &ret, frame_pointer); + ret_stack = ftrace_pop_return_trace(&ret, frame_pointer); if (unlikely(!ret_stack)) { ftrace_graph_stop(); @@ -736,11 +752,6 @@ static unsigned long __ftrace_return_to_handler(struct fgraph_ret_regs *ret_regs return (unsigned long)panic; } - trace.rettime = trace_clock_local(); -#ifdef CONFIG_FUNCTION_GRAPH_RETVAL - trace.retval = fgraph_ret_regs_return_value(ret_regs); -#endif - curr_ret_stack = current->curr_ret_stack; index = get_ret_stack_index(current, curr_ret_stack - 1); @@ -753,8 +764,11 @@ static unsigned long __ftrace_return_to_handler(struct fgraph_ret_regs *ret_regs val = current->ret_stack[curr_ret_stack - 1]; switch (__get_type(val)) { case FGRAPH_TYPE_ARRAY: - idx = __get_array(val); - fgraph_array[idx]->retfunc(&trace, fgraph_array[idx]); + gops = fgraph_array[__get_array(val)]; + if (gops->retregfunc) + gops->retregfunc(ret_stack->func, ret, fregs, gops); + else + fgraph_call_retfunc(fregs, ret_regs, ret_stack, gops); curr_ret_stack -= __get_index(val); break; case FGRAPH_TYPE_RESERVED: @@ -778,20 +792,22 @@ static unsigned long __ftrace_return_to_handler(struct fgraph_ret_regs *ret_regs return ret; } -/* - * After all architecures have selected HAVE_FUNCTION_GRAPH_RETVAL, we can - * leave only ftrace_return_to_handler(ret_regs). - */ -#ifdef CONFIG_HAVE_FUNCTION_GRAPH_RETVAL +#ifdef CONFIG_HAVE_FUNCTION_GRAPH_FREGS +unsigned long ftrace_return_to_handler(struct ftrace_regs *fregs) +{ + return __ftrace_return_to_handler(fregs, NULL, + ftrace_regs_get_frame_pointer(fregs)); +} +#elif defined(CONFIG_HAVE_FUNCTION_GRAPH_RETVAL) unsigned long ftrace_return_to_handler(struct fgraph_ret_regs *ret_regs) { - return __ftrace_return_to_handler(ret_regs, + return __ftrace_return_to_handler(NULL, ret_regs, fgraph_ret_regs_frame_pointer(ret_regs)); } #else unsigned long ftrace_return_to_handler(unsigned long frame_pointer) { - return __ftrace_return_to_handler(NULL, frame_pointer); + return __ftrace_return_to_handler(NULL, NULL, frame_pointer); } #endif @@ -1132,9 +1148,15 @@ int register_ftrace_graph(struct fgraph_ops *gops) int ret = 0; int i; - if (gops->entryfunc && gops->entryregfunc) + if ((gops->entryfunc && gops->entryregfunc) || + (gops->retfunc && gops->retregfunc)) return -EINVAL; +#ifndef CONFIG_HAVE_FUNCTION_GRAPH_FREGS + if (gops->retregfunc) + return -EOPNOTSUPP; +#endif + mutex_lock(&ftrace_lock); if (!gops->ops.func) {

[RFC,23/32] function_graph: Add a new exit handler with parent_ip and ftrace_regs

Commit Message

Patch