Re: [PATCH v7 10/36] ftrace/function_graph: Pass fgraph_ops to function graph callbacks

From: Google
Date: Wed Feb 14 2024 - 08:28:24 EST


On Tue, 13 Feb 2024 20:42:18 -0500
Steven Rostedt <rostedt@xxxxxxxxxxx> wrote:

> On Wed, 7 Feb 2024 00:09:21 +0900
> "Masami Hiramatsu (Google)" <mhiramat@xxxxxxxxxx> wrote:
>
> > From: Steven Rostedt (VMware) <rostedt@xxxxxxxxxxx>
> >
> > Pass the fgraph_ops structure to the function graph callbacks. This will
> > allow callbacks to add a descriptor to a fgraph_ops private field that wil
> > be added in the future and use it for the callbacks. This will be useful
> > when more than one callback can be registered to the function graph tracer.
> >
> > Signed-off-by: Steven Rostedt (VMware) <rostedt@xxxxxxxxxxx>
> > Signed-off-by: Masami Hiramatsu (Google) <mhiramat@xxxxxxxxxx>
> > ---
> > Changes in v2:
> > - cleanup to set argument name on function prototype.
> > ---
> >
>
> This patch fails to compile without this change:

Thanks for pointing it out! Let me fix this in next version.

>
> diff --git a/kernel/trace/fgraph.c b/kernel/trace/fgraph.c
> index e35a941a5af3..47b461b1cf7e 100644
> --- a/kernel/trace/fgraph.c
> +++ b/kernel/trace/fgraph.c
> @@ -381,7 +381,7 @@ int function_graph_enter(unsigned long ret, unsigned long func,
> if (gops == &fgraph_stub)
> continue;
>
> - if (gops->entryfunc(&trace))
> + if (gops->entryfunc(&trace, gops))
> bitmap |= BIT(i);
> }
>
>
>
> -- Steve
>


--
Masami Hiramatsu (Google) <mhiramat@xxxxxxxxxx>