From mboxrd@z Thu Jan 1 00:00:00 1970 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 F2E9317730; Mon, 6 Nov 2023 10:04:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="bov0Hu9H" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 87CF4C433C7; Mon, 6 Nov 2023 10:04:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699265062; bh=N+J4uYmXVpTzfaXKjD6eS71G3lnyCcY7HtDKx1e+Uts=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=bov0Hu9H0C1RcT+NiXHNn+Pibn5nMp6Y45MKQJCmsmiNT0AlDwPjmasythPTi8B4p JKsmpx+T/Cnf3/7nhpaiGRiZh3cC6Wjrf7UEAJEwoz/aYcweViMP2ZXLc3JOBHaR+Z IUqacxRFDE4Mn2VB0DNucAnLf0wGpEmc5znw/gUCGwSXTYtE4Nq9OipLq2MRN/n9BD OoLoG4QEWt7A19uM6bmpDcbRQAp4KOS7x+7KQuxOtV1zbro++cjVaqyHOCqZ4K/AHN OUIDxeaxwf0T84aI2O36puv5Ko76ATVLCs9GyjydvIpTWY117PxdUSGDonRkZe48Kc 4ZNZqDd4eihzQ== Date: Mon, 6 Nov 2023 19:04:16 +0900 From: Masami Hiramatsu (Google) To: "Masami Hiramatsu (Google)" Cc: Alexei Starovoitov , Steven Rostedt , Florent Revest , linux-trace-kernel@vger.kernel.org, LKML , Martin KaFai Lau , bpf , Sven Schnelle , Alexei Starovoitov , Jiri Olsa , Arnaldo Carvalho de Melo , Daniel Borkmann , Alan Maguire , Mark Rutland , Peter Zijlstra , Thomas Gleixner , Guo Ren Subject: Re: [RFC PATCH 18/32] function_graph: Fix to initalize ftrace_ops for fgraph with ftrace_graph_func Message-Id: <20231106190416.cbd04fdd5bb9cdff72563e64@kernel.org> In-Reply-To: <169920060974.482486.15664806338999944098.stgit@devnote2> References: <169920038849.482486.15796387219966662967.stgit@devnote2> <169920060974.482486.15664806338999944098.stgit@devnote2> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Mon, 6 Nov 2023 01:10:10 +0900 "Masami Hiramatsu (Google)" wrote: > From: Masami Hiramatsu (Google) > > Fix to initialize the ftrace_ops of fgraph_ops with ftrace_graph_func > instead of ftrace_stub. I've changed this, because fprobe entry handler is not called via fgraph without this. But maybe I have to set correct gops->ops.func after init? Thank you, > > Signed-off-by: Masami Hiramatsu (Google) > --- > kernel/trace/fgraph.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/kernel/trace/fgraph.c b/kernel/trace/fgraph.c > index 597250bd30dc..858fb73440ec 100644 > --- a/kernel/trace/fgraph.c > +++ b/kernel/trace/fgraph.c > @@ -872,7 +872,7 @@ unsigned long ftrace_graph_ret_addr(struct task_struct *task, int *idx, > void fgraph_init_ops(struct ftrace_ops *dst_ops, > struct ftrace_ops *src_ops) > { > - dst_ops->func = ftrace_stub; > + dst_ops->func = ftrace_graph_func; > dst_ops->flags = FTRACE_OPS_FL_PID | FTRACE_OPS_FL_STUB; > > #ifdef FTRACE_GRAPH_TRAMP_ADDR > @@ -1120,7 +1120,7 @@ int register_ftrace_graph(struct fgraph_ops *gops) > > if (!gops->ops.func) { > gops->ops.flags |= FTRACE_OPS_FL_STUB; > - gops->ops.func = ftrace_stub; > + gops->ops.func = ftrace_graph_func; > #ifdef FTRACE_GRAPH_TRAMP_ADDR > gops->ops.trampoline = FTRACE_GRAPH_TRAMP_ADDR; > #endif > -- Masami Hiramatsu (Google)