powerpc/book3e: powerpc/book3e: make kgdb to work well
Subsystems (3)
v4 cover powerpc/book3e: powerpc/book3e: make kgdb to work well
This patchset is used to support kgdb/gdb on book3e.
Validated on p4080ds and p5040ds with test single step and breakpoint
v4:
* use DEFINE_PER_CPU to allocate kgdb's thread_info
* add patch 7 to make usre copy thread_info only !__check_irq_replay
* leave "andi. r14,r11,MSR_PR" out of "#ifndef CONFIG_KGDB"
since cr0 is still used lately.
* retest
v3:
* make work when enable CONFIG_RELOCATABLE
* fix one typo in patch,
"powerpc/book3e: store critical/machine/debug exception thread info":
ld r1,PACAKSAVE(r13);
-> ld r14,PACAKSAVE(r13);* remove copying the thread_info since booke and book3e always copy the thead_info now when we enter the debug exception, and so drop the v2 patch, "book3e/kgdb: Fix a single stgep case of lazy IRQ"
v2:
* Make sure we cover CONFIG_PPC_BOOK3E_64 safely
* Use LOAD_REG_IMMEDIATE() to load properly
the value of the constant expression in load debug exception stack
* Copy thread infor form the kernel stack coming from usr
* Rebase latest powerpc git tree
v1:
* Copy thread info only when we are from !user mode since we'll get kernel stack coming from usr directly.
* remove save/restore EX_R14/EX_R15 since DBG_EXCEPTION_PROLOG already covered this.
* use CURRENT_THREAD_INFO() conveniently to get thread.
* fix some typos
* add a patch to make sure gdb can generate a single step properly to invoke a kgdb state.
* add a patch to if we need to replay an interrupt, we shouldn't restore that previous backup thread info to make sure we can replay an interrupt lately with a proper thread info.
* rebase latest powerpc git tree
v0:
This patchset is used to support kgdb for book3e.
------
Tiejun Chen (7):
powerpc/book3e: load critical/machine/debug exception stack powerpc/book3e: store critical/machine/debug exception thread info book3e/kgdb: update thread's dbcr0
powerpc/book3e: support kgdb for kernel space kgdb/kgdbts: support ppc64
powerpc/kgdb: use DEFINE_PER_CPU to allocate kgdb's thread_info book3e/kgdb: Fix a single stgep case of lazy IRQ
arch/powerpc/kernel/exceptions-64e.S | 68 ++++++++++++++++++++++++++++++++-- arch/powerpc/kernel/irq.c | 10 +++++ arch/powerpc/kernel/kgdb.c | 21 +++++++---- drivers/misc/kgdbts.c | 2 + 4 files changed, 90 insertions(+), 11 deletions(-)
Tiejun
PATCH v4 1/7 powerpc/book3e: load critical/machine/debug exception stack
We always alloc critical/machine/debug check exceptions. This is different from the normal exception. So we should load these exception stack properly like we did for booke.
--- arch/powerpc/kernel/exceptions-64e.S | 49 +++++++++++++++++++++++++++++++--- 1 file changed, 46 insertions(+), 3 deletions(-)
arch/powerpc/kernel/exceptions-64e.S +46 -3
@@ -36,6 +36,37 @@ */ #define SPECIAL_EXC_FRAME_SIZE INT_FRAME_SIZE +/* only on book3e */ +#define DBG_STACK_BASE dbgirq_ctx +#define MC_STACK_BASE mcheckirq_ctx +#define CRIT_STACK_BASE critirq_ctx + +#ifdef CONFIG_RELOCATABLE +#define LOAD_STACK_BASE(reg, level) \ + tovirt(r2,r2); \ + LOAD_REG_ADDR(reg, level##_STACK_BASE); +#else +#define LOAD_STACK_BASE(reg, level) \ + LOAD_REG_IMMEDIATE(reg, level##_STACK_BASE); +#endif + +#ifdef CONFIG_SMP +#define BOOK3E_LOAD_EXC_LEVEL_STACK(level) \ + mfspr r14,SPRN_PIR; \ + slwi r14,r14,3; \ + LOAD_STACK_BASE(r10, level); \ + add r10,r10,r14; \ + ld r10,0(r10); \ + addi r10,r10,THREAD_SIZE; \ + std r10,PACA_##level##_STACK(r13); +#else +#define BOOK3E_LOAD_EXC_LEVEL_STACK(level) \ + LOAD_STACK_BASE(r10, level); \ + ld r10,0(r10); \ + addi r10,r10,THREAD_SIZE; \ + std r10,PACA_##level##_STACK(r13); +#endif + /* Exception prolog code for all exceptions */ #define EXCEPTION_PROLOG(n, intnum, type, addition) \ mtspr SPRN_SPRG_##type##_SCRATCH,r13; /* get spare registers */ \
@@ -68,20 +99,32 @@ #define SPRN_GDBELL_SRR1 SPRN_GSRR1 #define CRIT_SET_KSTACK \ + andi. r10,r11,MSR_PR; \ + bne 1f; \ + BOOK3E_LOAD_EXC_LEVEL_STACK(CRIT); \ ld r1,PACA_CRIT_STACK(r13); \ - subi r1,r1,SPECIAL_EXC_FRAME_SIZE; + subi r1,r1,SPECIAL_EXC_FRAME_SIZE; \ +1: #define SPRN_CRIT_SRR0 SPRN_CSRR0 #define SPRN_CRIT_SRR1 SPRN_CSRR1 #define DBG_SET_KSTACK \ + andi. r10,r11,MSR_PR; \ + bne 1f; \ + BOOK3E_LOAD_EXC_LEVEL_STACK(DBG); \ ld r1,PACA_DBG_STACK(r13); \ - subi r1,r1,SPECIAL_EXC_FRAME_SIZE; + subi r1,r1,SPECIAL_EXC_FRAME_SIZE; \ +1: #define SPRN_DBG_SRR0 SPRN_DSRR0 #define SPRN_DBG_SRR1 SPRN_DSRR1 #define MC_SET_KSTACK \ + andi. r10,r11,MSR_PR; \ + bne 1f; \ + BOOK3E_LOAD_EXC_LEVEL_STACK(MC); \ ld r1,PACA_MC_STACK(r13); \ - subi r1,r1,SPECIAL_EXC_FRAME_SIZE; + subi r1,r1,SPECIAL_EXC_FRAME_SIZE; \ +1: #define SPRN_MC_SRR0 SPRN_MCSRR0 #define SPRN_MC_SRR1 SPRN_MCSRR1
Signature · 1 line
1.7.9.5
PATCH v4 2/7 powerpc/book3e: store critical/machine/debug exception thread info
In reply to Tiejun ChenWe need to store thread info to these exception thread info like something we already did for PPC32.
--- arch/powerpc/kernel/exceptions-64e.S | 15 +++++++++++++++ 1 file changed, 15 insertions(+)
arch/powerpc/kernel/exceptions-64e.S +15 -0
@@ -67,6 +67,18 @@ std r10,PACA_##level##_STACK(r13); #endif +/* Store something to exception thread info */ +#define BOOK3E_STORE_EXC_LEVEL_THEAD_INFO(type) \ + ld r14,PACAKSAVE(r13); \ + CURRENT_THREAD_INFO(r14, r14); \ + CURRENT_THREAD_INFO(r15, r1); \ + ld r10,TI_FLAGS(r14); \ + std r10,TI_FLAGS(r15); \ + ld r10,TI_PREEMPT(r14); \ + std r10,TI_PREEMPT(r15); \ + ld r10,TI_TASK(r14); \ + std r10,TI_TASK(r15); + /* Exception prolog code for all exceptions */ #define EXCEPTION_PROLOG(n, intnum, type, addition) \ mtspr SPRN_SPRG_##type##_SCRATCH,r13; /* get spare registers */ \
@@ -104,6 +116,7 @@ BOOK3E_LOAD_EXC_LEVEL_STACK(CRIT); \ ld r1,PACA_CRIT_STACK(r13); \ subi r1,r1,SPECIAL_EXC_FRAME_SIZE; \ + BOOK3E_STORE_EXC_LEVEL_THEAD_INFO(CRIT); \ 1: #define SPRN_CRIT_SRR0 SPRN_CSRR0 #define SPRN_CRIT_SRR1 SPRN_CSRR1
@@ -114,6 +127,7 @@ BOOK3E_LOAD_EXC_LEVEL_STACK(DBG); \ ld r1,PACA_DBG_STACK(r13); \ subi r1,r1,SPECIAL_EXC_FRAME_SIZE; \ + BOOK3E_STORE_EXC_LEVEL_THEAD_INFO(DBG); \ 1: #define SPRN_DBG_SRR0 SPRN_DSRR0 #define SPRN_DBG_SRR1 SPRN_DSRR1
@@ -124,6 +138,7 @@ BOOK3E_LOAD_EXC_LEVEL_STACK(MC); \ ld r1,PACA_MC_STACK(r13); \ subi r1,r1,SPECIAL_EXC_FRAME_SIZE; \ + BOOK3E_STORE_EXC_LEVEL_THEAD_INFO(MC); \ 1: #define SPRN_MC_SRR0 SPRN_MCSRR0 #define SPRN_MC_SRR1 SPRN_MCSRR1
Signature · 1 line
1.7.9.5
PATCH v4 3/7 book3e/kgdb: update thread's dbcr0
In reply to Tiejun Chengdb always need to generate a single step properly to invoke a kgdb state. But with lazy interrupt, book3e can't always trigger a debug exception with a single step since the current is blocked for handling those pending exception, then we miss that expected dbcr configuration at last to generate a debug exception.
So here we also update thread's dbcr0 to make sure the current can go back with that missed dbcr0 configuration.
--- arch/powerpc/kernel/kgdb.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
arch/powerpc/kernel/kgdb.c +10 -3
@@ -410,7 +410,7 @@ int kgdb_arch_handle_exception(int vector, int signo, int err_code, struct pt_regs *linux_regs) {char *ptr = &remcom_in_buffer[1 ]; -unsigned long addr; +unsigned long addr, dbcr0;switch (remcom_in_buffer[0 ]) {/*
@@ -427,8 +427,15 @@ int kgdb_arch_handle_exception(int vector, int signo, int err_code,/* set the trace bit if we're stepping */ if (remcom_in_buffer[0 ] =='s' ) {#ifdef CONFIG_PPC_ADV_DEBUG_REGS -mtspr (SPRN_DBCR0 , -mfspr (SPRN_DBCR0 ) |DBCR0_IC |DBCR0_IDM ); + dbcr0 =mfspr (SPRN_DBCR0 ) |DBCR0_IC |DBCR0_IDM ; +mtspr (SPRN_DBCR0 , dbcr0); +#ifdef CONFIG_PPC_BOOK3E_64 +/* With lazy interrut we have to update thread dbcr0 here +* to make sure we can set debug properly at last to invoke +* kgdb again to work well. +*/ + current->thread.dbcr0 = dbcr0; +#endif linux_regs->msr |=MSR_DE ;#else linux_regs->msr |=MSR_SE ;
Signature · 1 line
1.7.9.5
PATCH v4 4/7 powerpc/book3e: support kgdb for kernel space
In reply to Tiejun ChenCurrently we need to skip this for supporting KGDB.
--- arch/powerpc/kernel/exceptions-64e.S | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/powerpc/kernel/exceptions-64e.S +3 -1
@@ -598,11 +598,13 @@ kernel_dbg_exc: rfdi /* Normal debug exception */ +1: andi. r14,r11,MSR_PR; /* check for userspace again */ +#ifndef CONFIG_KGDB /* XXX We only handle coming from userspace for now since we can't * quite save properly an interrupted kernel state yet */ -1: andi. r14,r11,MSR_PR; /* check for userspace again */ beq kernel_dbg_exc; /* if from kernel mode */ +#endif /* Now we mash up things to make it look like we are coming on a * normal exception
Signature · 1 line
1.7.9.5
PATCH v4 5/7 kgdb/kgdbts: support ppc64
In reply to Tiejun ChenWe can't look up the address of the entry point of the function simply via that function symbol for all architectures.
For PPC64 ABI, actually there is a function descriptors structure.
A function descriptor is a three doubleword data structure that contains the following values:
* The first doubleword contains the address of the entry point of the function.
* The second doubleword contains the TOC base address for the function.
* The third doubleword contains the environment pointer for languages such as Pascal and PL/1.
So we should call a wapperred dereference_function_descriptor() to get the address of the entry point of the function.
Note this is also safe for other architecture after refer to "include/asm-generic/sections.h" since:
dereference_function_descriptor(p) always is (p) if without arched definition.
--- drivers/misc/kgdbts.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/misc/kgdbts.c +2 -0
@@ -103,6 +103,7 @@#include <linux/delay.h> #include <linux/kthread.h> #include <linux/module.h> +#include <asm/sections.h> #define v1printk(a...) do { \ if (verbose) \
@@ -222,6 +223,7 @@ static unsigned long lookup_addr(char *arg) addr = (unsigned long )do_fork; else if (!strcmp(arg, "hw_break_val")) addr = (unsigned long )&hw_break_val; + addr = (unsigned long )dereference_function_descriptor ((void *)addr);return addr; }
Signature · 1 line
1.7.9.5
PATCH v4 6/7 powerpc/kgdb: use DEFINE_PER_CPU to allocate kgdb's thread_info
In reply to Tiejun ChenUse DEFINE_PER_CPU to allocate thread_info statically instead of kmalloc(). This can avoid introducing more memory check codes.
--- arch/powerpc/kernel/kgdb.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
arch/powerpc/kernel/kgdb.c +2 -3
@@ -151,15 +151,15 @@ static int kgdb_handle_breakpoint(struct pt_regs *regs)return 1 ; } +static DEFINE_PER_CPU(struct thread_info, kgdb_thread_info);static int kgdb_singlestep (struct pt_regs *regs) {struct thread_info *thread_info, *exception_thread_info; -struct thread_info *backup_current_thread_info; +struct thread_info *backup_current_thread_info = &__get_cpu_var (kgdb_thread_info);if (user_mode (regs))return 0 ; - backup_current_thread_info = (struct thread_info *)kmalloc (sizeof (struct thread_info ),GFP_KERNEL );/* * On Book E and perhaps other processors, singlestep is handled on * the critical exception stack. This causes current_thread_info()
@@ -185,7 +185,6 @@ static int kgdb_singlestep(struct pt_regs *regs)/* Restore current_thread_info lastly. */ memcpy (exception_thread_info, backup_current_thread_info,sizeof *thread_info); -kfree (backup_current_thread_info);return 1 ; }
Signature · 1 line
1.7.9.5
PATCH v4 7/7 book3e/kgdb: Fix a single stgep case of lazy IRQ
In reply to Tiejun ChenWhen we're in kgdb_singlestep(), we have to work around to get thread_info by copying from the kernel stack before calling kgdb_handle_exception(), then copying it back afterwards.
But for PPC64, we have a lazy interrupt implementation. So after copying thread info frome kernle stack, if we need to replay an interrupt, we shouldn't restore that previous backup thread info to make sure we can replay an interrupt lately with a proper thread info.
This patch use __check_irq_replay() to guarantee this process.
--- arch/powerpc/kernel/irq.c | 10 ++++++++++ arch/powerpc/kernel/kgdb.c | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-)
arch/powerpc/kernel/irq.c +10 -0
@@ -339,7 +339,17 @@ bool prep_irq_for_idle(void)return true; } +notrace unsigned int check_irq_replay(void) +{ +return __check_irq_replay (); +} +#else +notrace unsigned int check_irq_replay(void) +{ +return 0 ; +}#endif /* CONFIG_PPC64 */ +EXPORT_SYMBOL (check_irq_replay);int arch_show_interrupts (struct seq_file *p,int prec) {
arch/powerpc/kernel/kgdb.c +2 -1
@@ -152,6 +152,7 @@ static int kgdb_handle_breakpoint(struct pt_regs *regs) } static DEFINE_PER_CPU(struct thread_info, kgdb_thread_info); +extern notrace unsigned int check_irq_replay(void);static int kgdb_singlestep (struct pt_regs *regs) {struct thread_info *thread_info, *exception_thread_info;
@@ -181,7 +182,7 @@ static int kgdb_singlestep(struct pt_regs *regs)kgdb_handle_exception (0 ,SIGTRAP ,0 , regs); -if (thread_info != exception_thread_info) +if ((thread_info != exception_thread_info) && (!check_irq_replay ()))/* Restore current_thread_info lastly. */ memcpy (exception_thread_info, backup_current_thread_info,sizeof *thread_info);
Signature · 1 line
1.7.9.5