Commit 196b6389 authored by Song Chen's avatar Song Chen Committed by Masami Hiramatsu (Google)
Browse files

kernel/trace: Introduce trace_probe_print_args and use it in *probes 

print_probe_args is currently inplemented in trace_probe_tmpl.h and
included by *probes, as a result, each probe has an identical copy.

This patch will move it to trace_probe.c as an new API, each probe
calls it to print their args in trace file.

Link: https://lore.kernel.org/all/1672382000-18304-1-git-send-email-chensong_2000@189.cn/



Signed-off-by: default avatarSong Chen <chensong_2000@189.cn>
Acked-by: default avatarMasami Hiramatsu (Google) <mhiramat@kernel.org>
Signed-off-by: default avatarMasami Hiramatsu (Google) <mhiramat@kernel.org>
parent c96abaec

kernel/trace/trace_eprobe.c

+1 −1
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ print_eprobe_event(struct trace_iterator *iter, int flags, 


	trace_seq_putc(s, ')');



	if (print_probe_args(s, tp->args, tp->nr_args,

	if (trace_probe_print_args(s, tp->args, tp->nr_args,

			     (u8 *)&field[1], field) < 0)

		goto out;

kernel/trace/trace_kprobe.c

+2 −2
Original line number Diff line number Diff line
@@ -1424,7 +1424,7 @@ print_kprobe_event(struct trace_iterator *iter, int flags, 


	trace_seq_putc(s, ')');



	if (print_probe_args(s, tp->args, tp->nr_args,

	if (trace_probe_print_args(s, tp->args, tp->nr_args,

			     (u8 *)&field[1], field) < 0)

		goto out;
@@ -1459,7 +1459,7 @@ print_kretprobe_event(struct trace_iterator *iter, int flags, 


	trace_seq_putc(s, ')');



	if (print_probe_args(s, tp->args, tp->nr_args,

	if (trace_probe_print_args(s, tp->args, tp->nr_args,

			     (u8 *)&field[1], field) < 0)

		goto out;

kernel/trace/trace_probe.c

+27 −0
Original line number Diff line number Diff line
@@ -1239,3 +1239,30 @@ int trace_probe_create(const char *raw_command, int (*createfn)(int, const char 


	return ret;

}



int trace_probe_print_args(struct trace_seq *s, struct probe_arg *args, int nr_args,

		 u8 *data, void *field)

{

	void *p;

	int i, j;



	for (i = 0; i < nr_args; i++) {

		struct probe_arg *a = args + i;



		trace_seq_printf(s, " %s=", a->name);

		if (likely(!a->count)) {

			if (!a->type->print(s, data + a->offset, field))

				return -ENOMEM;

			continue;

		}

		trace_seq_putc(s, '{');

		p = data + a->offset;

		for (j = 0; j < a->count; j++) {

			if (!a->type->print(s, p, field))

				return -ENOMEM;

			trace_seq_putc(s, j == a->count - 1 ? '}' : ',');

			p += a->type->size;

		}

	}

	return 0;

}

kernel/trace/trace_probe.h

+2 −0
Original line number Diff line number Diff line
@@ -349,6 +349,8 @@ int trace_probe_compare_arg_type(struct trace_probe *a, struct trace_probe *b); 
bool trace_probe_match_command_args(struct trace_probe *tp,

				    int argc, const char **argv);

int trace_probe_create(const char *raw_command, int (*createfn)(int, const char **));

int trace_probe_print_args(struct trace_seq *s, struct probe_arg *args, int nr_args,

		 u8 *data, void *field);



#define trace_probe_for_each_link(pos, tp)	\

	list_for_each_entry(pos, &(tp)->event->files, list)

kernel/trace/trace_probe_tmpl.h

+0 −28
Original line number Diff line number Diff line
@@ -253,31 +253,3 @@ store_trace_args(void *data, struct trace_probe *tp, void *rec, 
		}

	}

}
 


static inline int

print_probe_args(struct trace_seq *s, struct probe_arg *args, int nr_args,

		 u8 *data, void *field)

{

	void *p;

	int i, j;



	for (i = 0; i < nr_args; i++) {

		struct probe_arg *a = args + i;



		trace_seq_printf(s, " %s=", a->name);

		if (likely(!a->count)) {

			if (!a->type->print(s, data + a->offset, field))

				return -ENOMEM;

			continue;

		}

		trace_seq_putc(s, '{');

		p = data + a->offset;

		for (j = 0; j < a->count; j++) {

			if (!a->type->print(s, p, field))

				return -ENOMEM;

			trace_seq_putc(s, j == a->count - 1 ? '}' : ',');

			p += a->type->size;

		}

	}

	return 0;

}