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

Commit 43fe9891 authored by Namhyung Kim's avatar Namhyung Kim Committed by Steven Rostedt
Browse files

tracing/uprobes: Support mix of ftrace and perf 

It seems there's no reason to prevent mixed used of ftrace and perf
for a single uprobe event.  At least the kprobes already support it.

Link: http://lkml.kernel.org/r/1389946120-19610-6-git-send-email-namhyung@kernel.org



Reviewed-by: default avatarMasami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: zhangwei(Jovi) <jovi.zhangwei@huawei.com>
Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent ca3b1620

kernel/trace/trace_uprobe.c

+1 −8
Original line number Diff line number Diff line
@@ -882,9 +882,6 @@ probe_event_enable(struct trace_uprobe *tu, struct ftrace_event_file *file, 
	int ret;



	if (file) {

		if (tu->tp.flags & TP_FLAG_PROFILE)

			return -EINTR;



		link = kmalloc(sizeof(*link), GFP_KERNEL);

		if (!link)

			return -ENOMEM;
@@ -893,12 +890,8 @@ probe_event_enable(struct trace_uprobe *tu, struct ftrace_event_file *file, 
		list_add_tail_rcu(&link->list, &tu->tp.files);



		tu->tp.flags |= TP_FLAG_TRACE;

	} else {

		if (tu->tp.flags & TP_FLAG_TRACE)

			return -EINTR;



	} else

		tu->tp.flags |= TP_FLAG_PROFILE;

	}



	ret = uprobe_buffer_enable();

	if (ret < 0)