tracing: config updates
Steven Rostedt
maintainerIngo,
Please pull the latest tip/tracing/ftrace tree, which can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
tip/tracing/ftrace
Steven Rostedt (3):
tracing: change branch profiling to a choice selection
tracing: create menuconfig for tracing infrastructure
tracing: rename EVENT_TRACER config to ENABLE_EVENT_TRACING
----
kernel/trace/Kconfig | 54 +++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 45 insertions(+), 9 deletions(-)
Steven Rostedt
maintainerPATCH 1/3 tracing: change branch profiling to a choice selection
From: Steven Rostedt <[email protected]>
This patch makes the branch profiling into a choice selection:
None - no branch profiling likely/unlikely - only profile likely/unlikely branches all - profile all branches
The all profiler will also enable the likely/unlikely branches.
This does not change the way the profiler works or the dependencies between the profilers.
What this patch does, is keep the branch profiling from being selected by an allyesconfig make. The branch profiler is very intrusive and it is known to break various architecture builds when selected as an allyesconfig.
[ Impact: prevent branch profiler from being selected in allyesconfig ]
--- kernel/trace/Kconfig | 39 +++++++++++++++++++++++++++++++++------ 1 files changed, 33 insertions(+), 6 deletions(-)
kernel/trace/Kconfig +33 -6
@@ -212,8 +212,36 @@ config BOOT_TRACER to enable this on bootup. config TRACE_BRANCH_PROFILING - bool "Trace likely/unlikely profiler" + bool select TRACING + +choice + prompt "Branch Profiling" + default BRANCH_PROFILE_NONE + help + The branch profiling is a software profiler. It will add hooks + into the C conditionals to test which path a branch takes. + + The likely/unlikely profiler only looks at the conditions that + are annotated with a likely or unlikely macro. + + The "all branch" profiler will profile every if statement in the + kernel. This profiler will also enable the likely/unlikely + profiler as well. + + Either of the above profilers add a bit of overhead to the system. + If unsure choose "No branch profiling". + +config BRANCH_PROFILE_NONE + bool "No branch profiling" + help + No branch profiling. Branch profiling adds a bit of overhead. + Only enable it if you want to analyse the branching behavior. + Otherwise keep it disabled. + +config PROFILE_ANNOTATED_BRANCHES + bool "Trace likely/unlikely profiler" + select TRACE_BRANCH_PROFILING help This tracer profiles all the the likely and unlikely macros in the kernel. It will display the results in:
@@ -223,11 +251,9 @@ config TRACE_BRANCH_PROFILING Note: this will add a significant overhead, only turn this on if you need to profile the system's use of these macros. - Say N if unsure. - config PROFILE_ALL_BRANCHES bool "Profile all if conditionals" - depends on TRACE_BRANCH_PROFILING + select TRACE_BRANCH_PROFILING help This tracer profiles all branch conditions. Every if () taken in the kernel is recorded whether it hit or miss.
@@ -235,11 +261,12 @@ config PROFILE_ALL_BRANCHES /debugfs/tracing/profile_branch + This option also enables the likely/unlikely profiler. + This configuration, when enabled, will impose a great overhead on the system. This should only be enabled when the system is to be analyzed - - Say N if unsure. +endchoice config TRACING_BRANCHES bool
Signature · 3 lines
1.6.2.1 --
Steven Rostedt
maintainerPATCH 2/3 tracing: create menuconfig for tracing infrastructure
In reply to Steven RostedtFrom: Steven Rostedt <[email protected]>
During testing we often use randconfig to test various kernels. The current configuration set up does not give an easy way to disable all tracing with a single config. The case where randconfig would test all tracing disabled is very unlikely.
This patch adds a config option to enable or disable all tracing. It is hooked into the tracing menu just like other submenus are done.
[ Impact: allow randconfig to easily produce all traces disabled ]
--- kernel/trace/Kconfig | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-)
kernel/trace/Kconfig +7 -2
@@ -77,7 +77,12 @@ config TRACING_SUPPORT if TRACING_SUPPORT -menu "Tracers" +menuconfig FTRACE + bool "Tracers" + help + Enable the kernel tracing infrastructure. + +if FTRACE config FUNCTION_TRACER bool "Kernel Function Tracer"
@@ -462,7 +467,7 @@ config MMIOTRACE_TEST Say N, unless you absolutely know what you are doing. -endmenu +endif # FTRACE endif # TRACING_SUPPORT
Signature · 3 lines
1.6.2.1 --
Steven Rostedt
maintainerPATCH 3/3 tracing: rename EVENT_TRACER config to ENABLE_EVENT_TRACING
In reply to Steven RostedtFrom: Steven Rostedt <[email protected]>
Currently we have two configs: EVENT_TRACING and EVENT_TRACER. All tracers enable EVENT_TRACING. The EVENT_TRACER is only a convenience to enable the EVENT_TRACING when no other tracers are enabled.
The names EVENT_TRACER and EVENT_TRACING are too similar and confusing. This patch renames EVENT_TRACER to ENABLE_EVENT_TRACING to be more appropriate to what it actually does, as well as add a comment in the help menu to explain the option's purpose.
--- kernel/trace/Kconfig | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
kernel/trace/Kconfig +5 -1
@@ -183,7 +183,7 @@ config CONTEXT_SWITCH_TRACER This tracer gets called from the context switch and records all switching of tasks. -config EVENT_TRACER +config ENABLE_EVENT_TRACING bool "Trace various events in the kernel" select TRACING help
@@ -191,6 +191,10 @@ config EVENT_TRACER allowing the user to pick and choose which trace point they want to trace. + Note, all tracers enable event tracing. This option is + only a convenience to enable event tracing when no other + tracers are selected. + config FTRACE_SYSCALLS bool "Trace syscalls" depends on HAVE_FTRACE_SYSCALLS
Signature · 3 lines
1.6.2.1 --
Quoted 8 lines · Steven Rostedt
Ingo,
Please pull the latest tip/tracing/ftrace tree, which can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
tip/tracing/ftrace
Quoted 8 lines
Steven Rostedt (3):
tracing: change branch profiling to a choice selection
tracing: create menuconfig for tracing infrastructure
tracing: renameEVENT_TRACERconfig toENABLE_EVENT_TRACING----
kernel/trace/Kconfig | 54 +++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 45 insertions(+), 9 deletions(-)
Pulled, thanks Steve!
Ingo