latencytop s390 support.
PATCH 1/1 latencytop s390 support.
Subject: [PATCH] latencytop s390 support.
From: Heiko Carstens <[email protected]>
Cc Holger Wolf <[email protected]>
Cc Martin Schwidefsky <[email protected]>
Signed-off-by Heiko Carstens <[email protected]>
---
Will go in via the s390 git tree if acceptable.
arch/s390/Kconfig | 3 +++ arch/s390/kernel/stacktrace.c | 31 +++++++++++++++++++++++-------- 2 files changed, 26 insertions(+), 8 deletions(-)
arch/s390/Kconfig +3 -0
@@ -20,6 +20,9 @@ config LOCKDEP_SUPPORT config STACKTRACE_SUPPORT def_bool y +config HAVE_LATENCYTOP_SUPPORT + def_bool y + config RWSEM_GENERIC_SPINLOCK bool
arch/s390/kernel/stacktrace.c +23 -8
@@ -14,7 +14,8 @@static unsigned long save_context_stack (struct stack_trace *trace,unsigned long sp,unsigned long low, -unsigned long high) +unsigned long high, +int savesched) {struct stack_frame *sf;struct pt_regs *regs;
@@ -47,10 +48,12 @@ static unsigned long save_context_stack(return sp; regs = (struct pt_regs *)sp; addr = regs->psw.addr &PSW_ADDR_INSN ; -if (!trace->skip) - trace->entries[trace->nr_entries++] = addr; -else - trace->skip--; +if (savesched || !in_sched_functions (addr)) { +if (!trace->skip) + trace->entries[trace->nr_entries++] = addr; +else + trace->skip--; + }if (trace->nr_entries >= trace->max_entries)return sp; low = sp;
@@ -66,15 +69,27 @@ void save_stack_trace(struct stack_trace orig_sp = sp &PSW_ADDR_INSN ; new_sp =save_context_stack (trace, orig_sp, S390_lowcore.panic_stack -PAGE_SIZE , - S390_lowcore.panic_stack); + S390_lowcore.panic_stack,1 );if (new_sp != orig_sp)return ; new_sp =save_context_stack (trace, new_sp, S390_lowcore.async_stack -ASYNC_SIZE , - S390_lowcore.async_stack); + S390_lowcore.async_stack,1 );if (new_sp != orig_sp)return ;save_context_stack (trace, new_sp, S390_lowcore.thread_info, - S390_lowcore.thread_info +THREAD_SIZE ); + S390_lowcore.thread_info +THREAD_SIZE ,1 ); +} + +void save_stack_trace_tsk (struct task_struct *tsk,struct stack_trace *trace) +{ +unsigned long sp, low, high; + + sp = tsk->thread.ksp &PSW_ADDR_INSN ; + low = (unsigned long )task_stack_page (tsk); + 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 ; }
Quoted 1 line · Heiko Carstens
Subject: [PATCH] latencytop s390 support.
cool :-)
feel free to push the Kconfig cleanup as part of the s390 push. (if i dont manage to beat you at getting that patch to Linus today)
Ingo
Quoted 20 lines · Heiko Carstens
Subject: [PATCH] latencytop s390 support.
From: Heiko Carstens <[email protected]>
Cc Holger Wolf <[email protected]>Cc Martin Schwidefsky <[email protected]>Signed-off-by Heiko Carstens <[email protected]>---
Will go in via the s390 git tree if acceptable.
arch/s390/Kconfig | 3 +++ arch/s390/kernel/stacktrace.c | 31 +++++++++++++++++++++++-------- 2 files changed, 26 insertions(+), 8 deletions(-)Index: linux-2.6/arch/s390/Kconfig
===================================================================
arch/s390/Kconfig config LOCKDEP_SUPPORT · line 25
Quoted 6 lines
arch/s390/Kconfig +3
-0@@ -20,6 +20,9 @@ config LOCKDEP_SUPPORT config STACKTRACE_SUPPORT def_bool y +config HAVE_LATENCYTOP_SUPPORT + def_bool y +
Same comment as for the x86 version.
Use:
config S390
select HAVE_.... Sam