Commit 8d7c6a96 authored by Török Edwin's avatar Török Edwin Committed by Ingo Molnar
Browse files

tracing/stack-tracer: fix style issues 



Impact: cleanup

Signed-off-by: default avatarTörök Edwin <edwintorok@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent b54d3de9

arch/x86/kernel/stacktrace.c

+29 −22
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ EXPORT_SYMBOL_GPL(save_stack_trace_tsk); 


struct stack_frame {

	const void __user	*next_fp;

	unsigned long		return_address;

	unsigned long		ret_addr;

};



static int copy_stack_frame(const void __user *fp, struct stack_frame *frame)
@@ -108,12 +108,8 @@ static int copy_stack_frame(const void __user *fp, struct stack_frame *frame) 
	return ret;

}



void save_stack_trace_user(struct stack_trace *trace)

static inline void __save_stack_trace_user(struct stack_trace *trace)

{

	/*

	 * Trace user stack if we are not a kernel thread

	 */

	if (current->mm) {

	const struct pt_regs *regs = task_pt_regs(current);

	const void __user *fp = (const void __user *)regs->bp;
@@ -122,20 +118,31 @@ void save_stack_trace_user(struct stack_trace *trace) 


	while (trace->nr_entries < trace->max_entries) {

		struct stack_frame frame;



		frame.next_fp = NULL;

			frame.return_address = 0;

		frame.ret_addr = 0;

		if (!copy_stack_frame(fp, &frame))

			break;

		if ((unsigned long)fp < regs->sp)

			break;

			if (frame.return_address)

		if (frame.ret_addr) {

			trace->entries[trace->nr_entries++] =

					frame.return_address;

				frame.ret_addr;

		}

		if (fp == frame.next_fp)

			break;

		fp = frame.next_fp;

	}

}



void save_stack_trace_user(struct stack_trace *trace)

{

	/*

	 * Trace user stack if we are not a kernel thread

	 */

	if (current->mm) {

		__save_stack_trace_user(trace);

	}

	if (trace->nr_entries < trace->max_entries)

		trace->entries[trace->nr_entries++] = ULONG_MAX;

}

kernel/trace/trace.c

+3 −4
Original line number Diff line number Diff line
@@ -948,9 +948,9 @@ static void ftrace_trace_userstack(struct trace_array *tr, 
		   struct trace_array_cpu *data,

		   unsigned long flags, int pc)

{

	struct ring_buffer_event *event;

	struct userstack_entry *entry;

	struct stack_trace trace;

	struct ring_buffer_event *event;

	unsigned long irq_flags;



	if (!(trace_flags & TRACE_ITER_USERSTACKTRACE))
@@ -1471,8 +1471,7 @@ static inline int seq_print_user_ip(struct trace_seq *s, struct mm_struct *mm, 
	if (file) {

		ret = trace_seq_path(s, &file->f_path);

		if (ret)

			ret = trace_seq_printf(s, "[+0x%lx]",

					ip - vmstart);

			ret = trace_seq_printf(s, "[+0x%lx]", ip - vmstart);

	}

	if (ret && ((sym_flags & TRACE_ITER_SYM_ADDR) || !file))

		ret = trace_seq_printf(s, " <" IP_FMT ">", ip);
@@ -1485,7 +1484,7 @@ seq_print_userip_objs(const struct userstack_entry *entry, struct trace_seq *s, 
{

	struct mm_struct *mm = NULL;

	int ret = 1;

	unsigned i;

	unsigned int i;



	if (trace_flags & TRACE_ITER_SYM_USEROBJ) {

		struct task_struct *task;

include/linux/stacktrace.h

+1 −1

File changed.

Contains only whitespace changes.