Skip to content

Commit

Permalink
tracing: Add skip argument to trace_dump_stack()
Browse files Browse the repository at this point in the history
Altough the trace_dump_stack() already skips three functions in
the call to stack trace, which gets the stack trace to start
at the caller of the function, the caller may want to skip some
more too (as it may have helper functions).

Add a skip argument to the trace_dump_stack() that lets the caller
skip back tracing functions that it doesn't care about.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
  • Loading branch information
Steven Rostedt (Red Hat) committed Mar 15, 2013
1 parent 3cd715d commit c142be8
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion include/linux/kernel.h
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,7 @@ extern int __trace_puts(unsigned long ip, const char *str, int size);
__trace_puts(_THIS_IP_, str, strlen(str)); \
})

extern void trace_dump_stack(void);
extern void trace_dump_stack(int skip);

/*
* The double __builtin_constant_p is because gcc will give us an error
Expand Down
13 changes: 9 additions & 4 deletions kernel/trace/trace.c
Original file line number Diff line number Diff line change
Expand Up @@ -1657,8 +1657,9 @@ void __trace_stack(struct trace_array *tr, unsigned long flags, int skip,

/**
* trace_dump_stack - record a stack back trace in the trace buffer
* @skip: Number of functions to skip (helper handlers)
*/
void trace_dump_stack(void)
void trace_dump_stack(int skip)
{
unsigned long flags;

Expand All @@ -1667,9 +1668,13 @@ void trace_dump_stack(void)

local_save_flags(flags);

/* skipping 3 traces, seems to get us at the caller of this function */
__ftrace_trace_stack(global_trace.trace_buffer.buffer, flags, 3,
preempt_count(), NULL);
/*
* Skip 3 more, seems to get us at the caller of
* this function.
*/
skip += 3;
__ftrace_trace_stack(global_trace.trace_buffer.buffer,
flags, skip, preempt_count(), NULL);
}

static DEFINE_PER_CPU(int, user_stack_count);
Expand Down

0 comments on commit c142be8

Please sign in to comment.