live-patching.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] tracing: define needed config DYNAMIC_FTRACE_WITH_ARGS
@ 2021-08-06 19:50 Lukas Bulwahn
  2021-08-07  1:18 ` Steven Rostedt
  0 siblings, 1 reply; 4+ messages in thread
From: Lukas Bulwahn @ 2021-08-06 19:50 UTC (permalink / raw)
  To: Steven Rostedt, Ingo Molnar
  Cc: Josh Poimboeuf, Jiri Kosina, live-patching, Peter Zijlstra,
	Miroslav Benes, kernel-janitors, linux-kernel, Lukas Bulwahn,
	stable

Commit 2860cd8a2353 ("livepatch: Use the default ftrace_ops instead of
REGS when ARGS is available") intends to enable config LIVEPATCH when
ftrace with ARGS is available. However, the chain of configs to enable
LIVEPATCH is incomplete, as HAVE_DYNAMIC_FTRACE_WITH_ARGS is available,
but the definition of DYNAMIC_FTRACE_WITH_ARGS, combining DYNAMIC_FTRACE
and HAVE_DYNAMIC_FTRACE_WITH_ARGS, needed to enable LIVEPATCH, is missing
in the commit.

Fortunately, ./scripts/checkkconfigsymbols.py detects this and warns:

DYNAMIC_FTRACE_WITH_ARGS
Referencing files: kernel/livepatch/Kconfig

So, define the config DYNAMIC_FTRACE_WITH_ARGS analogously to the already
existing similar configs, DYNAMIC_FTRACE_WITH_REGS and
DYNAMIC_FTRACE_WITH_DIRECT_CALLS, in ./kernel/trace/Kconfig to connect the
chain of configs.

Fixes: 2860cd8a2353 ("livepatch: Use the default ftrace_ops instead of REGS when ARGS is available")
Cc: <stable@vger.kernel.org> # 5.10.x
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
---

Steven, thanks for the quick response; please pick this quick config fix.

 kernel/trace/Kconfig | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index d567b1717c4c..3ee23f4d437f 100644
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -219,6 +219,11 @@ config DYNAMIC_FTRACE_WITH_DIRECT_CALLS
 	depends on DYNAMIC_FTRACE_WITH_REGS
 	depends on HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS
 
+config DYNAMIC_FTRACE_WITH_ARGS
+	def_bool y
+	depends on DYNAMIC_FTRACE
+	depends on HAVE_DYNAMIC_FTRACE_WITH_ARGS
+
 config FUNCTION_PROFILER
 	bool "Kernel function profiler"
 	depends on FUNCTION_TRACER
-- 
2.17.1


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] tracing: define needed config DYNAMIC_FTRACE_WITH_ARGS
  2021-08-06 19:50 [PATCH] tracing: define needed config DYNAMIC_FTRACE_WITH_ARGS Lukas Bulwahn
@ 2021-08-07  1:18 ` Steven Rostedt
  2021-08-17  9:28   ` Miroslav Benes
  0 siblings, 1 reply; 4+ messages in thread
From: Steven Rostedt @ 2021-08-07  1:18 UTC (permalink / raw)
  To: Lukas Bulwahn
  Cc: Ingo Molnar, Josh Poimboeuf, Jiri Kosina, live-patching,
	Peter Zijlstra, Miroslav Benes, kernel-janitors, linux-kernel,
	stable

On Fri,  6 Aug 2021 21:50:27 +0200
Lukas Bulwahn <lukas.bulwahn@gmail.com> wrote:

> Commit 2860cd8a2353 ("livepatch: Use the default ftrace_ops instead of
> REGS when ARGS is available") intends to enable config LIVEPATCH when
> ftrace with ARGS is available. However, the chain of configs to enable
> LIVEPATCH is incomplete, as HAVE_DYNAMIC_FTRACE_WITH_ARGS is available,
> but the definition of DYNAMIC_FTRACE_WITH_ARGS, combining DYNAMIC_FTRACE
> and HAVE_DYNAMIC_FTRACE_WITH_ARGS, needed to enable LIVEPATCH, is missing
> in the commit.
> 
> Fortunately, ./scripts/checkkconfigsymbols.py detects this and warns:
> 
> DYNAMIC_FTRACE_WITH_ARGS
> Referencing files: kernel/livepatch/Kconfig
> 
> So, define the config DYNAMIC_FTRACE_WITH_ARGS analogously to the already
> existing similar configs, DYNAMIC_FTRACE_WITH_REGS and
> DYNAMIC_FTRACE_WITH_DIRECT_CALLS, in ./kernel/trace/Kconfig to connect the
> chain of configs.
> 
> Fixes: 2860cd8a2353 ("livepatch: Use the default ftrace_ops instead of REGS when ARGS is available")
> Cc: <stable@vger.kernel.org> # 5.10.x

FYI, we don't add # 5.10.x anymore. The Fixes tag above is what
determines where it gets backported to.

> Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
> ---
> 
> Steven, thanks for the quick response; please pick this quick config fix.

I placed it in my queue to go into the 5.14-rc cycle.

Since this affects live kernel patching, can I get a Tested-by from one
of the live kernel patching  folks?

Thanks!

-- Steve

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] tracing: define needed config DYNAMIC_FTRACE_WITH_ARGS
  2021-08-07  1:18 ` Steven Rostedt
@ 2021-08-17  9:28   ` Miroslav Benes
  2021-08-17 13:37     ` Steven Rostedt
  0 siblings, 1 reply; 4+ messages in thread
From: Miroslav Benes @ 2021-08-17  9:28 UTC (permalink / raw)
  To: Steven Rostedt
  Cc: Lukas Bulwahn, Ingo Molnar, Josh Poimboeuf, Jiri Kosina,
	live-patching, Peter Zijlstra, kernel-janitors, linux-kernel,
	stable

> I placed it in my queue to go into the 5.14-rc cycle.
> 
> Since this affects live kernel patching, can I get a Tested-by from one
> of the live kernel patching  folks?

I see it got merged, but anyway it looks good to me. Thanks for fixing it.

Miroslav

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] tracing: define needed config DYNAMIC_FTRACE_WITH_ARGS
  2021-08-17  9:28   ` Miroslav Benes
@ 2021-08-17 13:37     ` Steven Rostedt
  0 siblings, 0 replies; 4+ messages in thread
From: Steven Rostedt @ 2021-08-17 13:37 UTC (permalink / raw)
  To: Miroslav Benes
  Cc: Lukas Bulwahn, Ingo Molnar, Josh Poimboeuf, Jiri Kosina,
	live-patching, Peter Zijlstra, kernel-janitors, linux-kernel,
	stable

On Tue, 17 Aug 2021 11:28:25 +0200 (CEST)
Miroslav Benes <mbenes@suse.cz> wrote:

> > I placed it in my queue to go into the 5.14-rc cycle.
> > 
> > Since this affects live kernel patching, can I get a Tested-by from one
> > of the live kernel patching  folks?  
> 
> I see it got merged, but anyway it looks good to me. Thanks for fixing it.

Ah, I was going to wait for an ack, but it slipped into my push (I was
going to take it out, but forgot to).

Anyway, thanks for looking at it.

-- Steve

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-08-17 13:41 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-06 19:50 [PATCH] tracing: define needed config DYNAMIC_FTRACE_WITH_ARGS Lukas Bulwahn
2021-08-07  1:18 ` Steven Rostedt
2021-08-17  9:28   ` Miroslav Benes
2021-08-17 13:37     ` Steven Rostedt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).