On Tue, Mar 11, 2025 at 10:56:26AM +0100, Jiri Slaby wrote: > On 11. 03. 25, 10:49, Jiri Slaby wrote: > > On 11. 03. 25, 10:46, Jiri Slaby wrote: > > > On 10. 03. 25, 18:04, Greg Kroah-Hartman wrote: > > > > 6.13-stable review patch. If anyone has any objections, please > > > > let me know. > > > > > > > > ------------------ > > > > > > > > From: Masami Hiramatsu (Google) <mhiramat@xxxxxxxxxx> > > > > > > > > [ Upstream commit 4346ba1604093305a287e08eb465a9c15ba05b80 ] > > > ... > > > > --- a/kernel/trace/Kconfig > > > > +++ b/kernel/trace/Kconfig > > > > @@ -302,11 +302,9 @@ config DYNAMIC_FTRACE_WITH_ARGS > > > > config FPROBE > > > > bool "Kernel Function Probe (fprobe)" > > > > - depends on FUNCTION_TRACER > > > > - depends on DYNAMIC_FTRACE_WITH_REGS || DYNAMIC_FTRACE_WITH_ARGS > > > > - depends on HAVE_FTRACE_REGS_HAVING_PT_REGS || ! > > > > HAVE_DYNAMIC_FTRACE_WITH_ARGS > > > > - depends on HAVE_RETHOOK > > > > - select RETHOOK > > > > + depends on HAVE_FUNCTION_GRAPH_FREGS && HAVE_FTRACE_GRAPH_FUNC > > > > > > HAVE_FTRACE_GRAPH_FUNC does not exist on 6.13, so FPROBE is > > > effectively disabled by this backport. > > > > > > Is this missing (and only this?): > > > commit a762e9267dca843ced943ec24f20e110ba7c8431 > > > Author: Masami Hiramatsu (Google) <mhiramat@xxxxxxxxxx> > > > Date: Thu Dec 26 14:13:34 2024 +0900 > > > > > > ftrace: Add CONFIG_HAVE_FTRACE_GRAPH_FUNC > > > > With this applied, x86_64 is fixed. But ppc and s390 still loose it. > > > HAVE_FTRACE_GRAPH_FUNC is missing in ppc completely in upstream too (a > bug?). > > s390 has it only through (here omitted): > commit 7495e179b478801433cec3cc4a82d2dcea35bf06 > Author: Sven Schnelle <svens@xxxxxxxxxxxxx> > Date: Thu Dec 26 14:13:48 2024 +0900 > > s390/tracing: Enable HAVE_FTRACE_GRAPH_FUNC Yeah, this isn't right. I've dropped all of these from the queue now, thanks for the review! greg k-h
