Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48182bd2 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Steven Rostedt
Browse files

tracing/kprobes: Increment probe hit-count even if it is used by perf 

Increment probe hit-count for profiling even if it is used
by perf tool. Same thing has already done in trace_uprobe.

Link: http://lkml.kernel.org/r/20130509054436.30398.21133.stgit@mhiramat-M0-7522



Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Tom Zanussi <tom.zanussi@intel.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Signed-off-by: default avatarMasami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent db02038f

kernel/trace/trace_kprobe.c

+4 −4
Original line number Diff line number Diff line
@@ -733,8 +733,6 @@ static __kprobes void kprobe_trace_func(struct kprobe *kp, struct pt_regs *regs) 
	unsigned long irq_flags;

	struct ftrace_event_call *call = &tp->call;



	tp->nhit++;



	local_save_flags(irq_flags);

	pc = preempt_count();
@@ -767,8 +765,6 @@ static __kprobes void kretprobe_trace_func(struct kretprobe_instance *ri, 
	unsigned long irq_flags;

	struct ftrace_event_call *call = &tp->call;



	tp->nhit++;



	local_save_flags(irq_flags);

	pc = preempt_count();
@@ -1075,6 +1071,8 @@ int kprobe_dispatcher(struct kprobe *kp, struct pt_regs *regs) 
{

	struct trace_probe *tp = container_of(kp, struct trace_probe, rp.kp);



	tp->nhit++;



	if (tp->flags & TP_FLAG_TRACE)

		kprobe_trace_func(kp, regs);

#ifdef CONFIG_PERF_EVENTS
@@ -1089,6 +1087,8 @@ int kretprobe_dispatcher(struct kretprobe_instance *ri, struct pt_regs *regs) 
{

	struct trace_probe *tp = container_of(ri->rp, struct trace_probe, rp);



	tp->nhit++;



	if (tp->flags & TP_FLAG_TRACE)

		kretprobe_trace_func(ri, regs);

#ifdef CONFIG_PERF_EVENTS