tracing/uprobes: Kill the bogus UPROBE_HANDLER_REMOVE code in uprobe_dispatcher()
I do not know why dd9fa555d7
"tracing/uprobes: Move argument fetching
to uprobe_dispatcher()" added the UPROBE_HANDLER_REMOVE, but it looks
wrong.
OK, perhaps it makes sense to avoid store_trace_args() if the tracee is
nacked by uprobe_perf_filter(). But then we should kill the same code
in uprobe_perf_func() and unify the TRACE/PROFILE filtering (we need to
do this anyway to mix perf/ftrace). Until then this code actually adds
the pessimization because uprobe_perf_filter() will be called twice and
return T in likely case.
Link: http://lkml.kernel.org/p/20140627170143.GA18329@redhat.com
Acked-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
parent
06d0713904
commit
f786106e80
|
@ -1208,12 +1208,6 @@ static int uprobe_dispatcher(struct uprobe_consumer *con, struct pt_regs *regs)
|
||||||
|
|
||||||
current->utask->vaddr = (unsigned long) &udd;
|
current->utask->vaddr = (unsigned long) &udd;
|
||||||
|
|
||||||
#ifdef CONFIG_PERF_EVENTS
|
|
||||||
if ((tu->tp.flags & TP_FLAG_TRACE) == 0 &&
|
|
||||||
!uprobe_perf_filter(&tu->consumer, 0, current->mm))
|
|
||||||
return UPROBE_HANDLER_REMOVE;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (WARN_ON_ONCE(!uprobe_cpu_buffer))
|
if (WARN_ON_ONCE(!uprobe_cpu_buffer))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue