powerpc/book3e: powerpc/book3e: make kgdb to work well
v6 cover powerpc/book3e: powerpc/book3e: make kgdb to work well
Scott,
Tested on fsl-p5040 DS.
v6:
* rebase
* change the C code to initialize the exception stack addresses in the PACA instead.
* Clear the PACA_IRQ_HARD_DIS force to exit directly from this debug exception without replaying interrupt.
* so drop "book3e/kgdb: update thread's dbcr0".
v5:
* rebase on merge branch.
Note the original patch, [ATCH 5/7] kgdb/kgdbts: support ppc64, is already merged by Jason.
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 (5):
powerpc/book3e: initialize crit/mc/dbg kernel stack pointers powerpc/book3e: store crit/mc/dbg exception thread info powerpc/book3e: support kgdb for kernel space powerpc/kgdb: use DEFINE_PER_CPU to allocate kgdb's thread_info powerpc/book3e/kgdb: Fix a single stgep case of lazy IRQ
arch/powerpc/kernel/exceptions-64e.S | 26 ++++++++++++++++++++++---- arch/powerpc/kernel/kgdb.c | 13 ++++++++++--- arch/powerpc/kernel/setup_64.c | 18 ++++++++++++------ 3 files changed, 44 insertions(+), 13 deletions(-)
Tiejun
PATCH v6 1/5 powerpc/book3e: initialize crit/mc/dbg kernel stack pointers
We already allocated critical/machine/debug check exceptions, but we also should initialize those associated kernel stack pointers for use by special exceptions in the PACA.
--- arch/powerpc/kernel/setup_64.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
arch/powerpc/kernel/setup_64.c +12 -6
@@ -526,14 +526,20 @@ static void __init exc_lvl_early_init(void)extern unsigned int exc_debug_debug_book3e;unsigned int i; +unsigned long sp;for_each_possible_cpu (i) { - critirq_ctx[i] = (struct thread_info *) -__va (memblock_alloc (THREAD_SIZE ,THREAD_SIZE )); - dbgirq_ctx[i] = (struct thread_info *) -__va (memblock_alloc (THREAD_SIZE ,THREAD_SIZE )); - mcheckirq_ctx[i] = (struct thread_info *) -__va (memblock_alloc (THREAD_SIZE ,THREAD_SIZE )); + sp =memblock_alloc (THREAD_SIZE ,THREAD_SIZE ); + critirq_ctx[i] = (struct thread_info *)__va (sp); + paca[i].crit_kstack =__va (sp +THREAD_SIZE ); + + sp =memblock_alloc (THREAD_SIZE ,THREAD_SIZE ); + dbgirq_ctx[i] = (struct thread_info *)__va (sp); + paca[i].dbg_kstack =__va (sp +THREAD_SIZE ); + + sp =memblock_alloc (THREAD_SIZE ,THREAD_SIZE ); + mcheckirq_ctx[i] = (struct thread_info *)__va (sp); + paca[i].mc_kstack =__va (sp +THREAD_SIZE ); }if (cpu_has_feature (CPU_FTR_DEBUG_LVL_EXC ))
Signature · 1 line
1.7.9.5
PATCH v6 2/5 powerpc/book3e: store crit/mc/dbg 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 | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-)
arch/powerpc/kernel/exceptions-64e.S +19 -3
@@ -36,6 +36,19 @@ */ #define SPECIAL_EXC_FRAME_SIZE INT_FRAME_SIZE +/* Now we only store something to exception thread info */ +#define EXC_LEVEL_EXCEPTION_PROLOG(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 */ \
@@ -69,19 +82,22 @@ #define CRIT_SET_KSTACK \ ld r1,PACA_CRIT_STACK(r13); \ - subi r1,r1,SPECIAL_EXC_FRAME_SIZE; + subi r1,r1,SPECIAL_EXC_FRAME_SIZE; \ + EXC_LEVEL_EXCEPTION_PROLOG(CRIT); #define SPRN_CRIT_SRR0 SPRN_CSRR0 #define SPRN_CRIT_SRR1 SPRN_CSRR1 #define DBG_SET_KSTACK \ ld r1,PACA_DBG_STACK(r13); \ - subi r1,r1,SPECIAL_EXC_FRAME_SIZE; + subi r1,r1,SPECIAL_EXC_FRAME_SIZE; \ + EXC_LEVEL_EXCEPTION_PROLOG(DBG); #define SPRN_DBG_SRR0 SPRN_DSRR0 #define SPRN_DBG_SRR1 SPRN_DSRR1 #define MC_SET_KSTACK \ ld r1,PACA_MC_STACK(r13); \ - subi r1,r1,SPECIAL_EXC_FRAME_SIZE; + subi r1,r1,SPECIAL_EXC_FRAME_SIZE; \ + EXC_LEVEL_EXCEPTION_PROLOG(MC); #define SPRN_MC_SRR0 SPRN_MCSRR0 #define SPRN_MC_SRR1 SPRN_MCSRR1
Signature · 1 line
1.7.9.5
Re: [v6][PATCH 2/5] powerpc/book3e: store crit/mc/dbg exception thread info
Quoted 48 lines · Tiejun Chen
We need to store thread info to these exception thread info like something we already did for PPC32.
Signed-off-by Tiejun Chen <[email protected]>--- arch/powerpc/kernel/exceptions-64e.S | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-)arch/powerpc/kernel/exceptions-64e.S +17
-2@@ -36,6 +36,19 @@ */ #define SPECIAL_EXC_FRAME_SIZE INT_FRAME_SIZE +/* Now we only store something to exception thread info */ +#define EXC_LEVEL_EXCEPTION_PROLOG(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 */ \@@ -69,19 +82,22 @@ #define CRIT_SET_KSTACK \ ld r1,PACA_CRIT_STACK(r13); \ - subi r1,r1,SPECIAL_EXC_FRAME_SIZE; + subi r1,r1,SPECIAL_EXC_FRAME_SIZE; \ + EXC_LEVEL_EXCEPTION_PROLOG(CRIT); #define SPRN_CRIT_SRR0 SPRN_CSRR0 #define SPRN_CRIT_SRR1 SPRN_CSRR1 #define DBG_SET_KSTACK \ ld r1,PACA_DBG_STACK(r13); \ - subi r1,r1,SPECIAL_EXC_FRAME_SIZE; + subi r1,r1,SPECIAL_EXC_FRAME_SIZE; \ + EXC_LEVEL_EXCEPTION_PROLOG(DBG); #define SPRN_DBG_SRR0 SPRN_DSRR0
arch/powerpc/kernel/exceptions-64e.S line 103
Quoted 10 lines
arch/powerpc/kernel/exceptions-64e.S +2
-1#define SPRN_DBG_SRR1 SPRN_DSRR1 #define MC_SET_KSTACK \ ld r1,PACA_MC_STACK(r13); \ - subi r1,r1,SPECIAL_EXC_FRAME_SIZE; + subi r1,r1,SPECIAL_EXC_FRAME_SIZE; \ + EXC_LEVEL_EXCEPTION_PROLOG(MC); #define SPRN_MC_SRR0 SPRN_MCSRR0 #define SPRN_MC_SRR1 SPRN_MCSRR1
We should rename these if they're going to do more than set up a stack.
-Scott
Re: [v6,2/5] powerpc/book3e: store crit/mc/dbg exception thread info
In reply to Tiejun ChenQuoted 14 lines · Tiejun Chen
We need to store thread info to these exception thread info like something we already did for PPC32.
Signed-off-by Tiejun Chen <[email protected]>---
arch/powerpc/kernel/exceptions-64e.S| 22 +++++++++++++++++++---1 file changed, 19 insertions(+), 3 deletions(-)arch/powerpc/kernel/exceptions-64e.S +0
-0
arch/powerpc/kernel/exceptions-64e.S line 39
Quoted 4 lines
arch/powerpc/kernel/exceptions-64e.S +1
-0@@ -36,6 +36,19 @@ */ #define SPECIAL_EXC_FRAME_SIZE INT_FRAME_SIZE +/* Now we only store something to exception thread info */
Now as opposed to when? Only as opposed to what else?
arch/powerpc/kernel/exceptions-64e.S line 40
Quoted 1 line
arch/powerpc/kernel/exceptions-64e.S +1
-0+#define EXC_LEVEL_EXCEPTION_PROLOG(type) \
I'd prefer .macro over #define.
arch/powerpc/kernel/exceptions-64e.S line 49
Quoted 9 lines
arch/powerpc/kernel/exceptions-64e.S +9
-0+ 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);
This is a start, but we'll also need to save some more context to allow TLB misses from within the exception (e.g. if a machine check handler or GDB stub writes to a serial port, and the I/O registers aren't in the TLB). At a minimum I think we need to save SRR0, SRR1, SPRN_SPRG_GEN_SCRATCH, SPRN_SPRG_TLB_SCRATCH, and the MAS registers. We'll also need to make the bolted TLB miss handlers capable of pointing to different extables (though they won't need to auto-advance as the original TLB miss handlers do -- we would advance SPRN_SPRG_TLB_EXFRAME from this code), and the original TLB miss handlers will now need to support more than 3 levels of nesting.
For the e6500 tablewalk TLB miss handler, we'll need to do something special if we interrupt it when the lock is held, to revoke the lock and return to code that retries.
Is there anything else I'm missing?
-Scott
PATCH v6 3/5 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
@@ -597,11 +597,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
Re: [v6,3/5] powerpc/book3e: support kgdb for kernel space
Quoted 14 lines · Tiejun Chen
Currently we need to skip this for supporting KGDB.
Signed-off-by Tiejun Chen <[email protected]>---
arch/powerpc/kernel/exceptions-64e.S| 4 +++-1 file changed, 3 insertions(+), 1 deletion(-)arch/powerpc/kernel/exceptions-64e.S +0
-0@@ -597,11 +597,13 @@ kernel_dbg_exc: rfdi
arch/powerpc/kernel/exceptions-64e.S kernel_dbg_exc: · line 606
Quoted 10 lines
arch/powerpc/kernel/exceptions-64e.S +3
-1/* 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 that we have support for properly saving state on special level exceptions, that should be used here. With the above patch, what happens if e.g. a debug exception fires during a TLB miss, and the kgdb handler takes its own TLB miss accessing the serial port?
-Scott
PATCH v6 4/5 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 =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 v6 5/5 powerpc/book3e/kgdb: Fix a single stgep case of lazy IRQ
In reply to Tiejun ChenIn lazy EE magic, we may have a lazy interrupt occured while entering kgdb, but we really don't want to replay that interrupt for kgdb, so we have to clear the PACA_IRQ_HARD_DIS force to make sure we can exit directly from this debug exception.
--- arch/powerpc/kernel/kgdb.c | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/powerpc/kernel/kgdb.c +8 -0
@@ -185,6 +185,14 @@ static int kgdb_singlestep(struct pt_regs *regs)/* Restore current_thread_info lastly. */ memcpy (exception_thread_info, backup_current_thread_info,sizeof *thread_info); +#ifdef CONFIG_PPC64 +/* +* Clear the PACA_IRQ_HARD_DIS from the pending mask +* since we are about to exit this directly from debug +* exception without any replay interrupt in lazy EE case. +*/ + local_paca->irq_happened &= ~PACA_IRQ_HARD_DIS ; +#endif return 1 ; }
Signature · 1 line
1.7.9.5
Re: [v6][PATCH 5/5] powerpc/book3e/kgdb: Fix a single stgep case of lazy IRQ
Quoted 6 lines · Tiejun Chen
In lazy EE magic, we may have a lazy interrupt occured while entering kgdb, but we really don't want to replay that interrupt for kgdb, so we have to clear the
PACA_IRQ_HARD_DISforce to make sure we can exit directly from this debug exception.Signed-off-by Tiejun Chen <[email protected]>
s/stgep/step/ in subject
Quoted 13 lines
--- arch/powerpc/kernel/kgdb.c | 8 ++++++++ 1 file changed, 8 insertions(+)arch/powerpc/kernel/kgdb.c +1
-0@@ -185,6 +185,14 @@ static int kgdb_singlestep(struct pt_regs *regs)/* Restore current_thread_info lastly. */ memcpy (exception_thread_info, backup_current_thread_info,sizeof *thread_info); +#ifdef CONFIG_PPC64
arch/powerpc/kernel/kgdb.c static int kgdb_singlestep(struct pt_regs *regs) · line 198
Quoted 10 lines
arch/powerpc/kernel/kgdb.c +7
-0+/* +* Clear the PACA_IRQ_HARD_DIS from the pending mask +* since we are about to exit this directly from debug +* exception without any replay interrupt in lazy EE case. +*/ + local_paca->irq_happened &= ~PACA_IRQ_HARD_DIS ; +#endif return 1 ; }
What happens to those interrupts you discarded once we get back to a state when they can be safely replayed? I don't think just dropping them is the answer.
I'm not sure what the actual problem is. I can understand not wanting kgdb to cause interrupts to appear to run when the interrupted context has external interrupts disabled, but the replay code in entry_64.S doesn't run if interrupts are soft-disabled in the context to be returned to. What harm does it cause to run the interrupts if we're returning to an EE=1 context?
Does KGDB enable interrupts in its handler? If not, how do we even get into the situation where there are interrupts pending when the interrupted context has EE soft-enabled (i.e. we went directly from a context where the interrupt handler should have run, to a hard-disabled context)?
-Scott
Quoted 3 lines · Tiejun Chen
Scott,
Tested on fsl-p5040 DS.
Scott,
Any comments to this version?
Tiejun
Quoted 82 lines
v6:
* rebase
* change the C code to initialize the exception stack addresses in the PACA instead.
* Clear thePACA_IRQ_HARD_DISforce to exit directly from this debug exception without replaying interrupt.
* so drop "book3e/kgdb: update thread's dbcr0".v5:
* rebase on merge branch.
Note the original patch, [ATCH 5/7] kgdb/kgdbts: support ppc64, is already merged by Jason.
v4:
* use
DEFINE_PER_CPUto allocate kgdb'sthread_info
* add patch 7 to make usre copythread_infoonly !__check_irq_replay
* leave "andi. r14,r11,MSR_PR" out of "#ifndefCONFIG_KGDB"
since cr0 is still used lately.
* retestv3:
* 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_infosince booke and book3e always copy thethead_infonow 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_64safely
* UseLOAD_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 treev1:
* 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 sinceDBG_EXCEPTION_PROLOGalready covered this.
* useCURRENT_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 treev0:
This patchset is used to support kgdb for book3e.
----------------------------------------------------------------
Tiejun Chen (5):
powerpc/book3e: initialize crit/mc/dbg kernel stack pointers powerpc/book3e: store crit/mc/dbg exception thread info powerpc/book3e: support kgdb for kernel space powerpc/kgdb: useDEFINE_PER_CPUto allocate kgdb'sthread_infopowerpc/book3e/kgdb: Fix a single stgep case of lazy IRQarch/powerpc/kernel/exceptions-64e.S | 26 ++++++++++++++++++++++---- arch/powerpc/kernel/kgdb.c | 13 ++++++++++--- arch/powerpc/kernel/setup_64.c | 18 ++++++++++++------ 3 files changed, 44 insertions(+), 13 deletions(-)Tiejun
_______________________________________________
Linuxppc-dev mailing list
[email protected]
https://lists.ozlabs.org/listinfo/linuxppc-dev