Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

tracing: Fix kconfig warning due to a typo

Commit f3f096cfe ("tracing: Provide trace events interface for
uprobes") throws a warning about unmet dependencies.

The exact warning message is:
warning: (UPROBE_EVENT) selects UPROBES which has unmet direct dependencies (UPROBE_EVENTS && PERF_EVENTS)

This is due to a typo in arch/Kconfig file. Fix similar typos in
the uprobetracer documentation.

Also add sample format of a uprobe event in the uprobetracer
documentation as suggested by Masami Hiramatsu.

Reported-by: Stephen Boyd <sboyd@codeaurora.org>
Reported-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Arnaldo Carvalho de Melo <acme@infradead.org>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Anton Arapov <anton@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20120508111126.21004.38285.sendpatchset@srdronam.in.ibm.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>

authored by

Srikar Dronamraju and committed by
Ingo Molnar
ec83db0f f3f096cf

+21 -3
+20 -2
Documentation/trace/uprobetracer.txt
··· 5 5 Overview 6 6 -------- 7 7 Uprobe based trace events are similar to kprobe based trace events. 8 - To enable this feature, build your kernel with CONFIG_UPROBE_EVENTS=y. 8 + To enable this feature, build your kernel with CONFIG_UPROBE_EVENT=y. 9 9 10 10 Similar to the kprobe-event tracer, this doesn't need to be activated via 11 11 current_tracer. Instead of that, add probe points via ··· 68 68 uprobe_events file. 69 69 70 70 # cat uprobe_events 71 - p:uprobes/p_zsh_0x46420 /bin/zsh:0x0000000000046420 71 + p:uprobes/p_zsh_0x46420 /bin/zsh:0x00046420 arg1=%ip arg2=%ax 72 + 73 + The format of events can be seen by viewing the file events/uprobes/p_zsh_0x46420/format 74 + 75 + # cat events/uprobes/p_zsh_0x46420/format 76 + name: p_zsh_0x46420 77 + ID: 922 78 + format: 79 + field:unsigned short common_type; offset:0; size:2; signed:0; 80 + field:unsigned char common_flags; offset:2; size:1; signed:0; 81 + field:unsigned char common_preempt_count; offset:3; size:1; signed:0; 82 + field:int common_pid; offset:4; size:4; signed:1; 83 + field:int common_padding; offset:8; size:4; signed:1; 84 + 85 + field:unsigned long __probe_ip; offset:12; size:4; signed:0; 86 + field:u32 arg1; offset:16; size:4; signed:0; 87 + field:u32 arg2; offset:20; size:4; signed:0; 88 + 89 + print fmt: "(%lx) arg1=%lx arg2=%lx", REC->__probe_ip, REC->arg1, REC->arg2 72 90 73 91 Right after definition, each event is disabled by default. For tracing these 74 92 events, you need to enable it by:
+1 -1
arch/Kconfig
··· 78 78 79 79 config UPROBES 80 80 bool "Transparent user-space probes (EXPERIMENTAL)" 81 - depends on UPROBE_EVENTS && PERF_EVENTS 81 + depends on UPROBE_EVENT && PERF_EVENTS 82 82 default n 83 83 help 84 84 Uprobes is the user-space counterpart to kprobes: they