stacktrace: add reliability information to saved stack traces
Subsystems (8)
PATCH 1/1 stacktrace: add reliability information to saved stack traces
Hi again,
This patch is different (probably better?), but touches all users and all architectures implementing stacktrace saving. If you want it, it's here... :-)
Kind regards,
Vegard Nossum
From 98d928d337dca6326773d43da90a268e5ff0c098 Mon Sep 17 00:00:00 2001
From: Vegard Nossum <[email protected]>
Date: Sat, 23 Feb 2008 13:42:56 +0100
Subject: [PATCH] stacktrace: add reliability information to saved stack traces
This will make print_stack_trace() behave more like dump_stack() by saving "unreliable" trace entries and displaying them as such by prepending a question mark in front of the function name.
NOTE: This patch has been compile- and run-tested on x86 platform (which is the only platform supporting unreliable trace entries). No testing has been carried out for the other platforms. End of note.
--- arch/arm/kernel/stacktrace.c | 2 +- arch/avr32/kernel/stacktrace.c | 2 +- arch/mips/kernel/stacktrace.c | 8 ++++-- arch/s390/kernel/stacktrace.c | 11 +++++---- arch/sh/kernel/stacktrace.c | 6 +++- arch/sparc64/kernel/stacktrace.c | 2 +- arch/x86/kernel/stacktrace.c | 27 +++++++++++---------- include/linux/latencytop.h | 3 ++ include/linux/stacktrace.h | 46 +++++++++++++++++++++++++++++++++++-- kernel/latencytop.c | 6 +--- kernel/lockdep.c | 17 +++++++------ kernel/stacktrace.c | 12 +++++---- lib/fault-inject.c | 7 +---- 13 files changed, 98 insertions(+), 51 deletions(-)
arch/arm/kernel/stacktrace.c +1 -1
@@ -49,7 +49,7 @@ static int save_trace(struct stackframe *frame, void *d)return 0 ; } - trace->entries[trace->nr_entries++] = frame->lr; + trace->entries.addr[trace->nr_entries++] = frame->lr;return trace->nr_entries >= trace->max_entries; }
arch/avr32/kernel/stacktrace.c +1 -1
@@ -38,7 +38,7 @@ void save_stack_trace(struct stack_trace *trace)if (skip) { skip--; }else { - trace->entries[trace->nr_entries++] = frame->lr; + trace->entries.addr[trace->nr_entries++] = frame->lr;if (trace->nr_entries >= trace->max_entries)break ; }
arch/mips/kernel/stacktrace.c +5 -3
@@ -23,8 +23,10 @@ static void save_raw_context_stack(struct stack_trace *trace,if (__kernel_text_address (addr)) {if (trace->skip >0 ) trace->skip--; -else - trace->entries[trace->nr_entries++] = addr; +else { + trace->entries.addr[trace->nr_entries++] + = addr; + }if (trace->nr_entries >= trace->max_entries)break ; }
@@ -50,7 +52,7 @@ static void save_context_stack(struct stack_trace *trace, struct pt_regs *regs)if (trace->skip >0 ) trace->skip--;else - trace->entries[trace->nr_entries++] = pc; + trace->entries.addr[trace->nr_entries++] = pc;if (trace->nr_entries >= trace->max_entries)break ; pc =unwind_stack (current, &sp, pc, &ra);
arch/s390/kernel/stacktrace.c +6 -5
@@ -28,9 +28,10 @@ static unsigned long save_context_stack(struct stack_trace *trace, sf = (struct stack_frame *)sp;while (1 ) { addr = sf->gprs[8 ] &PSW_ADDR_INSN ; -if (!trace->skip) - trace->entries[trace->nr_entries++] = addr; -else +if (!trace->skip) { + trace->entries.addr[trace->nr_entries++] + = addr; + }else trace->skip--;if (trace->nr_entries >= trace->max_entries)return sp;
@@ -50,7 +51,7 @@ static unsigned long save_context_stack(struct stack_trace *trace, addr = regs->psw.addr &PSW_ADDR_INSN ;if (savesched || !in_sched_functions (addr)) {if (!trace->skip) - trace->entries[trace->nr_entries++] = addr; + trace->entries.addr[trace->nr_entries++] = addr;else trace->skip--; }
@@ -91,5 +92,5 @@ void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace) high = (unsigned long )task_pt_regs (tsk);save_context_stack (trace, sp, low, high,0 );if (trace->nr_entries < trace->max_entries) - trace->entries[trace->nr_entries++] =ULONG_MAX ; + trace->entries.addr[trace->nr_entries++] =ULONG_MAX ; }
arch/sh/kernel/stacktrace.c +4 -2
@@ -27,8 +27,10 @@ void save_stack_trace(struct stack_trace *trace)if (__kernel_text_address (addr)) {if (trace->skip >0 ) trace->skip--; -else - trace->entries[trace->nr_entries++] = addr; +else { + trace->entries.addr[trace->nr_entries++] + = addr; + }if (trace->nr_entries >= trace->max_entries)break ; }
arch/sparc64/kernel/stacktrace.c +1 -1
@@ -28,7 +28,7 @@ void save_stack_trace(struct stack_trace *trace)if (trace->skip >0 ) trace->skip--;else - trace->entries[trace->nr_entries++] = rw->ins[7 ]; + trace->entries.addr[trace->nr_entries++] = rw->ins[7 ]; fp = rw->ins[6 ] +STACK_BIAS ; }while (trace->nr_entries < trace->max_entries);
arch/x86/kernel/stacktrace.c +14 -13
@@ -25,26 +25,27 @@ static int save_stack_stack(void *data, char *name)static void save_stack_address (void *data,unsigned long addr,int reliable) {struct stack_trace *trace = data; +if (trace->skip >0 ) { trace->skip--;return ; } -if (trace->nr_entries < trace->max_entries) - trace->entries[trace->nr_entries++] = addr; + +if (trace->nr_entries == trace->max_entries) +return ; + + trace->entries.addr[trace->nr_entries] = addr; + trace->entries.reliable[trace->nr_entries] = reliable; + trace->nr_entries++; }static void save_stack_address_nosched (void *data,unsigned long addr,int reliable) { -struct stack_trace *trace = (struct stack_trace *)data;if (in_sched_functions (addr))return ; -if (trace->skip >0 ) { - trace->skip--; -return ; - } -if (trace->nr_entries < trace->max_entries) - trace->entries[trace->nr_entries++] = addr; + +save_stack_address (data, addr, reliable); }static const struct stacktrace_ops save_stack_ops = {
@@ -66,14 +67,14 @@ static const struct stacktrace_ops save_stack_ops_nosched = {*/ void save_stack_trace (struct stack_trace *trace) { + trace->has_reliable = true;dump_trace (current,NULL ,NULL ,0 , &save_stack_ops, trace); -if (trace->nr_entries < trace->max_entries) - trace->entries[trace->nr_entries++] =ULONG_MAX ; +save_stack_address (trace,ULONG_MAX ,1 ); }void save_stack_trace_tsk (struct task_struct *tsk,struct stack_trace *trace) { + trace->has_reliable = true;dump_trace (tsk,NULL ,NULL ,0 , &save_stack_ops_nosched, trace); -if (trace->nr_entries < trace->max_entries) - trace->entries[trace->nr_entries++] =ULONG_MAX ; +save_stack_address (trace,ULONG_MAX ,1 ); }
include/linux/latencytop.h +3 -0
@@ -9,6 +9,8 @@#ifndef _INCLUDE_GUARD_LATENCYTOP_H_#define _INCLUDE_GUARD_LATENCYTOP_H_ +#include <linux/types.h> +#ifdef CONFIG_LATENCYTOP #define LT_SAVECOUNT 32
@@ -16,6 +18,7 @@struct latency_record {unsigned long backtrace[LT_BACKTRACEDEPTH ]; +bool backtrace_reliable[LT_BACKTRACEDEPTH ];unsigned int count;unsigned long time;unsigned long max;
include/linux/stacktrace.h +43 -3
62 lines not on this page · raw message
kernel/latencytop.c +2 -4
@@ -102,10 +102,8 @@ static inline void store_stacktrace(struct task_struct *tsk, struct latency_reco {struct stack_trace trace; -memset (&trace,0 ,sizeof (trace)); - trace.max_entries =LT_BACKTRACEDEPTH ; - trace.entries = &lat->backtrace[0 ]; - trace.skip =0 ; +init_stack_trace (&trace,LT_BACKTRACEDEPTH ,0 , + lat->backtrace, lat->backtrace_reliable);save_stack_trace_tsk (tsk, &trace); }
kernel/lockdep.c +9 -8
@@ -332,16 +332,15 @@ static int verbose(struct lock_class *class)* addresses. Protected by the graph_lock. */ unsigned long nr_stack_trace_entries; -static unsigned long stack_trace[MAX_STACK_TRACE_ENTRIES ]; +static unsigned long stack_trace_addr[MAX_STACK_TRACE_ENTRIES ]; +static bool stack_trace_reliable[MAX_STACK_TRACE_ENTRIES ];static int save_trace (struct stack_trace *trace) { - trace->nr_entries =0 ; - trace->max_entries =MAX_STACK_TRACE_ENTRIES - nr_stack_trace_entries; - trace->entries = stack_trace + nr_stack_trace_entries; - - trace->skip =3 ; - +init_stack_trace (trace, +MAX_STACK_TRACE_ENTRIES - nr_stack_trace_entries,3 , + stack_trace_addr + nr_stack_trace_entries, + stack_trace_reliable + nr_stack_trace_entries);save_stack_trace (trace); trace->max_entries = trace->nr_entries;
@@ -376,9 +375,11 @@ unsigned int max_recursion_depth;*/ static int lockdep_init_error;static unsigned long lockdep_init_trace_data[20 ]; +static bool lockdep_init_trace_reliable[20 ];static struct stack_trace lockdep_init_trace = { .max_entries =ARRAY_SIZE (lockdep_init_trace_data), - .entries = lockdep_init_trace_data, + .entries =DEFINE_STACK_TRACE_ENTRIES (lockdep_init_trace_data, + lockdep_init_trace_reliable), };/*
kernel/stacktrace.c +7 -5
@@ -11,14 +11,16 @@void print_stack_trace (struct stack_trace *trace,int spaces) { -int i, j; +struct stack_trace_entries *e; +int i; + e = &trace->entries;for (i =0 ; i < trace->nr_entries; i++) { -unsigned long ip = trace->entries[i]; +printk ("%*.s [<%p>] " , spaces,"" , (void *) e->addr[i]); -for (j =0 ; j < spaces +1 ; j++) -printk (" " ); -print_ip_sym (ip); +if (trace->has_reliable) +printk ("%s " , !e->reliable[i] ?"?" :" " ); +print_symbol ("%s\n" , e->addr[i]); } }
lib/fault-inject.c +2 -5
@@ -62,17 +62,14 @@ static bool fail_stacktrace(struct fault_attr *attr)struct stack_trace trace;int depth = attr->stacktrace_depth;unsigned long entries[MAX_STACK_TRACE_DEPTH ]; +bool entries_reliable[MAX_STACK_TRACE_DEPTH ];int n;bool found = (attr->require_start ==0 && attr->require_end ==ULONG_MAX );if (depth ==0 )return found; - trace.nr_entries =0 ; - trace.entries = entries; - trace.max_entries = depth; - trace.skip =1 ; - +init_stack_trace (&trace, depth,1 , entries, entries_reliable);save_stack_trace (&trace);for (n =0 ; n < trace.nr_entries; n++) { if (attr->reject_start <= entries[n] &&
Signature · 1 line
1.5.3.8