Commit 8fd0fbbe authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Steven Rostedt (VMware)
Browse files

perf/ftrace: Revert ("perf/ftrace: Fix double traces of perf on ftrace:function") 

Revert commit:

  75e83876 ("perf/ftrace: Fix double traces of perf on ftrace:function")

The reason I instantly stumbled on that patch is that it only addresses the
ftrace situation and doesn't mention the other _5_ places that use this
interface. It doesn't explain why those don't have the problem and if not, why
their solution doesn't work for ftrace.

It doesn't, but this is just putting more duct tape on.

Link: http://lkml.kernel.org/r/20171011080224.200565770@infradead.org



Cc: Zhou Chengming <zhouchengming1@huawei.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent 13641247

include/linux/perf_event.h

+1 −1
Original line number Diff line number Diff line
@@ -1184,7 +1184,7 @@ extern void perf_event_init(void); 
extern void perf_tp_event(u16 event_type, u64 count, void *record,

			  int entry_size, struct pt_regs *regs,

			  struct hlist_head *head, int rctx,

			  struct task_struct *task, struct perf_event *event);

			  struct task_struct *task);

extern void perf_bp_event(struct perf_event *event, void *data);



#ifndef perf_misc_flags

include/linux/trace_events.h

+2 −2
Original line number Diff line number Diff line
@@ -507,9 +507,9 @@ void perf_trace_run_bpf_submit(void *raw_data, int size, int rctx, 
static inline void

perf_trace_buf_submit(void *raw_data, int size, int rctx, u16 type,

		       u64 count, struct pt_regs *regs, void *head,

		       struct task_struct *task, struct perf_event *event)

		       struct task_struct *task)

{

	perf_tp_event(type, count, raw_data, size, regs, head, rctx, task, event);

	perf_tp_event(type, count, raw_data, size, regs, head, rctx, task);

}

#endif

kernel/events/core.c

+4 −9
Original line number Diff line number Diff line
@@ -7954,15 +7954,16 @@ void perf_trace_run_bpf_submit(void *raw_data, int size, int rctx, 
		}

	}

	perf_tp_event(call->event.type, count, raw_data, size, regs, head,

		      rctx, task, NULL);

		      rctx, task);

}

EXPORT_SYMBOL_GPL(perf_trace_run_bpf_submit);



void perf_tp_event(u16 event_type, u64 count, void *record, int entry_size,

		   struct pt_regs *regs, struct hlist_head *head, int rctx,

		   struct task_struct *task, struct perf_event *event)

		   struct task_struct *task)

{

	struct perf_sample_data data;

	struct perf_event *event;



	struct perf_raw_record raw = {

		.frag = {
@@ -7976,16 +7977,10 @@ void perf_tp_event(u16 event_type, u64 count, void *record, int entry_size, 


	perf_trace_buf_update(record, event_type);



	/* Use the given event instead of the hlist */

	if (event) {

		if (perf_tp_event_match(event, &data, regs))

			perf_swevent_event(event, count, &data, regs);

	} else {

	hlist_for_each_entry_rcu(event, head, hlist_entry) {

		if (perf_tp_event_match(event, &data, regs))

			perf_swevent_event(event, count, &data, regs);

	}

	}



	/*

	 * If we got specified a target task, also iterate its context and

kernel/trace/trace_event_perf.c

+1 −3
Original line number Diff line number Diff line
@@ -306,7 +306,6 @@ static void 
perf_ftrace_function_call(unsigned long ip, unsigned long parent_ip,

			  struct ftrace_ops *ops, struct pt_regs *pt_regs)

{

	struct perf_event *event;

	struct ftrace_entry *entry;

	struct hlist_head *head;

	struct pt_regs regs;
@@ -330,9 +329,8 @@ perf_ftrace_function_call(unsigned long ip, unsigned long parent_ip, 


	entry->ip = ip;

	entry->parent_ip = parent_ip;

	event = container_of(ops, struct perf_event, ftrace_ops);

	perf_trace_buf_submit(entry, ENTRY_SIZE, rctx, TRACE_FN,

			      1, &regs, head, NULL, event);

			      1, &regs, head, NULL);



#undef ENTRY_SIZE

}

kernel/trace/trace_kprobe.c

+2 −2
Original line number Diff line number Diff line
@@ -1200,7 +1200,7 @@ kprobe_perf_func(struct trace_kprobe *tk, struct pt_regs *regs) 
	memset(&entry[1], 0, dsize);

	store_trace_args(sizeof(*entry), &tk->tp, regs, (u8 *)&entry[1], dsize);

	perf_trace_buf_submit(entry, size, rctx, call->event.type, 1, regs,

			      head, NULL, NULL);

			      head, NULL);

}

NOKPROBE_SYMBOL(kprobe_perf_func);
@@ -1236,7 +1236,7 @@ kretprobe_perf_func(struct trace_kprobe *tk, struct kretprobe_instance *ri, 
	entry->ret_ip = (unsigned long)ri->ret_addr;

	store_trace_args(sizeof(*entry), &tk->tp, regs, (u8 *)&entry[1], dsize);

	perf_trace_buf_submit(entry, size, rctx, call->event.type, 1, regs,

			      head, NULL, NULL);

			      head, NULL);

}

NOKPROBE_SYMBOL(kretprobe_perf_func);

#endif	/* CONFIG_PERF_EVENTS */

CRA Git | Maintained and supported by SUSTech CRA and CCSE