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

tracing/uprobes: Move argument fetching to uprobe_dispatcher() 

A single uprobe event might serve different users like ftrace and
perf.  And this is especially important for upcoming multi buffer
support.  But in this case it'll fetch (same) data from userspace
multiple times.  So move it to the beginning of the dispatcher
function and reuse it for each users.

Link: http://lkml.kernel.org/r/1389946120-19610-3-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 a43b9704

kernel/trace/trace_uprobe.c

+56 −37
Original line number Original line Diff line number Diff line
@@ -759,30 +759,25 @@ static void uprobe_buffer_put(struct uprobe_cpu_buffer *ucb) 
}

}





static void __uprobe_trace_func(struct trace_uprobe *tu,

static void __uprobe_trace_func(struct trace_uprobe *tu,

				unsigned long func, struct pt_regs *regs)

				unsigned long func, struct pt_regs *regs,

				struct uprobe_cpu_buffer *ucb, int dsize)

{

{

	struct uprobe_trace_entry_head *entry;

	struct uprobe_trace_entry_head *entry;

	struct ring_buffer_event *event;

	struct ring_buffer_event *event;

	struct ring_buffer *buffer;

	struct ring_buffer *buffer;

	struct uprobe_cpu_buffer *ucb;

	void *data;

	void *data;

	int size, dsize, esize;

	int size, esize;

	struct ftrace_event_call *call = &tu->tp.call;

	struct ftrace_event_call *call = &tu->tp.call;





	dsize = __get_data_size(&tu->tp, regs);

	if (WARN_ON_ONCE(tu->tp.size + dsize > PAGE_SIZE))

	esize = SIZEOF_TRACE_ENTRY(is_ret_probe(tu));



	if (WARN_ON_ONCE(!uprobe_cpu_buffer || tu->tp.size + dsize > PAGE_SIZE))

		return;

		return;





	ucb = uprobe_buffer_get();

	esize = SIZEOF_TRACE_ENTRY(is_ret_probe(tu));

	store_trace_args(esize, &tu->tp, regs, ucb->buf, dsize);



	size = esize + tu->tp.size + dsize;

	size = esize + tu->tp.size + dsize;

	event = trace_current_buffer_lock_reserve(&buffer, call->event.type,

	event = trace_current_buffer_lock_reserve(&buffer, call->event.type,

						  size, 0, 0);

						  size, 0, 0);

	if (!event)

	if (!event)

		goto out;

		return;





	entry = ring_buffer_event_data(event);

	entry = ring_buffer_event_data(event);

	if (is_ret_probe(tu)) {

	if (is_ret_probe(tu)) {
@@ -798,23 +793,22 @@ static void __uprobe_trace_func(struct trace_uprobe *tu, 




	if (!call_filter_check_discard(call, entry, buffer, event))

	if (!call_filter_check_discard(call, entry, buffer, event))

		trace_buffer_unlock_commit(buffer, event, 0, 0);

		trace_buffer_unlock_commit(buffer, event, 0, 0);



out:

	uprobe_buffer_put(ucb);

}

}





/* uprobe handler */

/* uprobe handler */

static int uprobe_trace_func(struct trace_uprobe *tu, struct pt_regs *regs)

static int uprobe_trace_func(struct trace_uprobe *tu, struct pt_regs *regs,

			     struct uprobe_cpu_buffer *ucb, int dsize)

{

{

	if (!is_ret_probe(tu))

	if (!is_ret_probe(tu))

		__uprobe_trace_func(tu, 0, regs);

		__uprobe_trace_func(tu, 0, regs, ucb, dsize);

	return 0;

	return 0;

}

}





static void uretprobe_trace_func(struct trace_uprobe *tu, unsigned long func,

static void uretprobe_trace_func(struct trace_uprobe *tu, unsigned long func,

				struct pt_regs *regs)

				 struct pt_regs *regs,

				 struct uprobe_cpu_buffer *ucb, int dsize)

{

{

	__uprobe_trace_func(tu, func, regs);

	__uprobe_trace_func(tu, func, regs, ucb, dsize);

}

}





/* Event entry printers */

/* Event entry printers */
@@ -1015,30 +1009,23 @@ static bool uprobe_perf_filter(struct uprobe_consumer *uc, 
}

}





static void __uprobe_perf_func(struct trace_uprobe *tu,

static void __uprobe_perf_func(struct trace_uprobe *tu,

				unsigned long func, struct pt_regs *regs)

			       unsigned long func, struct pt_regs *regs,

			       struct uprobe_cpu_buffer *ucb, int dsize)

{

{

	struct ftrace_event_call *call = &tu->tp.call;

	struct ftrace_event_call *call = &tu->tp.call;

	struct uprobe_trace_entry_head *entry;

	struct uprobe_trace_entry_head *entry;

	struct hlist_head *head;

	struct hlist_head *head;

	struct uprobe_cpu_buffer *ucb;

	void *data;

	void *data;

	int size, dsize, esize;

	int size, esize;

	int rctx;

	int rctx;





	dsize = __get_data_size(&tu->tp, regs);

	esize = SIZEOF_TRACE_ENTRY(is_ret_probe(tu));

	esize = SIZEOF_TRACE_ENTRY(is_ret_probe(tu));





	if (WARN_ON_ONCE(!uprobe_cpu_buffer))

		return;



	size = esize + tu->tp.size + dsize;

	size = esize + tu->tp.size + dsize;

	size = ALIGN(size + sizeof(u32), sizeof(u64)) - sizeof(u32);

	size = ALIGN(size + sizeof(u32), sizeof(u64)) - sizeof(u32);

	if (WARN_ONCE(size > PERF_MAX_TRACE_SIZE, "profile buffer not large enough"))

	if (WARN_ONCE(size > PERF_MAX_TRACE_SIZE, "profile buffer not large enough"))

		return;

		return;





	ucb = uprobe_buffer_get();

	store_trace_args(esize, &tu->tp, regs, ucb->buf, dsize);



	preempt_disable();

	preempt_disable();

	head = this_cpu_ptr(call->perf_events);

	head = this_cpu_ptr(call->perf_events);

	if (hlist_empty(head))

	if (hlist_empty(head))
@@ -1068,24 +1055,25 @@ static void __uprobe_perf_func(struct trace_uprobe *tu, 
	perf_trace_buf_submit(entry, size, rctx, 0, 1, regs, head, NULL);

	perf_trace_buf_submit(entry, size, rctx, 0, 1, regs, head, NULL);

 out:

 out:

	preempt_enable();

	preempt_enable();

	uprobe_buffer_put(ucb);

}

}





/* uprobe profile handler */

/* uprobe profile handler */

static int uprobe_perf_func(struct trace_uprobe *tu, struct pt_regs *regs)

static int uprobe_perf_func(struct trace_uprobe *tu, struct pt_regs *regs,

			    struct uprobe_cpu_buffer *ucb, int dsize)

{

{

	if (!uprobe_perf_filter(&tu->consumer, 0, current->mm))

	if (!uprobe_perf_filter(&tu->consumer, 0, current->mm))

		return UPROBE_HANDLER_REMOVE;

		return UPROBE_HANDLER_REMOVE;





	if (!is_ret_probe(tu))

	if (!is_ret_probe(tu))

		__uprobe_perf_func(tu, 0, regs);

		__uprobe_perf_func(tu, 0, regs, ucb, dsize);

	return 0;

	return 0;

}

}





static void uretprobe_perf_func(struct trace_uprobe *tu, unsigned long func,

static void uretprobe_perf_func(struct trace_uprobe *tu, unsigned long func,

				struct pt_regs *regs)

				struct pt_regs *regs,

				struct uprobe_cpu_buffer *ucb, int dsize)

{

{

	__uprobe_perf_func(tu, func, regs);

	__uprobe_perf_func(tu, func, regs, ucb, dsize);

}

}

#endif	/* CONFIG_PERF_EVENTS */

#endif	/* CONFIG_PERF_EVENTS */
@@ -1127,8 +1115,11 @@ static int uprobe_dispatcher(struct uprobe_consumer *con, struct pt_regs *regs) 
{

{

	struct trace_uprobe *tu;

	struct trace_uprobe *tu;

	struct uprobe_dispatch_data udd;

	struct uprobe_dispatch_data udd;

	struct uprobe_cpu_buffer *ucb;

	int dsize, esize;

	int ret = 0;

	int ret = 0;







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

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

	tu->nhit++;

	tu->nhit++;
@@ -1137,13 +1128,29 @@ 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))

		return 0;



	dsize = __get_data_size(&tu->tp, regs);

	esize = SIZEOF_TRACE_ENTRY(is_ret_probe(tu));



	ucb = uprobe_buffer_get();

	store_trace_args(esize, &tu->tp, regs, ucb->buf, dsize);



	if (tu->tp.flags & TP_FLAG_TRACE)

	if (tu->tp.flags & TP_FLAG_TRACE)

		ret |= uprobe_trace_func(tu, regs);

		ret |= uprobe_trace_func(tu, regs, ucb, dsize);





#ifdef CONFIG_PERF_EVENTS

#ifdef CONFIG_PERF_EVENTS

	if (tu->tp.flags & TP_FLAG_PROFILE)

	if (tu->tp.flags & TP_FLAG_PROFILE)

		ret |= uprobe_perf_func(tu, regs);

		ret |= uprobe_perf_func(tu, regs, ucb, dsize);

#endif

#endif

	uprobe_buffer_put(ucb);

	return ret;

	return ret;

}

}
@@ -1152,6 +1159,8 @@ static int uretprobe_dispatcher(struct uprobe_consumer *con, 
{

{

	struct trace_uprobe *tu;

	struct trace_uprobe *tu;

	struct uprobe_dispatch_data udd;

	struct uprobe_dispatch_data udd;

	struct uprobe_cpu_buffer *ucb;

	int dsize, esize;





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

	tu = container_of(con, struct trace_uprobe, consumer);
@@ -1160,13 +1169,23 @@ static int uretprobe_dispatcher(struct uprobe_consumer *con, 




	current->utask->vaddr = (unsigned long) &udd;

	current->utask->vaddr = (unsigned long) &udd;





	if (WARN_ON_ONCE(!uprobe_cpu_buffer))

		return 0;



	dsize = __get_data_size(&tu->tp, regs);

	esize = SIZEOF_TRACE_ENTRY(is_ret_probe(tu));



	ucb = uprobe_buffer_get();

	store_trace_args(esize, &tu->tp, regs, ucb->buf, dsize);



	if (tu->tp.flags & TP_FLAG_TRACE)

	if (tu->tp.flags & TP_FLAG_TRACE)

		uretprobe_trace_func(tu, func, regs);

		uretprobe_trace_func(tu, func, regs, ucb, dsize);





#ifdef CONFIG_PERF_EVENTS

#ifdef CONFIG_PERF_EVENTS

	if (tu->tp.flags & TP_FLAG_PROFILE)

	if (tu->tp.flags & TP_FLAG_PROFILE)

		uretprobe_perf_func(tu, func, regs);

		uretprobe_perf_func(tu, func, regs, ucb, dsize);

#endif

#endif

	uprobe_buffer_put(ucb);

	return 0;

	return 0;

}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE