lkml.org 
[lkml]   [2010]   [Aug]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCHv11a 2.6.36-rc2-tip 10/15] 10: tracing: config option to enable both kprobe-tracer and uprobe-tracer.
Selecting CONFIG_PROBE_EVENTS enables both kprobe-based and
uprobes-based dynamic events. However kprobe-tracer or uprobe-tracer
can still be individually selected or disabled.

Signed-off-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Suggested-by: Frederic Weisbecker <fweisbec@gmail.com>
---

Changelog from V10: Fixed few erroneous changes: missing s at eol.
reported by Masami Hiramatsu.

kernel/trace/Kconfig | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index 55ba474..77e04b0 100644
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -351,9 +351,8 @@ config BLK_DEV_IO_TRACE
config KPROBE_EVENT
depends on KPROBES
depends on HAVE_REGS_AND_STACK_ACCESS_API
+ depends on PROBE_EVENTS
bool "Enable kprobes-based dynamic events"
- select TRACING
- select PROBE_EVENTS
default y
help
This allows the user to add tracing events (similar to tracepoints)
@@ -370,10 +369,9 @@ config UPROBE_EVENT
bool "Enable uprobes-based dynamic events"
depends on ARCH_SUPPORTS_UPROBES
depends on MMU
+ depends on PROBE_EVENTS
select UPROBES
- select PROBE_EVENTS
- select TRACING
- default n
+ default y
help
This allows the user to add tracing events on top of userspace dynamic
events (similar to tracepoints) on the fly via the traceevents interface.
@@ -383,7 +381,18 @@ config UPROBE_EVENT
tools on user space applications.

config PROBE_EVENTS
- def_bool n
+ bool "Enable kprobes and uprobe based dynamic events"
+ select TRACING
+ default n
+ help
+ This allows a user to add dynamic tracing events in
+ kernel using kprobe-tracer and in userspace using
+ uprobe-tracer. However users can still selectively
+ disable one of these events.
+
+ For more information on kprobe-tracer and uprobe-tracer
+ please refer help under KPROBE_EVENT and UPROBE_EVENT
+ respectively.

config DYNAMIC_FTRACE
bool "enable/disable ftrace tracepoints dynamically"

\
 
 \ /
  Last update: 2010-08-27 16:17    [W:0.057 / U:21.796 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site