kgdb regression fixes for 2.6.35-rc5
Jason Wessel
maintainerLinus, please pull the for_linus branch for 2.6.35-rc5.
git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb.git for_linus
The following patch set covers cleaning up problems that have been found since the merge of kdb to the 2.6.35-rc1 kernel.
Thanks,
Jason.
---
Jason Wessel (4):
repair gdbstub to match the gdbserial protocol specification Fix merge regression from external kdb to upstream kdb debug_core,kdb: fix kgdb_connected bit set in the wrong place sysrq,kdb: Use __handle_sysrq() for kdb's sysrq function
Martin Hicks (1):
kdb: break out of kdb_ll() when command is terminated
drivers/char/sysrq.c | 2 +- include/linux/sysrq.h | 1 + kernel/debug/debug_core.c | 2 +- kernel/debug/gdbstub.c | 9 +++------ kernel/debug/kdb/kdb_main.c | 7 +++++-- 5 files changed, 11 insertions(+), 10 deletions(-)
Jason Wessel
maintainerPATCH 1/5 kdb: break out of kdb_ll() when command is terminated
From: Martin Hicks <[email protected]>
Without this patch the "ll" linked-list traversal command won't terminate when you hit q/Q.
--- kernel/debug/kdb/kdb_main.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
kernel/debug/kdb/kdb_main.c +3 -0
@@ -2291,6 +2291,9 @@ static int kdb_ll(int argc, const char **argv)while (va) {char buf[80 ]; +if (KDB_FLAG (CMD_INTERRUPT )) +return 0 ; +sprintf (buf,"%s " kdb_machreg_fmt"\n" , command, va); diag =kdb_parse (buf);if (diag)
Signature · 1 line
1.6.3.3
Jason Wessel
maintainerPATCH 2/5 repair gdbstub to match the gdbserial protocol specification
The gdbserial protocol handler should return an empty packet instead of an error string when ever it responds to a command it does not implement.
The problem cases come from a debugger client sending qTBuffer, qTStatus, qSearch, qSupported.
The incorrect response from the gdbstub leads the debugger clients to
not function correctly. Recent versions of gdb will not detach correctly as a result of this behavior.
--- kernel/debug/gdbstub.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-)
kernel/debug/gdbstub.c +3 -6
@@ -621,10 +621,8 @@ static void gdb_cmd_query(struct kgdb_state *ks)switch (remcom_in_buffer[1 ]) {case 's' :case 'f' : -if (memcmp (remcom_in_buffer +2 ,"ThreadInfo" ,10 )) { -error_packet (remcom_out_buffer, -EINVAL ); +if (memcmp (remcom_in_buffer +2 ,"ThreadInfo" ,10 ))break ; - } i =0 ; remcom_out_buffer[0 ] ='m' ;
@@ -665,10 +663,9 @@ static void gdb_cmd_query(struct kgdb_state *ks)pack_threadid (remcom_out_buffer +2 , thref);break ;case 'T' : -if (memcmp (remcom_in_buffer +1 ,"ThreadExtraInfo," ,16 )) { -error_packet (remcom_out_buffer, -EINVAL ); +if (memcmp (remcom_in_buffer +1 ,"ThreadExtraInfo," ,16 ))break ; - } + ks->threadid =0 ; ptr = remcom_in_buffer +17 ;kgdb_hex2long (&ptr, &ks->threadid);
Signature · 1 line
1.6.3.3
Jason Wessel
maintainerPATCH 3/5 Fix merge regression from external kdb to upstream kdb
In the process of merging kdb to the mainline, the kdb lsmod command stopped printing the base load address of kernel modules. This is needed for using kdb in conjunction with external tools such as gdb.
Simply restore the functionality by adding a kdb_printf for the base load address of the kernel modules.
--- kernel/debug/kdb/kdb_main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
kernel/debug/kdb/kdb_main.c +1 -0
@@ -1883,6 +1883,7 @@ static int kdb_lsmod(int argc, const char **argv)kdb_printf (" (Loading)" ); else kdb_printf(" (Live)"); +kdb_printf (" 0x%p" , mod->module_core);#ifdef CONFIG_MODULE_UNLOAD {
Signature · 1 line
1.6.3.3
Jason Wessel
maintainerPATCH 4/5 debug_core,kdb: fix kgdb_connected bit set in the wrong place
Immediately following an exit from the kdb shell the kgdb_connected variable should be set to zero, unless there are breakpoints planted. If the kgdb_connected variable is not zeroed out with kdb, it is impossible to turn off kdb.
This patch is merely a work around for now, the real fix will check for the breakpoints.
--- kernel/debug/debug_core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/debug/debug_core.c +1 -1
@@ -605,13 +605,13 @@ cpu_master_loop:if (dbg_kdb_mode) { kgdb_connected =1 ; error =kdb_stub (ks); + kgdb_connected =0 ; }else { error =gdb_serial_stub (ks); }if (error ==DBG_PASS_EVENT ) { dbg_kdb_mode = !dbg_kdb_mode; - kgdb_connected =0 ; }else if (error ==DBG_SWITCH_CPU_EVENT ) {dbg_cpu_switch (cpu, dbg_switch_cpu); goto cpu_loop;
Signature · 1 line
1.6.3.3
Jason Wessel
maintainerPATCH 5/5 sysrq,kdb: Use __handle_sysrq() for kdb's sysrq function
The kdb code should not toggle the sysrq state in case an end user wants to try and resume the normal kernel execution.
--- drivers/char/sysrq.c | 2 +- include/linux/sysrq.h | 1 + kernel/debug/kdb/kdb_main.c | 3 +-- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/char/sysrq.c +1 -1
@@ -493,7 +493,7 @@ static void __sysrq_put_key_op(int key, struct sysrq_key_op *op_p) sysrq_key_table[i] = op_p; } -static void __handle_sysrq (int key,struct tty_struct *tty,int check_mask) +void __handle_sysrq (int key,struct tty_struct *tty,int check_mask) {struct sysrq_key_op *op_p;int orig_log_level;
include/linux/sysrq.h +1 -0
@@ -45,6 +45,7 @@ struct sysrq_key_op {*/ void handle_sysrq (int key,struct tty_struct *tty); +void __handle_sysrq (int key,struct tty_struct *tty,int check_mask);int register_sysrq_key (int key,struct sysrq_key_op *op);int unregister_sysrq_key (int key,struct sysrq_key_op *op);struct sysrq_key_op *__sysrq_get_key_op (int key);
kernel/debug/kdb/kdb_main.c +1 -2
@@ -1820,9 +1820,8 @@ static int kdb_sr(int argc, const char **argv) {if (argc !=1 )return KDB_ARGCOUNT ; -sysrq_toggle_support (1 ); kdb_trap_printk++; -handle_sysrq (*argv[1 ],NULL ); +__handle_sysrq (*argv[1 ],NULL ,0 ); kdb_trap_printk--;return 0 ;
Signature · 1 line
1.6.3.3