The problem with small dmesg ring buffer like 512k is that only limited number
of task traces will be logged. Sometimes we lose important information only
because of too many duplicated stack traces.
This patch tries to reduce the duplication of task stack trace in the dump
message by hashing the task stack. The hashtable is a 32k pre-allocated buffer
during bootup. Then we hash the task stack with stack_depth 32 for each stack
entry. Each time if we find the identical task trace in the task stack, we dump
only the pid of the task which has the task trace dumped. So it is easy to back
track to the full stack with the pid.
[ 58.469730] kworker/0:0 S 0000000000000000 0 4 2 0x00000000
[ 58.469735] ffff88082fcfde80 0000000000000046 ffff88082e9d8000 ffff88082fcfc010
[ 58.469739] ffff88082fce9860 0000000000011440 ffff88082fcfdfd8 ffff88082fcfdfd8
[ 58.469743] 0000000000011440 0000000000000000 ffff88082fcee180 ffff88082fce9860
[ 58.469747] Call Trace:
[ 58.469751] [<ffffffff8108525a>] worker_thread+0x24b/0x250
[ 58.469754] [<ffffffff8108500f>] ? manage_workers+0x192/0x192
[ 58.469757] [<ffffffff810885bd>] kthread+0x82/0x8a
[ 58.469760] [<ffffffff8141aed4>] kernel_thread_helper+0x4/0x10
[ 58.469763] [<ffffffff8108853b>] ? kthread_worker_fn+0x112/0x112
[ 58.469765] [<ffffffff8141aed0>] ? gs_change+0xb/0xb
[ 58.469768] kworker/u:0 S 0000000000000004 0 5 2 0x00000000
[ 58.469773] ffff88082fcffe80 0000000000000046 ffff880800000000 ffff88082fcfe010
[ 58.469777] ffff88082fcea080 0000000000011440 ffff88082fcfffd8 ffff88082fcfffd8
[ 58.469781] 0000000000011440 0000000000000000 ffff88082fd4e9a0 ffff88082fcea080
[ 58.469785] Call Trace:
[ 58.469786] <Same stack as pid 4>
[ 58.470235] kworker/0:1 S 0000000000000000 0 13 2 0x00000000
[ 58.470255] ffff88082fd3fe80 0000000000000046 ffff880800000000 ffff88082fd3e010
[ 58.470279] ffff88082fcee180 0000000000011440 ffff88082fd3ffd8 ffff88082fd3ffd8
[ 58.470301] 0000000000011440 0000000000000000 ffffffff8180b020 ffff88082fcee180
[ 58.470325] Call Trace:
[ 58.470332] <Same stack as pid 4>
changelog v1:
1. better documentation on the patch description
2. move the spinlock inside the hash lockup, so reducing the holding time.
Things to think about:
1. think about compress register values?
2. think about fallback to not use hash when the lock timeout.
Signed-off-by: Ying Han <yinghan@xxxxxxxxxx>
---
arch/x86/Kconfig | 3 +
arch/x86/include/asm/stacktrace.h | 6 +-
arch/x86/kernel/dumpstack.c | 18 ++++--
arch/x86/kernel/dumpstack_32.c | 7 +-
arch/x86/kernel/dumpstack_64.c | 11 +++-
arch/x86/kernel/pci-gart_64.c | 2 +-
arch/x86/kernel/stacktrace.c | 112 +++++++++++++++++++++++++++++++++++++
drivers/tty/sysrq.c | 2 +-
include/linux/sched.h | 9 +++-
init/main.c | 1 +
kernel/debug/kdb/kdb_bt.c | 8 +-
kernel/rtmutex-debug.c | 2 +-
kernel/sched.c | 22 ++++++-
13 files changed, 178 insertions(+), 25 deletions(-)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 6fdf3ca..3ad9dc9 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -105,6 +105,9 @@ config LOCKDEP_SUPPORT
config STACKTRACE_SUPPORT
def_bool y
+config STACKTRACE
+ def_bool y
+
config HAVE_LATENCYTOP_SUPPORT
def_bool y
diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h
index d7e89c8..263f0e8 100644
--- a/arch/x86/include/asm/stacktrace.h
+++ b/arch/x86/include/asm/stacktrace.h
@@ -86,11 +86,13 @@ stack_frame(struct task_struct *task, struct pt_regs *regs)
extern void
show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs,
- unsigned long *stack, unsigned long bp, char *log_lvl);
+ unsigned long *stack, unsigned long bp, char *log_lvl,
+ int index);
extern void
show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,
- unsigned long *sp, unsigned long bp, char *log_lvl);
+ unsigned long *sp, unsigned long bp, char *log_lvl,
+ int index);
extern unsigned int code_bytes;
diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
index e2a3f06..154a2e8 100644
--- a/arch/x86/kernel/dumpstack.c
+++ b/arch/x86/kernel/dumpstack.c
@@ -175,21 +175,27 @@ static const struct stacktrace_ops print_trace_ops = {
void
show_trace_log_lvl(struct task_struct *task, struct pt_regs *regs,
- unsigned long *stack, unsigned long bp, char *log_lvl)
+ unsigned long *stack, unsigned long bp, char *log_lvl,
+ int index)
{
- printk("%sCall Trace:\n", log_lvl);
- dump_trace(task, regs, stack, bp, &print_trace_ops, log_lvl);
+ if (index) {
+ printk("%sCall Trace:\n", log_lvl);
+ printk("<Same stack as pid %d>\n\n", index);
+ } else {
+ printk("%sCall Trace:\n", log_lvl);
+ dump_trace(task, regs, stack, bp, &print_trace_ops, log_lvl);
+ }
}
void show_trace(struct task_struct *task, struct pt_regs *regs,
unsigned long *stack, unsigned long bp)
{
- show_trace_log_lvl(task, regs, stack, bp, "");
+ show_trace_log_lvl(task, regs, stack, bp, "", 0);
}
-void show_stack(struct task_struct *task, unsigned long *sp)
+void show_stack(struct task_struct *task, unsigned long *sp, int index)
{
- show_stack_log_lvl(task, NULL, sp, 0, "");
+ show_stack_log_lvl(task, NULL, sp, 0, "", index);
}
/*
diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
index 3b97a80..7281573 100644
--- a/arch/x86/kernel/dumpstack_32.c
+++ b/arch/x86/kernel/dumpstack_32.c
@@ -56,7 +56,8 @@ EXPORT_SYMBOL(dump_trace);
void
show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,
- unsigned long *sp, unsigned long bp, char *log_lvl)
+ unsigned long *sp, unsigned long bp, char *log_lvl,
+ int index)
{
unsigned long *stack;
int i;
@@ -78,7 +79,7 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,
touch_nmi_watchdog();
}
printk(KERN_CONT "\n");
- show_trace_log_lvl(task, regs, sp, bp, log_lvl);
+ show_trace_log_lvl(task, regs, sp, bp, log_lvl, index);
}
@@ -103,7 +104,7 @@ void show_registers(struct pt_regs *regs)
u8 *ip;
printk(KERN_EMERG "Stack:\n");
- show_stack_log_lvl(NULL, regs, ®s->sp, 0, KERN_EMERG);
+ show_stack_log_lvl(NULL, regs, ®s->sp, 0, KERN_EMERG, 0);
printk(KERN_EMERG "Code: ");
diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
index e71c98d..9252d02 100644
--- a/arch/x86/kernel/dumpstack_64.c
+++ b/arch/x86/kernel/dumpstack_64.c
@@ -225,7 +225,8 @@ EXPORT_SYMBOL(dump_trace);
void
show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,
- unsigned long *sp, unsigned long bp, char *log_lvl)
+ unsigned long *sp, unsigned long bp, char *log_lvl,
+ int index)
{
unsigned long *irq_stack_end;
unsigned long *irq_stack;
@@ -269,7 +270,11 @@ show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,
preempt_enable();
printk(KERN_CONT "\n");
- show_trace_log_lvl(task, regs, sp, bp, log_lvl);
+ if (index) {
+ printk(KERN_CONT "%sCall Trace:\n", log_lvl);
+ printk(KERN_CONT "<Same stack as pid %d>\n\n", index);
+ } else
+ show_trace_log_lvl(task, regs, sp, bp, log_lvl, index);
}
void show_registers(struct pt_regs *regs)
@@ -298,7 +303,7 @@ void show_registers(struct pt_regs *regs)
printk(KERN_EMERG "Stack:\n");
show_stack_log_lvl(NULL, regs, (unsigned long *)sp,
- 0, KERN_EMERG);
+ 0, KERN_EMERG, 0);
printk(KERN_EMERG "Code: ");
diff --git a/arch/x86/kernel/pci-gart_64.c b/arch/x86/kernel/pci-gart_64.c
index 82ada01..ca1c91f 100644
--- a/arch/x86/kernel/pci-gart_64.c
+++ b/arch/x86/kernel/pci-gart_64.c
@@ -162,7 +162,7 @@ static void dump_leak(void)
return;
dump = 1;
- show_stack(NULL, NULL);
+ show_stack(NULL, NULL, 0);
debug_dma_dump_mappings(NULL);
}
#endif
diff --git a/arch/x86/kernel/stacktrace.c b/arch/x86/kernel/stacktrace.c
index 6515733..ff5d543 100644
--- a/arch/x86/kernel/stacktrace.c
+++ b/arch/x86/kernel/stacktrace.c
@@ -8,6 +8,7 @@
#include <linux/module.h>
#include <linux/uaccess.h>
#include <asm/stacktrace.h>
+#include <linux/jhash.h>
static void save_stack_warning(void *data, char *msg)
{
@@ -94,6 +95,117 @@ void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace)
}
EXPORT_SYMBOL_GPL(save_stack_trace_tsk);
+#define DEDUP_MAX_STACK_DEPTH 32
+#define DEDUP_STACK_HASH 32768
+#define DEDUP_STACK_ENTRY (DEDUP_STACK_HASH/sizeof(struct task_stack) - 1)
+
+struct task_stack {
+ pid_t pid;
+ unsigned long entries[DEDUP_MAX_STACK_DEPTH];
+};
+
+struct task_stack *stack_hash_table;
+static struct task_stack *cur_stack;
+__cacheline_aligned_in_smp DEFINE_SPINLOCK(stack_hash_lock);
+
+void __init stack_trace_hash_init(void)
+{
+ stack_hash_table = vmalloc(DEDUP_STACK_HASH);
+ cur_stack = stack_hash_table + DEDUP_STACK_ENTRY;
+}
+
+void stack_trace_hash_clean(void)
+{
+ memset(stack_hash_table, 0, DEDUP_STACK_HASH);
+}
+
+static inline u32 task_stack_hash(struct task_stack *stack, int len)
+{
+ u32 index = jhash(stack->entries, len * sizeof(unsigned long), 0);
+
+ return index;
+}
+
+static unsigned int stack_trace_lookup(int len)
+{
+ int j;
+ int index = 0;
+ unsigned int ret = 0;
+ struct task_stack *stack;
+
+ index = task_stack_hash(cur_stack, len) % DEDUP_STACK_ENTRY;
+
+ for (j = 0; j < 10; j++) {
+ stack = stack_hash_table + (index + (1 << j)) %
+ DEDUP_STACK_ENTRY;
+ if (stack->entries[0] == 0x0) {
+ memcpy(stack, cur_stack, sizeof(*cur_stack));
+ ret = 0;
+ break;
+ } else {
+ if (memcmp(stack->entries, cur_stack->entries,
+ sizeof(stack->entries)) == 0) {
+ ret = stack->pid;
+ break;
+ }
+ }
+ }
+ memset(cur_stack, 0, sizeof(struct task_stack));
+
+ return ret;
+}
+
+static void save_dup_stack_warning(void *data, char *msg)
+{
+}
+
+static void
+save_dup_stack_warning_symbol(void *data, char *msg, unsigned long symbol)
+{
+}
+
+static int save_dup_stack_stack(void *data, char *name)
+{
+ return 0;
+}
+
+static void save_dup_stack_address(void *data, unsigned long addr, int reliable)
+{
+ unsigned int *len = data;
+
+ if (*len < DEDUP_MAX_STACK_DEPTH)
+ cur_stack->entries[*len] = addr;
+ (*len)++;
+}
+
+static const struct stacktrace_ops save_dup_stack_ops = {
+ .warning = save_dup_stack_warning,
+ .warning_symbol = save_dup_stack_warning_symbol,
+ .stack = save_dup_stack_stack,
+ .address = save_dup_stack_address,
+ .walk_stack = print_context_stack,
+};
+
+unsigned int save_dup_stack_trace(struct task_struct *tsk)
+{
+ unsigned int ret = 0;
+ int len = 0;
+
+ spin_lock(&stack_hash_lock);
+ dump_trace(tsk, NULL, NULL, 0, &save_dup_stack_ops, &len);
+ if (len >= DEDUP_MAX_STACK_DEPTH) {
+ memset(cur_stack, 0, sizeof(struct task_stack));
+ spin_unlock(&stack_hash_lock);
+ return ret;
+ }
+
+ cur_stack->pid = tsk->pid;
+ ret = stack_trace_lookup(len);
+ spin_unlock(&stack_hash_lock);
+
+ return ret;
+}
+
/* Userspace stacktrace - based on kernel/trace/trace_sysprof.c */
struct stack_frame_user {
diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
index 43db715..1165464 100644
--- a/drivers/tty/sysrq.c
+++ b/drivers/tty/sysrq.c
@@ -214,7 +214,7 @@ static void showacpu(void *dummy)
spin_lock_irqsave(&show_lock, flags);
printk(KERN_INFO "CPU%d:\n", smp_processor_id());
- show_stack(NULL, NULL);
+ show_stack(NULL, NULL, 0);
spin_unlock_irqrestore(&show_lock, flags);
}
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 3f7d3f9..40a1676 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -278,6 +278,13 @@ extern int get_nohz_timer_target(void);
static inline void select_nohz_load_balancer(int stop_tick) { }
#endif
+extern void __init stack_trace_hash_init(void);
+extern void stack_trace_hash_clean(void);
+extern unsigned int save_dup_stack_trace(struct task_struct *tsk);
+
+extern spinlock_t stack_hash_lock;
+extern struct task_stack *stack_hash_table;
+
/*
* Only dump TASK_* tasks. (0 for all tasks)
*/
@@ -295,7 +302,7 @@ extern void show_regs(struct pt_regs *);
* task), SP is the stack pointer of the first frame that should be shown in the back
* trace (or NULL if the entire call-chain of the task should be shown).
*/
-extern void show_stack(struct task_struct *task, unsigned long *sp);
+extern void show_stack(struct task_struct *task, unsigned long *sp, int index);
void io_schedule(void);
long io_schedule_timeout(long timeout);
diff --git a/init/main.c b/init/main.c
index 4a9479e..8255ac5 100644
--- a/init/main.c
+++ b/init/main.c
@@ -614,6 +614,7 @@ asmlinkage void __init start_kernel(void)
taskstats_init_early();
delayacct_init();
+ stack_trace_hash_init();
check_bugs();
acpi_early_init(); /* before LAPIC and SMP init */
diff --git a/kernel/debug/kdb/kdb_bt.c b/kernel/debug/kdb/kdb_bt.c
index 2f62fe8..ff8c6ad 100644
--- a/kernel/debug/kdb/kdb_bt.c
+++ b/kernel/debug/kdb/kdb_bt.c
@@ -26,15 +26,15 @@ static void kdb_show_stack(struct task_struct *p, void *addr)
kdb_trap_printk++;
kdb_set_current_task(p);
if (addr) {
- show_stack((struct task_struct *)p, addr);
+ show_stack((struct task_struct *)p, addr, 0);
} else if (kdb_current_regs) {
#ifdef CONFIG_X86
- show_stack(p, &kdb_current_regs->sp);
+ show_stack(p, &kdb_current_regs->sp, 0);
#else
- show_stack(p, NULL);
+ show_stack(p, NULL, 0);
#endif
} else {
- show_stack(p, NULL);
+ show_stack(p, NULL, 0);
}
console_loglevel = old_lvl;
kdb_trap_printk--;
diff --git a/kernel/rtmutex-debug.c b/kernel/rtmutex-debug.c
index 3c7cbc2..e636067 100644
--- a/kernel/rtmutex-debug.c
+++ b/kernel/rtmutex-debug.c
@@ -171,7 +171,7 @@ void debug_rt_mutex_print_deadlock(struct rt_mutex_waiter *waiter)
printk("\n%s/%d's [blocked] stackdump:\n\n",
task->comm, task_pid_nr(task));
- show_stack(task, NULL);
+ show_stack(task, NULL, 0);
printk("\n%s/%d's [current] stackdump:\n\n",
current->comm, task_pid_nr(current));
dump_stack();
diff --git a/kernel/sched.c b/kernel/sched.c
index fd4625f..8716365 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -5727,10 +5727,11 @@ out_unlock:
static const char stat_nam[] = TASK_STATE_TO_CHAR_STR;
-void sched_show_task(struct task_struct *p)
+void _sched_show_task(struct task_struct *p, int dedup)
{
unsigned long free = 0;
unsigned state;
+ int index = 0;
state = p->state ? __ffs(p->state) + 1 : 0;
printk(KERN_INFO "%-15.15s %c", p->comm,
@@ -5753,7 +5754,19 @@ void sched_show_task(struct task_struct *p)
task_pid_nr(p), task_pid_nr(p->real_parent),
(unsigned long)task_thread_info(p)->flags);
- show_stack(p, NULL);
+ if (dedup && stack_hash_table)
+ index = save_dup_stack_trace(p);
+ show_stack(p, NULL, index);
+}
+
+void sched_show_task(struct task_struct *p)
+{
+ _sched_show_task(p, 0);
+}
+
+void sched_show_task_dedup(struct task_struct *p)
+{
+ _sched_show_task(p, 1);
}
void show_state_filter(unsigned long state_filter)
@@ -5768,6 +5781,9 @@ void show_state_filter(unsigned long state_filter)
" task PC stack pid father\n");
#endif
read_lock(&tasklist_lock);
+
+ stack_trace_hash_clean();
+
do_each_thread(g, p) {
/*
* reset the NMI-timeout, listing all files on a slow
@@ -5775,7 +5791,7 @@ void show_state_filter(unsigned long state_filter)
*/
touch_nmi_watchdog();
if (!state_filter || (p->state & state_filter))
- sched_show_task(p);
+ sched_show_task_dedup(p);
} while_each_thread(g, p);
touch_all_softlockup_watchdogs();
--
1.7.3.1
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxxx For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>