diff -uNr -x '.dep*' -x '.hdep*' -x '*.[oas]' -x '*~' -x '#*' -x '*CVS*' -x '*.orig' -x '*.rej' -x '*.old' -x '.menu*' -x asm -x local.h -x System.map -x autoconf.h -x compile.h -x version.h -x .version -x defkaymap.c -x uni_hash.tbl linux-2.6.13/arch/um/drivers/mconsole_kern.c linux-2.6.13-stack/arch/um/drivers/mconsole_kern.c --- linux-2.6.13/arch/um/drivers/mconsole_kern.c 2005-08-28 19:41:01.000000000 -0400 +++ linux-2.6.13-stack/arch/um/drivers/mconsole_kern.c 2005-08-31 16:24:51.000000000 -0400 @@ -32,6 +32,7 @@ #include "os.h" #include "umid.h" #include "irq_kern.h" +#include "choose-mode.h" static int do_unlink_socket(struct notifier_block *notifier, unsigned long what, void *data) @@ -276,6 +277,7 @@ go - continue the UML after a 'stop' \n\ log - make UML enter into the kernel log\n\ proc - returns the contents of the UML's /proc/\n\ + stack - returns the stack of the specified pid\n\ " void mconsole_help(struct mc_request *req) @@ -479,6 +481,54 @@ } #endif +/* Mconsole stack trace + Added by Allan Graves, Jeff Dike + Dumps a stacks registers to the linux console. + Usage stack . */ +void do_stack(struct mc_request *req) +{ + char *ptr = req->request.data; + int pid_requested=-1; + struct task_struct *from=NULL; + struct task_struct *to=NULL; + + /* Would be nice: + 1) Send showregs output to mconsole. + 2) Add a way to stack dump all pids. + */ + + ptr += strlen("stack"); + while(isspace(*ptr)) ptr++; + + /* Should really check for multiple pids or reject bad args here */ + /* What do the arguments in mconsole_reply mean? */ + if (0==sscanf(ptr, "%d", &pid_requested) || pid_requested==-1) { + mconsole_reply(req, "Please specify a pid", 1, 0); + return; + } + + from=current; + to=find_task_by_pid(pid_requested); + + if((!to) || (pid_requested ==0)) { + mconsole_reply(req, "Couldn't find that pid", 1, 0); + return; + } + to->thread.saved_task=current; + + switch_to(from,to,from); + mconsole_reply(req, "Stack Dumped to console and message log", 0, 0); + +} + +void mconsole_stack(struct mc_request *req) +{ + /* This command doesn't work in TT mode, so let's check and then get out of here */ + CHOOSE_MODE(mconsole_reply(req, "Sorry, this doesn't work in TT mode", 1, 0), + do_stack(req)); +} + + /* Changed by mconsole_setup, which is __setup, and called before SMP is * active. */ diff -uNr -x '.dep*' -x '.hdep*' -x '*.[oas]' -x '*~' -x '#*' -x '*CVS*' -x '*.orig' -x '*.rej' -x '*.old' -x '.menu*' -x asm -x local.h -x System.map -x autoconf.h -x compile.h -x version.h -x .version -x defkaymap.c -x uni_hash.tbl linux-2.6.13/arch/um/drivers/mconsole_user.c linux-2.6.13-stack/arch/um/drivers/mconsole_user.c --- linux-2.6.13/arch/um/drivers/mconsole_user.c 2005-08-28 19:41:01.000000000 -0400 +++ linux-2.6.13-stack/arch/um/drivers/mconsole_user.c 2005-08-31 16:59:51.000000000 -0400 @@ -30,6 +30,7 @@ { "go", mconsole_go, MCONSOLE_INTR }, { "log", mconsole_log, MCONSOLE_INTR }, { "proc", mconsole_proc, MCONSOLE_PROC }, + { "stack", mconsole_stack, MCONSOLE_INTR }, }; /* Initialized in mconsole_init, which is an initcall */ Binary files linux-2.6.13/arch/um/drivers/.mconsole_user.c.swp and linux-2.6.13-stack/arch/um/drivers/.mconsole_user.c.swp differ diff -uNr -x '.dep*' -x '.hdep*' -x '*.[oas]' -x '*~' -x '#*' -x '*CVS*' -x '*.orig' -x '*.rej' -x '*.old' -x '.menu*' -x asm -x local.h -x System.map -x autoconf.h -x compile.h -x version.h -x .version -x defkaymap.c -x uni_hash.tbl linux-2.6.13/arch/um/include/mconsole.h linux-2.6.13-stack/arch/um/include/mconsole.h --- linux-2.6.13/arch/um/include/mconsole.h 2005-08-28 19:41:01.000000000 -0400 +++ linux-2.6.13-stack/arch/um/include/mconsole.h 2005-08-29 17:09:47.000000000 -0400 @@ -81,6 +81,7 @@ extern void mconsole_go(struct mc_request *req); extern void mconsole_log(struct mc_request *req); extern void mconsole_proc(struct mc_request *req); +extern void mconsole_stack(struct mc_request *req); extern int mconsole_get_request(int fd, struct mc_request *req); extern int mconsole_notify(char *sock_name, int type, const void *data, diff -uNr -x '.dep*' -x '.hdep*' -x '*.[oas]' -x '*~' -x '#*' -x '*CVS*' -x '*.orig' -x '*.rej' -x '*.old' -x '.menu*' -x asm -x local.h -x System.map -x autoconf.h -x compile.h -x version.h -x .version -x defkaymap.c -x uni_hash.tbl linux-2.6.13/arch/um/kernel/process_kern.c linux-2.6.13-stack/arch/um/kernel/process_kern.c --- linux-2.6.13/arch/um/kernel/process_kern.c 2005-08-31 18:35:52.000000000 -0400 +++ linux-2.6.13-stack/arch/um/kernel/process_kern.c 2005-08-31 18:46:45.000000000 -0400 @@ -119,8 +120,18 @@ to->thread.prev_sched = from; set_current(to); + do + { + current->thread.saved_task = NULL ; CHOOSE_MODE(switch_to_tt(prev, next), switch_to_skas(prev, next)); + if(current->thread.saved_task) + show_regs(&(current->thread.regs)); + next=(void *)current->thread.saved_task; + prev=(void*)current; + } while(current->thread.saved_task); + + return(current->thread.prev_sched); diff -uNr -x '.dep*' -x '.hdep*' -x '*.[oas]' -x '*~' -x '#*' -x '*CVS*' -x '*.orig' -x '*.rej' -x '*.old' -x '.menu*' -x asm -x local.h -x System.map -x autoconf.h -x compile.h -x version.h -x .version -x defkaymap.c -x uni_hash.tbl linux-2.6.13/include/asm-um/processor-generic.h linux-2.6.13-stack/include/asm-um/processor-generic.h --- linux-2.6.13/include/asm-um/processor-generic.h 2005-08-28 19:41:01.000000000 -0400 +++ linux-2.6.13-stack/include/asm-um/processor-generic.h 2005-08-30 11:26:03.000000000 -0400 @@ -21,6 +21,7 @@ * copy_thread) to mark that we are begin called from userspace (fork / * vfork / clone), and reset to 0 after. It is left to 0 when called * from kernelspace (i.e. kernel_thread() or fork_idle(), as of 2.6.11). */ + struct task_struct *saved_task; int forking; int nsyscalls; struct pt_regs regs;