From nobody Mon Nov 25 15:48:31 2024 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 3B2A754670; Sun, 10 Nov 2024 15:49:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731253767; cv=none; b=ARBEvOLyXV/h7/2z537lXVwg228XK2cob4xdOLEMVIDnmAiD1uzYOjfou5nrYwfWEI/UFu+8T2DQwemCfsq/fYcj6Sk3wsjw6KvLT53BS9YpaHOvrg6NngcyHaVXu6wKYyt5i+RLZ6II5eqX2WWyred//JyRNStkH3pfmSp2UZ0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731253767; c=relaxed/simple; bh=fy5HBN3FEQJW3L0aIlEA7Y6GGFOSQl58j9oW53za+hU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=s/RqofM+99PoInEUSZQ1ZJiz5JlvbxDzbDec1wBodzELupqoMVoU3euXXVk5+zI7rFbPNZCJx2JWbwr2CDfoCU5TpeQKkV3Eb7mpCOD2GYL3se2JRGTEBSzgMu/WW7np98x6DbGjYwK5e3vLB810yRBCe6ZyUAcSSv4I+viPUxk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gDAeLxjo; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="gDAeLxjo" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D6A11C4CECD; Sun, 10 Nov 2024 15:49:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1731253766; bh=fy5HBN3FEQJW3L0aIlEA7Y6GGFOSQl58j9oW53za+hU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gDAeLxjo3Rc6Rm85LV+wH4MzFWRfjLHFKCYOSqUknVoA7sSRhL0IYBHz1m0Jefcx1 tb/op/sVPMyx1Kbzj0q+rgi6P5d/wuWpLXmH9gKIncMFV5p8qbK10r9BnwOwH2ok5a rXxw+8lWEH6pkD3hkL5FudOAiny5IexSa6DQtDyw0/wGBOoYoFh4WQg1Wirb7nCMPj uQQw3UdFBTESsvzTp2znI7EAkouik+92SXzPboeqFc3w/aI46Zd1b7/YkuPq/uwtgm tnnqx9d72cLjveXrHAYJPEw0120tZXl2ioPJN1HXFSFEpC0h7nF5VPq1tSPKvZseJR yCOizqKrVzIWQ== From: "Masami Hiramatsu (Google)" To: Alexei Starovoitov , Steven Rostedt , Florent Revest Cc: linux-trace-kernel@vger.kernel.org, LKML , Martin KaFai Lau , bpf , Alexei Starovoitov , Jiri Olsa , Alan Maguire , Mark Rutland , linux-arch@vger.kernel.org Subject: [PATCH v19 03/19] fgraph: Pass ftrace_regs to retfunc Date: Mon, 11 Nov 2024 00:49:21 +0900 Message-ID: <173125376150.172790.9363349123343684485.stgit@devnote2> X-Mailer: git-send-email 2.43.0 In-Reply-To: <173125372214.172790.6929368952404083802.stgit@devnote2> References: <173125372214.172790.6929368952404083802.stgit@devnote2> User-Agent: StGit/0.19 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Masami Hiramatsu (Google) Pass ftrace_regs to the fgraph_ops::retfunc(). If ftrace_regs is not available, it passes a NULL instead. User callback function can access some registers (including return address) via this ftrace_regs. Signed-off-by: Masami Hiramatsu (Google) --- Changes in v8: - Pass ftrace_regs to retfunc, instead of adding retregfunc. Changes in v6: - update to use ftrace_regs_get_return_value() because of reordering patches. Changes in v3: - Update for new multiple fgraph. - Save the return address to instruction pointer in ftrace_regs. --- include/linux/ftrace.h | 3 ++- kernel/trace/fgraph.c | 16 +++++++++++----- kernel/trace/ftrace.c | 3 ++- kernel/trace/trace.h | 3 ++- kernel/trace/trace_functions_graph.c | 7 ++++--- kernel/trace/trace_irqsoff.c | 3 ++- kernel/trace/trace_sched_wakeup.c | 3 ++- kernel/trace/trace_selftest.c | 3 ++- 8 files changed, 27 insertions(+), 14 deletions(-) diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index 069f270bd7ae..9a1e768e47da 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h @@ -1075,7 +1075,8 @@ struct fgraph_ops; =20 /* Type of the callback handlers for tracing function graph*/ typedef void (*trace_func_graph_ret_t)(struct ftrace_graph_ret *, - struct fgraph_ops *); /* return */ + struct fgraph_ops *, + struct ftrace_regs *); /* return */ typedef int (*trace_func_graph_ent_t)(struct ftrace_graph_ent *, struct fgraph_ops *, struct ftrace_regs *); /* entry */ diff --git a/kernel/trace/fgraph.c b/kernel/trace/fgraph.c index 126671cd38e5..7f4c2001e382 100644 --- a/kernel/trace/fgraph.c +++ b/kernel/trace/fgraph.c @@ -299,7 +299,8 @@ static int entry_run(struct ftrace_graph_ent *trace, st= ruct fgraph_ops *ops, } =20 /* ftrace_graph_return set to this to tell some archs to run function grap= h */ -static void return_run(struct ftrace_graph_ret *trace, struct fgraph_ops *= ops) +static void return_run(struct ftrace_graph_ret *trace, struct fgraph_ops *= ops, + struct ftrace_regs *fregs) { } =20 @@ -528,7 +529,8 @@ int ftrace_graph_entry_stub(struct ftrace_graph_ent *tr= ace, } =20 static void ftrace_graph_ret_stub(struct ftrace_graph_ret *trace, - struct fgraph_ops *gops) + struct fgraph_ops *gops, + struct ftrace_regs *fregs) { } =20 @@ -819,6 +821,9 @@ __ftrace_return_to_handler(struct ftrace_regs *fregs, u= nsigned long frame_pointe } =20 trace.rettime =3D trace_clock_local(); + if (fregs) + ftrace_regs_set_instruction_pointer(fregs, ret); + #ifdef CONFIG_FUNCTION_GRAPH_RETVAL trace.retval =3D ftrace_regs_get_return_value(fregs); #endif @@ -828,7 +833,7 @@ __ftrace_return_to_handler(struct ftrace_regs *fregs, u= nsigned long frame_pointe #ifdef CONFIG_HAVE_STATIC_CALL if (static_branch_likely(&fgraph_do_direct)) { if (test_bit(fgraph_direct_gops->idx, &bitmap)) - static_call(fgraph_retfunc)(&trace, fgraph_direct_gops); + static_call(fgraph_retfunc)(&trace, fgraph_direct_gops, fregs); } else #endif { @@ -838,7 +843,7 @@ __ftrace_return_to_handler(struct ftrace_regs *fregs, u= nsigned long frame_pointe if (gops =3D=3D &fgraph_stub) continue; =20 - gops->retfunc(&trace, gops); + gops->retfunc(&trace, gops, fregs); } } =20 @@ -1010,7 +1015,8 @@ void ftrace_graph_sleep_time_control(bool enable) * Simply points to ftrace_stub, but with the proper protocol. * Defined by the linker script in linux/vmlinux.lds.h */ -void ftrace_stub_graph(struct ftrace_graph_ret *trace, struct fgraph_ops *= gops); +void ftrace_stub_graph(struct ftrace_graph_ret *trace, struct fgraph_ops *= gops, + struct ftrace_regs *fregs); =20 /* The callbacks that hook a function */ trace_func_graph_ret_t ftrace_graph_return =3D ftrace_stub_graph; diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 8183b45edcca..6c8b1d51946c 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -850,7 +850,8 @@ static int profile_graph_entry(struct ftrace_graph_ent = *trace, } =20 static void profile_graph_return(struct ftrace_graph_ret *trace, - struct fgraph_ops *gops) + struct fgraph_ops *gops, + struct ftrace_regs *fregs) { struct profile_fgraph_data *profile_data; struct ftrace_profile_stat *stat; diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index d491618bf75e..358a694aa796 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -694,7 +694,8 @@ void trace_latency_header(struct seq_file *m); void trace_default_header(struct seq_file *m); void print_trace_header(struct seq_file *m, struct trace_iterator *iter); =20 -void trace_graph_return(struct ftrace_graph_ret *trace, struct fgraph_ops = *gops); +void trace_graph_return(struct ftrace_graph_ret *trace, struct fgraph_ops = *gops, + struct ftrace_regs *fregs); int trace_graph_entry(struct ftrace_graph_ent *trace, struct fgraph_ops *g= ops, struct ftrace_regs *fregs); =20 diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_func= tions_graph.c index b62ad912d84f..d0e4f412c298 100644 --- a/kernel/trace/trace_functions_graph.c +++ b/kernel/trace/trace_functions_graph.c @@ -315,7 +315,7 @@ static void handle_nosleeptime(struct ftrace_graph_ret = *trace, } =20 void trace_graph_return(struct ftrace_graph_ret *trace, - struct fgraph_ops *gops) + struct fgraph_ops *gops, struct ftrace_regs *fregs) { unsigned long *task_var =3D fgraph_get_task_var(gops); struct trace_array *tr =3D gops->private; @@ -355,7 +355,8 @@ void trace_graph_return(struct ftrace_graph_ret *trace, } =20 static void trace_graph_thresh_return(struct ftrace_graph_ret *trace, - struct fgraph_ops *gops) + struct fgraph_ops *gops, + struct ftrace_regs *fregs) { struct fgraph_times *ftimes; int size; @@ -379,7 +380,7 @@ static void trace_graph_thresh_return(struct ftrace_gra= ph_ret *trace, (trace->rettime - ftimes->calltime < tracing_thresh)) return; else - trace_graph_return(trace, gops); + trace_graph_return(trace, gops, fregs); } =20 static struct fgraph_ops funcgraph_ops =3D { diff --git a/kernel/trace/trace_irqsoff.c b/kernel/trace/trace_irqsoff.c index ad739d76fc86..504de7a05498 100644 --- a/kernel/trace/trace_irqsoff.c +++ b/kernel/trace/trace_irqsoff.c @@ -208,7 +208,8 @@ static int irqsoff_graph_entry(struct ftrace_graph_ent = *trace, } =20 static void irqsoff_graph_return(struct ftrace_graph_ret *trace, - struct fgraph_ops *gops) + struct fgraph_ops *gops, + struct ftrace_regs *fregs) { struct trace_array *tr =3D irqsoff_trace; struct trace_array_cpu *data; diff --git a/kernel/trace/trace_sched_wakeup.c b/kernel/trace/trace_sched_w= akeup.c index 0d9e1075d815..8165382a174a 100644 --- a/kernel/trace/trace_sched_wakeup.c +++ b/kernel/trace/trace_sched_wakeup.c @@ -144,7 +144,8 @@ static int wakeup_graph_entry(struct ftrace_graph_ent *= trace, } =20 static void wakeup_graph_return(struct ftrace_graph_ret *trace, - struct fgraph_ops *gops) + struct fgraph_ops *gops, + struct ftrace_regs *fregs) { struct trace_array *tr =3D wakeup_trace; struct trace_array_cpu *data; diff --git a/kernel/trace/trace_selftest.c b/kernel/trace/trace_selftest.c index f54493f8783d..d88c44f1dfa5 100644 --- a/kernel/trace/trace_selftest.c +++ b/kernel/trace/trace_selftest.c @@ -808,7 +808,8 @@ static __init int store_entry(struct ftrace_graph_ent *= trace, } =20 static __init void store_return(struct ftrace_graph_ret *trace, - struct fgraph_ops *gops) + struct fgraph_ops *gops, + struct ftrace_regs *fregs) { struct fgraph_fixture *fixture =3D container_of(gops, struct fgraph_fixtu= re, gops); const char *type =3D fixture->store_type_name;