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

Commit 6c1a99af authored by Lai Jiangshan's avatar Lai Jiangshan Committed by Ingo Molnar
Browse files

ftrace: fix trace_output 



Impact: fix bug for handling partial line

trace_seq_printf(), seq_print_userip_objs(), ... return
0          -- partial line was written
other(>0)  -- success

duplicate output is also removed in trace_print_raw().

Signed-off-by: default avatarLai Jiangshan <laijs@cn.fujitsu.com>
Signed-off-by: default avatarSteven Rostedt <srostedt@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 55922173

kernel/trace/trace_output.c

+31 −34
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ trace_fn_raw(struct trace_seq *s, struct trace_entry *entry, int flags) 


	trace_assign_type(field, entry);



	if (trace_seq_printf(s, "%x %x\n",

	if (!trace_seq_printf(s, "%x %x\n",

			      field->ip,

			      field->parent_ip))

		return TRACE_TYPE_PARTIAL_LINE;
@@ -497,7 +497,7 @@ trace_ctxwake_print(struct trace_seq *s, struct trace_entry *entry, int flags, 
	T = task_state_char(field->next_state);

	S = task_state_char(field->prev_state);

	comm = trace_find_cmdline(field->next_pid);

	if (trace_seq_printf(s, " %5d:%3d:%c %s [%03d] %5d:%3d:%c %s\n",

	if (!trace_seq_printf(s, " %5d:%3d:%c %s [%03d] %5d:%3d:%c %s\n",

			      field->prev_pid,

			      field->prev_prio,

			      S, delim,
@@ -534,7 +534,7 @@ trace_ctxwake_raw(struct trace_seq *s, struct trace_entry *entry, int flags, 
	if (!S)

		task_state_char(field->prev_state);

	T = task_state_char(field->next_state);

	if (trace_seq_printf(s, "%d %d %c %d %d %d %c\n",

	if (!trace_seq_printf(s, "%d %d %c %d %d %d %c\n",

			      field->prev_pid,

			      field->prev_prio,

			      S,
@@ -639,7 +639,7 @@ trace_special_print(struct trace_seq *s, struct trace_entry *entry, int flags) 


	trace_assign_type(field, entry);



	if (trace_seq_printf(s, "# %ld %ld %ld\n",

	if (!trace_seq_printf(s, "# %ld %ld %ld\n",

			      field->arg1,

			      field->arg2,

			      field->arg3))
@@ -697,13 +697,13 @@ trace_stack_print(struct trace_seq *s, struct trace_entry *entry, int flags) 


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

		if (i) {

			if (trace_seq_puts(s, " <= "))

			if (!trace_seq_puts(s, " <= "))

				goto partial;



			if (seq_print_ip_sym(s, field->caller[i], flags))

			if (!seq_print_ip_sym(s, field->caller[i], flags))

				goto partial;

		}

		if (trace_seq_puts(s, "\n"))

		if (!trace_seq_puts(s, "\n"))

			goto partial;

	}
@@ -731,10 +731,10 @@ trace_user_stack_print(struct trace_seq *s, struct trace_entry *entry, 


	trace_assign_type(field, entry);



	if (seq_print_userip_objs(field, s, flags))

	if (!seq_print_userip_objs(field, s, flags))

		goto partial;



	if (trace_seq_putc(s, '\n'))

	if (!trace_seq_putc(s, '\n'))

		goto partial;



	return 0;
@@ -760,10 +760,10 @@ trace_print_print(struct trace_seq *s, struct trace_entry *entry, int flags) 


	trace_assign_type(field, entry);



	if (seq_print_ip_sym(s, field->ip, flags))

	if (!seq_print_ip_sym(s, field->ip, flags))

		goto partial;



	if (trace_seq_printf(s, ": %s", field->buf))

	if (!trace_seq_printf(s, ": %s", field->buf))

		goto partial;



	return 0;
@@ -779,10 +779,7 @@ trace_print_raw(struct trace_seq *s, struct trace_entry *entry, int flags) 


	trace_assign_type(field, entry);



	if (seq_print_ip_sym(s, field->ip, flags))

		goto partial;



	if (trace_seq_printf(s, "# %lx %s", field->ip, field->buf))

	if (!trace_seq_printf(s, "# %lx %s", field->ip, field->buf))

		goto partial;



	return 0;

kernel/trace/trace_output.h

+2 −2
Original line number Diff line number Diff line
@@ -45,14 +45,14 @@ trace_nop_print(struct trace_seq *s, struct trace_entry *entry, int flags); 
#define SEQ_PUT_FIELD_RET(s, x)				\

do {							\

	if (!trace_seq_putmem(s, &(x), sizeof(x)))	\

		return 0;				\

		return TRACE_TYPE_PARTIAL_LINE;		\

} while (0)



#define SEQ_PUT_HEX_FIELD_RET(s, x)			\

do {							\

	BUILD_BUG_ON(sizeof(x) > MAX_MEMHEX_BYTES);	\

	if (!trace_seq_putmem_hex(s, &(x), sizeof(x)))	\

		return 0;				\

		return TRACE_TYPE_PARTIAL_LINE;		\

} while (0)



#endif