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

Commit 1b47aefd authored by Oleg Nesterov's avatar Oleg Nesterov
Browse files

uprobes/perf: Always increment trace_uprobe->nhit 



Move tu->nhit++ from uprobe_trace_func() to uprobe_dispatcher().

->nhit counts how many time we hit the breakpoint inserted by this
uprobe, we do not want to loose this info if uprobe was enabled by
sys_perf_event_open().

Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
Acked-by: default avatarSrikar Dronamraju <srikar@linux.vnet.ibm.com>
parent a932b738

kernel/trace/trace_uprobe.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -476,8 +476,6 @@ static void uprobe_trace_func(struct trace_uprobe *tu, struct pt_regs *regs) 
	unsigned long irq_flags;

	unsigned long irq_flags;

	struct ftrace_event_call *call = &tu->call;

	struct ftrace_event_call *call = &tu->call;





	tu->nhit++;



	local_save_flags(irq_flags);

	local_save_flags(irq_flags);

	pc = preempt_count();

	pc = preempt_count();
@@ -701,6 +699,7 @@ static int uprobe_dispatcher(struct uprobe_consumer *con, struct pt_regs *regs) 
	struct trace_uprobe *tu;

	struct trace_uprobe *tu;





	tu = container_of(con, struct trace_uprobe, consumer);

	tu = container_of(con, struct trace_uprobe, consumer);

	tu->nhit++;





	if (tu->flags & TP_FLAG_TRACE)

	if (tu->flags & TP_FLAG_TRACE)

		uprobe_trace_func(tu, regs);

		uprobe_trace_func(tu, regs);