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

Commit eeb07b06 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Steven Rostedt (VMware)
Browse files

tracing: probeevent: Cleanup argument field definition 

Cleanup event argument definition code in one place for
maintenancability.

Link: http://lkml.kernel.org/r/152465862529.26224.9068605421476018902.stgit@devbox



Signed-off-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent 56de7630

kernel/trace/trace_kprobe.c

+4 −28
Original line number Diff line number Diff line
@@ -1192,49 +1192,25 @@ print_kretprobe_event(struct trace_iterator *iter, int flags, 


static int kprobe_event_define_fields(struct trace_event_call *event_call)

{

	int ret, i;

	int ret;

	struct kprobe_trace_entry_head field;

	struct trace_kprobe *tk = (struct trace_kprobe *)event_call->data;



	DEFINE_FIELD(unsigned long, ip, FIELD_STRING_IP, 0);

	/* Set argument names as fields */

	for (i = 0; i < tk->tp.nr_args; i++) {

		struct probe_arg *parg = &tk->tp.args[i];



		ret = trace_define_field(event_call, parg->type->fmttype,

					 parg->name,

					 sizeof(field) + parg->offset,

					 parg->type->size,

					 parg->type->is_signed,

					 FILTER_OTHER);

		if (ret)

			return ret;

	}

	return 0;

	return traceprobe_define_arg_fields(event_call, sizeof(field), &tk->tp);

}



static int kretprobe_event_define_fields(struct trace_event_call *event_call)

{

	int ret, i;

	int ret;

	struct kretprobe_trace_entry_head field;

	struct trace_kprobe *tk = (struct trace_kprobe *)event_call->data;



	DEFINE_FIELD(unsigned long, func, FIELD_STRING_FUNC, 0);

	DEFINE_FIELD(unsigned long, ret_ip, FIELD_STRING_RETIP, 0);

	/* Set argument names as fields */

	for (i = 0; i < tk->tp.nr_args; i++) {

		struct probe_arg *parg = &tk->tp.args[i];



		ret = trace_define_field(event_call, parg->type->fmttype,

					 parg->name,

					 sizeof(field) + parg->offset,

					 parg->type->size,

					 parg->type->is_signed,

					 FILTER_OTHER);

		if (ret)

			return ret;

	}

	return 0;

	return traceprobe_define_arg_fields(event_call, sizeof(field), &tk->tp);

}



#ifdef CONFIG_PERF_EVENTS

kernel/trace/trace_probe.c

+21 −0
Original line number Diff line number Diff line
@@ -668,3 +668,24 @@ int set_print_fmt(struct trace_probe *tp, bool is_return) 


	return 0;

}



int traceprobe_define_arg_fields(struct trace_event_call *event_call,

				 size_t offset, struct trace_probe *tp)

{

	int ret, i;



	/* Set argument names as fields */

	for (i = 0; i < tp->nr_args; i++) {

		struct probe_arg *parg = &tp->args[i];



		ret = trace_define_field(event_call, parg->type->fmttype,

					 parg->name,

					 offset + parg->offset,

					 parg->type->size,

					 parg->type->is_signed,

					 FILTER_OTHER);

		if (ret)

			return ret;

	}

	return 0;

}

kernel/trace/trace_probe.h

+2 −0
Original line number Diff line number Diff line
@@ -429,3 +429,5 @@ create_local_trace_uprobe(char *name, unsigned long offs, 
			  unsigned long ref_ctr_offset, bool is_return);

extern void destroy_local_trace_uprobe(struct trace_event_call *event_call);

#endif

extern int traceprobe_define_arg_fields(struct trace_event_call *event_call,

					size_t offset, struct trace_probe *tp);

kernel/trace/trace_uprobe.c

+2 −13
Original line number Diff line number Diff line
@@ -1018,7 +1018,7 @@ probe_event_disable(struct trace_uprobe *tu, struct trace_event_file *file) 


static int uprobe_event_define_fields(struct trace_event_call *event_call)

{

	int ret, i, size;

	int ret, size;

	struct uprobe_trace_entry_head field;

	struct trace_uprobe *tu = event_call->data;
@@ -1030,19 +1030,8 @@ static int uprobe_event_define_fields(struct trace_event_call *event_call) 
		DEFINE_FIELD(unsigned long, vaddr[0], FIELD_STRING_IP, 0);

		size = SIZEOF_TRACE_ENTRY(false);

	}

	/* Set argument names as fields */

	for (i = 0; i < tu->tp.nr_args; i++) {

		struct probe_arg *parg = &tu->tp.args[i];



		ret = trace_define_field(event_call, parg->type->fmttype,

					 parg->name, size + parg->offset,

					 parg->type->size, parg->type->is_signed,

					 FILTER_OTHER);



		if (ret)

			return ret;

	}

	return 0;

	return traceprobe_define_arg_fields(event_call, size, &tu->tp);

}



#ifdef CONFIG_PERF_EVENTS