Skip to content

Commit 0ce4808

Browse files
bulwahnSasha Levin
authored and
Sasha Levin
committed
tracing: define needed config DYNAMIC_FTRACE_WITH_ARGS
[ Upstream commit 12f9951 ] Commit 2860cd8 ("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. Link: https://lore.kernel.org/kernel-janitors/CAKXUXMwT2zS9fgyQHKUUiqo8ynZBdx2UEUu1WnV_q0OCmknqhw@mail.gmail.com/ Link: https://lkml.kernel.org/r/[email protected] Cc: Josh Poimboeuf <[email protected]> Cc: Jiri Kosina <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Miroslav Benes <[email protected]> Cc: [email protected] Fixes: 2860cd8 ("livepatch: Use the default ftrace_ops instead of REGS when ARGS is available") Signed-off-by: Lukas Bulwahn <[email protected]> Signed-off-by: Steven Rostedt (VMware) <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 2152ee7 commit 0ce4808

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

kernel/trace/Kconfig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,11 @@ config DYNAMIC_FTRACE_WITH_DIRECT_CALLS
219219
depends on DYNAMIC_FTRACE_WITH_REGS
220220
depends on HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS
221221

222+
config DYNAMIC_FTRACE_WITH_ARGS
223+
def_bool y
224+
depends on DYNAMIC_FTRACE
225+
depends on HAVE_DYNAMIC_FTRACE_WITH_ARGS
226+
222227
config FUNCTION_PROFILER
223228
bool "Kernel function profiler"
224229
depends on FUNCTION_TRACER

0 commit comments

Comments
 (0)