The patch titled lock validator: s390 stacktrace interface has been added to the -mm tree. Its filename is lock-validator-s390-stacktrace-interface.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: lock validator: s390 stacktrace interface From: Heiko Carstens <heiko.carstens@xxxxxxxxxx> stacktrace interface for s390 as needed by lock validator. Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx> Acked-by: Ingo Molnar <mingo@xxxxxxx> Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx> Cc: Arjan van de Ven <arjan@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- arch/s390/kernel/Makefile | 2 arch/s390/kernel/stacktrace.c | 90 ++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 1 deletion(-) diff -puN arch/s390/kernel/Makefile~lock-validator-s390-stacktrace-interface arch/s390/kernel/Makefile --- 25/arch/s390/kernel/Makefile~lock-validator-s390-stacktrace-interface Mon Jun 19 15:06:01 2006 +++ 25-akpm/arch/s390/kernel/Makefile Mon Jun 19 15:06:01 2006 @@ -4,7 +4,7 @@ EXTRA_AFLAGS := -traditional -obj-y := bitmap.o traps.o time.o process.o \ +obj-y := bitmap.o traps.o time.o process.o stacktrace.o \ setup.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o \ semaphore.o s390_ext.o debug.o profile.o irq.o reipl_diag.o diff -puN /dev/null arch/s390/kernel/stacktrace.c --- /dev/null Thu Apr 11 07:25:15 2002 +++ 25-akpm/arch/s390/kernel/stacktrace.c Mon Jun 19 15:06:01 2006 @@ -0,0 +1,90 @@ +/* + * arch/s390/kernel/stacktrace.c + * + * Stack trace management functions + * + * Copyright (C) IBM Corp. 2006 + * Author(s): Heiko Carstens <heiko.carstens@xxxxxxxxxx> + */ + +#include <linux/sched.h> +#include <linux/stacktrace.h> +#include <linux/kallsyms.h> + +static inline unsigned long save_context_stack(struct stack_trace *trace, + unsigned int *skip, + unsigned long sp, + unsigned long low, + unsigned long high) +{ + struct stack_frame *sf; + struct pt_regs *regs; + unsigned long addr; + + while(1) { + sp &= PSW_ADDR_INSN; + if (sp < low || sp > high) + return sp; + sf = (struct stack_frame *)sp; + while(1) { + addr = sf->gprs[8] & PSW_ADDR_INSN; + if (!(*skip)) + trace->entries[trace->nr_entries++] = addr; + else + (*skip)--; + if (trace->nr_entries >= trace->max_entries) + return sp; + low = sp; + sp = sf->back_chain & PSW_ADDR_INSN; + if (!sp) + break; + if (sp <= low || sp > high - sizeof(*sf)) + return sp; + sf = (struct stack_frame *)sp; + } + /* Zero backchain detected, check for interrupt frame. */ + sp = (unsigned long)(sf + 1); + if (sp <= low || sp > high - sizeof(*regs)) + return sp; + regs = (struct pt_regs *)sp; + addr = regs->psw.addr & PSW_ADDR_INSN; + if (!(*skip)) + trace->entries[trace->nr_entries++] = addr; + else + (*skip)--; + if (trace->nr_entries >= trace->max_entries) + return sp; + low = sp; + sp = regs->gprs[15]; + } +} + +void save_stack_trace(struct stack_trace *trace, + struct task_struct *task, int all_contexts, + unsigned int skip) +{ + register unsigned long sp asm ("15"); + unsigned long orig_sp; + + sp &= PSW_ADDR_INSN; + orig_sp = sp; + + sp = save_context_stack(trace, &skip, sp, + S390_lowcore.panic_stack - PAGE_SIZE, + S390_lowcore.panic_stack); + if ((sp != orig_sp) && !all_contexts) + return; + sp = save_context_stack(trace, &skip, sp, + S390_lowcore.async_stack - ASYNC_SIZE, + S390_lowcore.async_stack); + if ((sp != orig_sp) && !all_contexts) + return; + if (task) + save_context_stack(trace, &skip, sp, + (unsigned long) task_stack_page(task), + (unsigned long) task_stack_page(task) + THREAD_SIZE); + else + save_context_stack(trace, &skip, sp, S390_lowcore.thread_info, + S390_lowcore.thread_info + THREAD_SIZE); + return; +} _ Patches currently in -mm which might be from heiko.carstens@xxxxxxxxxx are git-klibc.patch s390-move-var-declarations-behind-ifdef.patch adjust-handle_irr_event-return-type.patch add-__iowrite64_copy-s390-fix.patch kthread-convert-s390machc-from-kernel_thread.patch lock-validator-s390-stacktrace-interface.patch lock-validator-s390-config_frame_pointer-support.patch lock-validator-s390-rwsem-semaphore-changes.patch lock-validator-early_init_irq_lock_type--console_init.patch lock-validator-s390-irqtrace-support.patch lock-validator-__local_bh_enable-_local_bh_enable.patch lock-validator-s390-use-raw_spinlock-in-mcck-handler.patch lock-validator-add-s390-to-supported-options.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html