kgdb: fixes and ARCH=arm support
Subsystems (3)
cover kgdb: fixes and ARCH=arm support
Here are 3 more patches against the kgdb-light. Porting kgdb-light to another arch has found 2 regressions, which are fixed in the first patch.
The second patch adds hooks for an additional kgdboc uart driver which was required to complete the testing with real hardware.
The third patch adds the ARCH=arm support for kgdb-light.
For initial merge of kgdb-light targeted at 2.6.26, the first patch in this series is required. The other patches are there for further community review and to show the effort of integrating kgdb into another arch with the API provided in the kgdb-light patch series.
Jason.
The following changes since commit 4ce04a959ef2ba9338217966013b832ff0ff9003:
Jason Wessel (1):
kgdb-light-v10: x86 HW breakpoints
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb.git for_ingo
Jason Wessel (3):
kgdb: fix optional arch functions and probe_kernel_*
kgdb: kgdboc pl011 I/O module
kgdb: support for ARCH=arm
arch/arm/Kconfig | 1 + arch/arm/kernel/Makefile | 1 + arch/arm/kernel/kgdb.c | 219 +++++++++++++++++++++++++++++++++++++++++++ arch/arm/kernel/setup.c | 5 + arch/arm/kernel/traps.c | 11 ++ drivers/serial/amba-pl011.c | 30 ++++++ include/asm-arm/kgdb.h | 101 ++++++++++++++++++++ include/asm-arm/traps.h | 2 + kernel/kgdb.c | 11 ++ mm/maccess.c | 6 + 10 files changed, 387 insertions(+), 0 deletions(-) create mode 100644 arch/arm/kernel/kgdb.c create mode 100644 include/asm-arm/kgdb.h
PATCH 1/3 kgdb: fix optional arch functions and probe_kernel_*
Fix two regressions dealing with the kgdb core.
1) kgdb_skipexception and kgdb_post_primary_code are optional functions that are only required on archs that need special exception fixups.
2) The kernel address space scope must be set on any probe_kernel_* function or archs such as ARCH=arm will not allow access to the kernel memory space. As an example, it is required to allow the full kernel address space is when you the kernel debugger to inspect a system call.
--- kernel/kgdb.c | 11 +++++++++++ mm/maccess.c | 6 ++++++ 2 files changed, 17 insertions(+), 0 deletions(-)
kernel/kgdb.c +11 -0
@@ -200,6 +200,17 @@ int __weak kgdb_arch_init(void)return 0 ; } +int __weak kgdb_skipexception (int exception,struct pt_regs *regs) +{ +return 0 ; +} + +void __weak +kgdb_post_primary_code (struct pt_regs *regs,int e_vector,int err_code) +{ +return ; +} +/** * kgdb_disable_hw_debug - Disable hardware debugging while we in kgdb. * @regs: Current &struct pt_regs.
mm/maccess.c +6 -0
@@ -17,11 +17,14 @@long probe_kernel_read (void *dst,void *src,size_t size) {long ret; +mm_segment_t old_fs =get_fs (); +set_fs (KERNEL_DS );pagefault_disable (); ret =__copy_from_user_inatomic (dst, (__force const void __user *)src, size);pagefault_enable (); +set_fs (old_fs);return ret ? -EFAULT :0 ; }
@@ -39,10 +42,13 @@ EXPORT_SYMBOL_GPL(probe_kernel_read);long probe_kernel_write (void *dst,void *src,size_t size) {long ret; +mm_segment_t old_fs =get_fs (); +set_fs (KERNEL_DS );pagefault_disable (); ret =__copy_to_user_inatomic ((__force void __user *)dst, src, size);pagefault_enable (); +set_fs (old_fs);return ret ? -EFAULT :0 ; }
Signature · 1 line
1.5.4
PATCH 2/3 kgdb: kgdboc pl011 I/O module
Implement the serial polling hooks for the pl011 uart for use with kgdboc.
This patch was specifically tested on the ARM Versatile AB reference platform.
--- drivers/serial/amba-pl011.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-)
drivers/serial/amba-pl011.c +30 -0
@@ -314,6 +314,32 @@ static void pl011_break_ctl(struct uart_port *port, int break_state)spin_unlock_irqrestore (&uap->port.lock, flags); } +#ifdef CONFIG_CONSOLE_POLL +static int pl010_get_poll_char (struct uart_port *port) +{ +struct uart_amba_port *uap = (struct uart_amba_port *)port; +unsigned int status; +int ch; +do { + status =readw (uap->port.membase + UART01x_FR); + }while (status & UART01x_FR_RXFE); + ch =readw (uap->port.membase + UART01x_DR); + +return ch; +} + +static void pl010_put_poll_char (struct uart_port *port, +unsigned char ch) +{ +struct uart_amba_port *uap = (struct uart_amba_port *)port; + +while (readw (uap->port.membase + UART01x_FR) & UART01x_FR_TXFF) +barrier (); +writew (ch, uap->port.membase + UART01x_DR); +} + +#endif /* CONFIG_CONSOLE_POLL */ +static int pl011_startup (struct uart_port *port) {struct uart_amba_port *uap = (struct uart_amba_port *)port;
@@ -572,6 +598,10 @@ static struct uart_ops amba_pl011_pops = { .request_port = pl010_request_port, .config_port = pl010_config_port, .verify_port = pl010_verify_port, +#ifdef CONFIG_CONSOLE_POLL + .poll_get_char = pl010_get_poll_char, + .poll_put_char = pl010_put_poll_char, +#endif };static struct uart_amba_port *amba_ports[UART_NR ];
Signature · 1 line
1.5.4
PATCH 3/3 kgdb: support for ARCH=arm
This patch adds the ARCH=arm specific a kgdb backend, originally written by Deepak Saxena <[email protected]> and George Davis <[email protected]>. Geoff Levand <[email protected]>, Nicolas Pitre, and Manish Lachwani have contributed various fixups here as well.
The changes to setup the traps earlier allow for early debugging with a uart based KGDB I/O driver. The do_undefinstr() routine also needed to allow the lookup of kernel address space in order for the debugger to plant undefined instructions in kernel memory space and receive the correct notification.
--- arch/arm/Kconfig | 1 + arch/arm/kernel/Makefile | 1 + arch/arm/kernel/kgdb.c | 219 ++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/kernel/setup.c | 5 + arch/arm/kernel/traps.c | 11 +++ include/asm-arm/kgdb.h | 101 +++++++++++++++++++++ include/asm-arm/traps.h | 2 + 7 files changed, 340 insertions(+), 0 deletions(-) create mode 100644 arch/arm/kernel/kgdb.c create mode 100644 include/asm-arm/kgdb.h
arch/arm/Kconfig +1 -0
@@ -11,6 +11,7 @@ config ARM select RTC_LIB select SYS_SUPPORTS_APM_EMULATION select HAVE_OPROFILE + select HAVE_ARCH_KGDB select HAVE_KPROBES if (!XIP_KERNEL) help The ARM series is a line of low-power-consumption RISC chip designs
arch/arm/kernel/Makefile +1 -0
@@ -22,6 +22,7 @@ obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o obj-$(CONFIG_KPROBES) += kprobes.o kprobes-decode.o obj-$(CONFIG_ATAGS_PROC) += atags.o obj-$(CONFIG_OABI_COMPAT) += sys_oabi-compat.o +obj-$(CONFIG_KGDB) += kgdb.o obj-$(CONFIG_CRUNCH) += crunch.o crunch-bits.o AFLAGS_crunch-bits.o := -Wa,-mcpu=ep9312
arch/arm/kernel/kgdb.c new file +219 -0
219 lines not on this page · raw message
arch/arm/kernel/setup.c +5 -0
@@ -36,6 +36,7 @@#include <asm/mach/arch.h> #include <asm/mach/irq.h> #include <asm/mach/time.h> +#include <asm/traps.h> #include "compat.h" #include "atags.h"
@@ -853,6 +854,10 @@ void __init setup_arch(char **cmdline_p) conswitchp = &dummy_con;#endif #endif + +#if defined(CONFIG_KGDB ) +early_trap_init (); +#endif }
arch/arm/kernel/traps.c +11 -0
@@ -294,6 +294,7 @@ asmlinkage void __exception do_undefinstr(struct pt_regs *regs)unsigned int instr;struct undef_hook *hook;siginfo_t info; +mm_segment_t fs;void __user *pc;unsigned long flags;
@@ -304,6 +305,8 @@ asmlinkage void __exception do_undefinstr(struct pt_regs *regs)*/ regs->ARM_pc -= correction; + fs =get_fs (); +set_fs (KERNEL_DS ); pc = (void __user *)instruction_pointer (regs);if (processor_mode (regs) ==SVC_MODE ) {
@@ -313,6 +316,7 @@ asmlinkage void __exception do_undefinstr(struct pt_regs *regs) }else {get_user (instr, (u32 __user *)pc); } +set_fs (fs);#ifdef CONFIG_KPROBES /*
@@ -708,6 +712,13 @@ EXPORT_SYMBOL(abort);void __init trap_init (void ) { +#if defined(CONFIG_KGDB ) + return; +} + +void __init early_trap_init (void ) +{ +#endif unsigned long vectors =CONFIG_VECTORS_BASE ;extern char __stubs_start[], __stubs_end[];extern char __vectors_start[], __vectors_end[];
include/asm-arm/kgdb.h new file +101 -0
101 lines not on this page · raw message
include/asm-arm/traps.h +2 -0
@@ -24,4 +24,6 @@ static inline int in_exception_text(unsigned long ptr) ptr < (unsigned long)&__exception_text_end; } +extern void __init early_trap_init (void ); +#endif
Signature · 1 line
1.5.4
Quoted 8 lines · Jason Wessel
Here are 3 more patches against the kgdb-light. Porting kgdb-light to another arch has found 2 regressions, which are fixed in the first patch.
The second patch adds hooks for an additional kgdboc uart driver which was required to complete the testing with real hardware.
The third patch adds the ARCH=arm support for kgdb-light.
thanks Jason. I've merged all 3 into the kgdb-light tree to ease testing.
I think we should also try to do some self-tests, so that when one boots a bzImage with the self-tests activated it can be said that all the basic functionality works. Simulated via some loopback method, from within the kernel - not via a real serial line - but it should have the capability to do real single-stepping and inject real hw breakpoints and test that they work. What do you think?
Ingo
Quoted 9 lines · Ingo Molnar
I think we should also try to do some self-tests, so that when one boots a bzImage with the self-tests activated it can be said that all the basic functionality works. Simulated via some loopback method, from within the kernel - not via a real serial line - but it should have the capability to do real single-stepping and inject real hw breakpoints and test that they work. What do you think?
Ingo
I am in agreement that the kgdb core and arch level support can be unit tested via a kgdb I/O module designed specifically for exercising kgdb as if it were the debugger talking to the kernel. It is more a matter of taking the time to write the test cases as well as some code to simulate the debugger. All the API pieces needed to create a testing kgdb I/O module are already in the kgdb core.
There are several classes of tests that could be run with the possibility to construct a kgdb test I/O module that performs them all:
- Early init tests
* Pass in a kernel start argument to invoke the test
* test kgdbwait
* test SW/HW breakpoints
* test single step
* test several known bad memory read locations
* test SMP concurrency
- Late init test
* Same as the first test, but done at the late init point with a different kernel start argument
* test NMI watch dog + recover
- Run time dynamic configuration
* Connect the I/O module at run time by using an echo > /sys/...
* Test the same pieces as the late init test
- Perhaps even allow the kgdb I/O test module to be built as a kernel module. The only problem with this is that there will be some more exports required. It is marginally more challenging in that you have to look up the symbol address info dynamically as well vs allowing the linker to resolve the references when it is built as a built-in. Also as a built-in you can call all the kgdb en-code de-code gdb serial packet logic directly with no exports.
Of course it is always best to start small and not all of the tests are needed in a 1st pass. It is something that is already on the KGDB todo list, and if there is someone out there that would like to start writing this code right now, please contact me. Or, eventually the this task will bubble to the top of the stack. :-)
Ultimately this type of I/O testing module will be important for helping to validate future archs that have kgdb support added, as well as a place to add other edge test cases if there are future defects fixed in kgdb for which you can create a test case.
Jason.