Prepare the PowerPC platform for HW Breakpoint infrastructure
Subsystems (2)
A message that is not in the archive (sent off-list or not yet received): 20090525004730.944465878@prasadkr_t60p.in.ibm.com
PATCH 1/6 Prepare the PowerPC platform for HW Breakpoint infrastructure
Prepare the PowerPC code for HW Breakpoint infrastructure patches by including relevant constant definitions and function declarations.
--- arch/powerpc/include/asm/hw_breakpoint.h | 57 +++++++++++++++++++++++++++++++ arch/powerpc/include/asm/processor.h | 1 arch/powerpc/include/asm/reg.h | 3 + 3 files changed, 61 insertions(+)
arch/powerpc/include/asm/hw_breakpoint.h new file +57 -0
@@ -0,0 +1,57 @@ +#ifndef _PPC64_HW_BREAKPOINT_H +#define _PPC64_HW_BREAKPOINT_H + +#ifdef __KERNEL__ +#define __ARCH_HW_BREAKPOINT_H +#ifdef CONFIG_PPC64 + +struct arch_hw_breakpoint { +char *name;/* Contains name of the symbol to set bkpt */ +unsigned long address; +u8 type; +}; + +#include <linux/kdebug.h> +#include <asm/reg.h> +#include <asm-generic/hw_breakpoint.h> + +#define HW_BREAKPOINT_READ DABR_DATA_READ +#define HW_BREAKPOINT_WRITE DABR_DATA_WRITE +#define HW_BREAKPOINT_RW (DABR_DATA_READ | DABR_DATA_WRITE) + +#define HW_BREAKPOINT_ALIGN 0x7 +#define HW_BREAKPOINT_LEN INSTRUCTION_LEN + +extern struct hw_breakpoint *hbp_kernel[HBP_NUM ]; +DECLARE_PER_CPU(struct hw_breakpoint*, this_hbp_kernel[HBP_NUM]); +extern unsigned int hbp_user_refcount[HBP_NUM ]; + +extern void arch_install_thread_hw_breakpoint (struct task_struct *tsk); +extern void arch_uninstall_thread_hw_breakpoint (void ); +extern int arch_validate_hwbkpt_settings (struct hw_breakpoint *bp, +struct task_struct *tsk); +extern void arch_update_user_hw_breakpoint (int pos,struct task_struct *tsk); +extern void arch_flush_thread_hw_breakpoint (struct task_struct *tsk); +extern void arch_update_kernel_hw_breakpoint (void *); +extern int hw_breakpoint_exceptions_notify (struct notifier_block *unused, +unsigned long val,void *data); + +extern void flush_thread_hw_breakpoint (struct task_struct *tsk); +extern int copy_thread_hw_breakpoint (struct task_struct *tsk, +struct task_struct *child,unsigned long clone_flags); +extern void load_debug_registers (void ); + +static inline void hw_breakpoint_disable (void ) +{ +set_dabr (0 ); +} + +#else +static inline void hw_breakpoint_disable (void ) +{ +/* Function is defined only on PPC64 for now */ +} +#endif /* CONFIG_PPC64 */ +#endif /* __KERNEL__ */ +#endif /* _PPC64_HW_BREAKPOINT_H */ +
arch/powerpc/include/asm/processor.h +1 -0
@@ -177,6 +177,7 @@ struct thread_struct {#ifdef CONFIG_PPC64 unsigned long start_tb;/* Start purr when proc switched in */ unsigned long accum_tb;/* Total accumilated purr for process */ +struct hw_breakpoint *hbp[HBP_NUM ];#endif unsigned long dabr;/* Data address breakpoint register */ #ifdef CONFIG_ALTIVEC
arch/powerpc/include/asm/reg.h +3 -0
@@ -26,6 +26,8 @@#include <asm/reg_8xx.h> #endif /* CONFIG_8xx */ +#define INSTRUCTION_LEN 4/* Length of any instruction */ +#define MSR_SF_LG 63/* Enable 64 bit mode */ #define MSR_ISF_LG 61/* Interrupt 64b mode valid on 630 */ #define MSR_HV_LG 60/* Hypervisor state */
@@ -184,6 +186,7 @@#define CTRL_TE 0x00c00000/* thread enable */ #define CTRL_RUNLATCH 0x1#define SPRN_DABR 0x3F5/* Data Address Breakpoint Register */ +#define HBP_NUM 1/* Number of physical HW breakpoint registers */ #define DABR_TRANSLATION (1UL << 2)#define DABR_DATA_WRITE (1UL << 1)#define DABR_DATA_READ (1UL << 0)
Quoted 16 lines · K.Prasad
Prepare the PowerPC code for HW Breakpoint infrastructure patches by including relevant constant definitions and function declarations.
Signed-off-by K.Prasad <[email protected]>--- arch/powerpc/include/asm/hw_breakpoint.h | 57 +++++++++++++++++++++++++++++++ arch/powerpc/include/asm/processor.h | 1 arch/powerpc/include/asm/reg.h | 3 + 3 files changed, 61 insertions(+)Index:
linux-2.6-tip.hbkpt/arch/powerpc/include/asm/hw_breakpoint.h
===================================================================arch/powerpc/include/asm/hw_breakpoint.h new file +1
-0@@ -0,0 +1,57 @@ +#ifndef _PPC64_HW_BREAKPOINT_H
arch/powerpc/include/asm/hw_breakpoint.h line 11
Quoted 10 lines
arch/powerpc/include/asm/hw_breakpoint.h new file +10
-0+#define _PPC64_HW_BREAKPOINT_H + +#ifdef __KERNEL__ +#define __ARCH_HW_BREAKPOINT_H +#ifdef CONFIG_PPC64 + +struct arch_hw_breakpoint { + char *name; /* Contains name of the symbol to set bkpt */ + unsigned long address; + u8 type;
You might as well make this an int, it will get padded out to 4 bytes long anyway.
Quoted 21 lines
arch/powerpc/include/asm/hw_breakpoint.h new file +21
-0+}; + +#include <linux/kdebug.h> +#include <asm/reg.h> +#include <asm-generic/hw_breakpoint.h> + +#define HW_BREAKPOINT_READ DABR_DATA_READ +#define HW_BREAKPOINT_WRITE DABR_DATA_WRITE +#define HW_BREAKPOINT_RW (DABR_DATA_READ | DABR_DATA_WRITE) + +#define HW_BREAKPOINT_ALIGN 0x7 +#define HW_BREAKPOINT_LEN INSTRUCTION_LEN + +extern struct hw_breakpoint *hbp_kernel[HBP_NUM ]; +DECLARE_PER_CPU(struct hw_breakpoint*, this_hbp_kernel[HBP_NUM]); +extern unsigned int hbp_user_refcount[HBP_NUM ]; + +extern void arch_install_thread_hw_breakpoint (struct task_struct *tsk); +extern void arch_uninstall_thread_hw_breakpoint (void ); +extern int arch_validate_hwbkpt_settings (struct hw_breakpoint *bp, +struct task_struct *tsk);
arch/powerpc/include/asm/hw_breakpoint.h line 42
Quoted 10 lines
arch/powerpc/include/asm/hw_breakpoint.h new file +10
-0+extern void arch_update_user_hw_breakpoint (int pos,struct task_struct *tsk); +extern void arch_flush_thread_hw_breakpoint (struct task_struct *tsk); +extern void arch_update_kernel_hw_breakpoint (void *); +extern int hw_breakpoint_exceptions_notify (struct notifier_block *unused, +unsigned long val,void *data); + +extern void flush_thread_hw_breakpoint (struct task_struct *tsk); +extern int copy_thread_hw_breakpoint (struct task_struct *tsk, +struct task_struct *child,unsigned long clone_flags); +extern void load_debug_registers (void );
It looks as though a lot of these arch hooks ought to have prototypes in the generic part of the infrastructure.
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
Quoted 22 lines · David Gibson
Quoted 21 lines · K.Prasad
Prepare the PowerPC code for HW Breakpoint infrastructure patches by including relevant constant definitions and function declarations.
Signed-off-by K.Prasad <[email protected]>--- arch/powerpc/include/asm/hw_breakpoint.h | 57 +++++++++++++++++++++++++++++++ arch/powerpc/include/asm/processor.h | 1 arch/powerpc/include/asm/reg.h | 3 + 3 files changed, 61 insertions(+)Index:
linux-2.6-tip.hbkpt/arch/powerpc/include/asm/hw_breakpoint.h
===================================================================arch/powerpc/include/asm/hw_breakpoint.h new file +6
-0@@ -0,0 +1,57 @@ +#ifndef _PPC64_HW_BREAKPOINT_H +#define _PPC64_HW_BREAKPOINT_H + +#ifdef __KERNEL__ +#define __ARCH_HW_BREAKPOINT_H +#ifdef CONFIG_PPC64
Quoted 9 lines
arch/powerpc/include/asm/hw_breakpoint.h line 11
Quoted 5 lines
arch/powerpc/include/asm/hw_breakpoint.h new file +5
-0+ +struct arch_hw_breakpoint { +char *name;/* Contains name of the symbol to set bkpt */ +unsigned long address; +u8 type;You might as well make this an int, it will get padded out to 4 bytes long anyway.
Okay.
Quoted 26 lines
Quoted 26 lines
arch/powerpc/include/asm/hw_breakpoint.h new file +26
-0+}; + +#include <linux/kdebug.h> +#include <asm/reg.h> +#include <asm-generic/hw_breakpoint.h> + +#define HW_BREAKPOINT_READ DABR_DATA_READ +#define HW_BREAKPOINT_WRITE DABR_DATA_WRITE +#define HW_BREAKPOINT_RW (DABR_DATA_READ | DABR_DATA_WRITE) + +#define HW_BREAKPOINT_ALIGN 0x7 +#define HW_BREAKPOINT_LEN INSTRUCTION_LEN + +extern struct hw_breakpoint *hbp_kernel[HBP_NUM ]; +DECLARE_PER_CPU(struct hw_breakpoint*, this_hbp_kernel[HBP_NUM]); +extern unsigned int hbp_user_refcount[HBP_NUM ]; + +extern void arch_install_thread_hw_breakpoint (struct task_struct *tsk); +extern void arch_uninstall_thread_hw_breakpoint (void ); +extern int arch_validate_hwbkpt_settings (struct hw_breakpoint *bp, +struct task_struct *tsk); +extern void arch_update_user_hw_breakpoint (int pos,struct task_struct *tsk); +extern void arch_flush_thread_hw_breakpoint (struct task_struct *tsk); +extern void arch_update_kernel_hw_breakpoint (void *); +extern int hw_breakpoint_exceptions_notify (struct notifier_block *unused, +unsigned long val,void *data);
Quoted 9 lines
arch/powerpc/include/asm/hw_breakpoint.h line 42
Quoted 5 lines
arch/powerpc/include/asm/hw_breakpoint.h new file +5
-0+ +extern void flush_thread_hw_breakpoint (struct task_struct *tsk); +extern int copy_thread_hw_breakpoint (struct task_struct *tsk, +struct task_struct *child,unsigned long clone_flags); +extern void load_debug_registers (void );It looks as though a lot of these arch hooks ought to have prototypes in the generic part of the infrastructure.
As I said before, the signatures of some of these functions are different. But I agree that we may want to eventually consolidate them into the generic header file, during future enhancements.
Thanks,
K.Prasad
Quoted 5 lines
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
PATCH 2/6 Introduce PPC64 specific Hardware Breakpoint interfaces
In reply to a message not in the archiveIntroduce PPC64 implementation for the generic hardware breakpoint interfaces defined in kernel/hw_breakpoint.c. Enable the HAVE_HW_BREAKPOINT flag and the Makefile.
--- arch/powerpc/Kconfig | 1 arch/powerpc/kernel/Makefile | 2 arch/powerpc/kernel/hw_breakpoint.c | 279 ++++++++++++++++++++++++++++++++++++ 3 files changed, 281 insertions(+), 1 deletion(-)
arch/powerpc/Kconfig +1 -0
@@ -125,6 +125,7 @@ config PPC select USE_GENERIC_SMP_HELPERS if SMP select HAVE_OPROFILE select HAVE_SYSCALL_WRAPPERS if PPC64 + select HAVE_HW_BREAKPOINT if PPC64 config EARLY_PRINTK bool
arch/powerpc/kernel/Makefile +1 -1
@@ -33,7 +33,7 @@ obj-$(CONFIG_PPC64) += setup_64.o sys_p signal_64.o ptrace32.o \ paca.o cpu_setup_ppc970.o \ cpu_setup_pa6t.o \ - firmware.o nvram_64.o + firmware.o nvram_64.o hw_breakpoint.o obj64-$(CONFIG_RELOCATABLE) += reloc_64.o obj-$(CONFIG_PPC64) += vdso64/ obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o
arch/powerpc/kernel/hw_breakpoint.c new file +279 -0
279 lines not on this page · raw message
Re: [Patch 2/6] Introduce PPC64 specific Hardware Breakpoint interfaces
Quoted 3 lines · K.Prasad
Introduce PPC64 implementation for the generic hardware breakpoint interfaces defined in
kernel/hw_breakpoint.c. Enable theHAVE_HW_BREAKPOINTflag and theMakefile.
[snip]
Quoted 147 lines
arch/powerpc/kernel/hw_breakpoint.c new file +147
-0+/* Store the kernel-space breakpoint address value */ +static unsigned long kdabr; + +/* +* Temporarily stores address for DABR before it is written by the +* single-step handler routine +*/ +static DEFINE_PER_CPU(unsigned long, dabr_data); + +void arch_update_kernel_hw_breakpoint (void *unused) +{ +struct hw_breakpoint *bp; + +/* Check if there is nothing to update */ +if (hbp_kernel_pos ==HBP_NUM ) +return ; + +per_cpu (this_hbp_kernel[hbp_kernel_pos],get_cpu ()) = bp = + hbp_kernel[hbp_kernel_pos]; +if (bp ==NULL ) + kdabr =0 ; +else + kdabr = (bp->info.address & ~HW_BREAKPOINT_ALIGN ) | + bp->info.type |DABR_TRANSLATION ; +set_dabr (kdabr); +put_cpu_no_resched (); +} + +/* +* Install the thread breakpoints in their debug registers. +*/ +void arch_install_thread_hw_breakpoint (struct task_struct *tsk) +{ +set_dabr (tsk->thread.dabr); +} + +/* +* Install the debug register values for just the kernel, no thread. +*/ +void arch_uninstall_thread_hw_breakpoint () +{ +set_dabr (0 ); +} + +/* +* Store a breakpoint's encoded address, length, and type. +*/ +int arch_store_info (struct hw_breakpoint *bp,struct task_struct *tsk) +{ +/* +* User-space requests will always have the address field populated +* Symbol names from user-space are rejected +*/ +if (tsk && bp->info.name) +return -EINVAL ; +/* +* User-space requests will always have the address field populated +* For kernel-addresses, either the address or symbol name can be +* specified. +*/ +if (bp->info.name) + bp->info.address = (unsigned long ) +kallsyms_lookup_name (bp->info.name); +if (bp->info.address) +return 0 ; +return -EINVAL ; +} + +/* +* Validate the arch-specific HW Breakpoint register settings +*/ +int arch_validate_hwbkpt_settings (struct hw_breakpoint *bp, +struct task_struct *tsk) +{ +int is_kernel, ret = -EINVAL ; + +if (!bp) +return ret; + +switch (bp->info.type) { +case HW_BREAKPOINT_READ : +case HW_BREAKPOINT_WRITE : +case HW_BREAKPOINT_RW : +break ; +default : +return ret; + } + +if (bp->triggered) + ret =arch_store_info (bp, tsk); + + is_kernel =is_kernel_addr (bp->info.address); +if ((tsk && is_kernel) || (!tsk && !is_kernel)) +return -EINVAL ; + +return ret; +} + +void arch_update_user_hw_breakpoint (int pos,struct task_struct *tsk) +{ +struct thread_struct *thread = &(tsk->thread); +struct hw_breakpoint *bp = thread->hbp[0 ]; + +if (bp) + thread->dabr = (bp->info.address & ~HW_BREAKPOINT_ALIGN ) | + bp->info.type |DABR_TRANSLATION ; +else + thread->dabr =0 ; +} + +void arch_flush_thread_hw_breakpoint (struct task_struct *tsk) +{ +struct thread_struct *thread = &(tsk->thread); + + thread->dabr =0 ; +} + +/* +* Handle debug exception notifications. +*/ +int __kprobes hw_breakpoint_handler (struct die_args *args) +{ +int rc =NOTIFY_STOP ; +struct hw_breakpoint *bp; +struct pt_regs *regs = args->regs; +unsigned long dar = regs->dar; +int cpu, stepped =1 ; + +/* Disable breakpoints during exception handling */ +set_dabr (0 ); + + cpu =get_cpu (); +/* Determine whether kernel- or user-space address is the trigger */ + bp = (hbp_kernel_pos ==HBP_NUM ) ? current->thread.hbp[0 ] : +per_cpu (this_hbp_kernel[0 ], cpu); +/* +* bp can be NULL due to lazy debug register switching +* or due to the delay between updates of hbp_kernel_pos +* and this_hbp_kernel. +*/ +if (!bp) + goto out; + +if (dar == bp->info.address) +per_cpu (dabr_data, cpu) = (hbp_kernel_pos ==HBP_NUM ) ? + current->thread.dabr : kdabr; +else {
arch/powerpc/kernel/hw_breakpoint.c line 194
Quoted 10 lines
arch/powerpc/kernel/hw_breakpoint.c new file +10
-0+/* +* This exception is triggered not because of a memory access on +* the monitored variable but in the double-word address range +* in which it is contained. We will consume this exception, +* considering it as 'noise'. +*/ + rc =NOTIFY_STOP ; + goto out; + } + (bp->triggered)(bp, regs);
This will fire the handler function before the instruction has executed. I remember seeing a comment in the other patchset saying the function would be triggered after execution, but I'm not sure if that was in generic of x86-specific code.
arch/powerpc/kernel/hw_breakpoint.c line 206
Quoted 12 lines
arch/powerpc/kernel/hw_breakpoint.c new file +12
-0+ + stepped =emulate_step (regs, regs->nip); +/* +* Single-step the causative instruction manually if +* emulate_step() could not execute it +*/ +if (stepped ==0 ) { + regs->msr |=MSR_SE ; + goto out; + } +set_dabr (per_cpu (dabr_data, cpu)); +per_cpu (dabr_data, cpu) =0 ;
This curly arrangement of put_cpu() / get_cpu() could probably do with some more comments...
Quoted 24 lines
arch/powerpc/kernel/hw_breakpoint.c new file +24
-0+out: +/* Enable pre-emption only if single-stepping is finished */ +if (stepped) +put_cpu_no_resched (); +return rc; +} + +/* +* Handle single-step exceptions following a DABR hit. +*/ +int __kprobes single_step_dabr_instruction (struct die_args *args) +{ +struct pt_regs *regs = args->regs; +int cpu =get_cpu (); +int ret =NOTIFY_DONE ; +siginfo_t info; +unsigned long this_dabr_data =per_cpu (dabr_data, cpu); + +/* +* Check if we are single-stepping as a result of a +* previous HW Breakpoint exception +*/ +if (this_dabr_data ==0 ) + goto out;
arch/powerpc/kernel/hw_breakpoint.c line 241
Quoted 10 lines
arch/powerpc/kernel/hw_breakpoint.c new file +10
-0+ + regs->msr &= ~MSR_SE ; +/* Deliver signal to user-space */ +if (this_dabr_data <TASK_SIZE ) { + info.si_signo =SIGTRAP ; + info.si_errno =0 ; + info.si_code =TRAP_HWBKPT ; + info.si_addr = (void __user *)(per_cpu (dabr_data, cpu)); +force_sig_info (SIGTRAP , &info, current); + }
Ok, this is a behaviour change - the old do_dabr() code fired the SIGTRAP before the instruction completed, but this will fire it after. It seems simpler and safer to move this into ptrace's triggered function.
Quoted 38 lines
arch/powerpc/kernel/hw_breakpoint.c new file +38
-0+ +set_dabr (this_dabr_data); +per_cpu (dabr_data, cpu) =0 ; + ret =NOTIFY_STOP ; +/* +* If single-stepped after hw_breakpoint_handler(), pre-emption is +* already disabled. +*/ +put_cpu_no_resched (); + +out: +/* +* A put_cpu_no_resched() call is required to complement the get_cpu() +* call used initially +*/ +put_cpu_no_resched (); +return ret; +} + +/* +* Handle debug exception notifications. +*/ +int __kprobes hw_breakpoint_exceptions_notify ( +struct notifier_block *unused,unsigned long val,void *data) +{ +int ret =NOTIFY_DONE ; + +switch (val) { +case DIE_DABR_MATCH : + ret =hw_breakpoint_handler (data); +break ; +case DIE_SSTEP : + ret =single_step_dabr_instruction (data); +break ; + } + +return ret; +}
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
Re: [Patch 2/6] Introduce PPC64 specific Hardware Breakpoint interfaces
Quoted 38 lines · David Gibson
Quoted 37 lines · K.Prasad
arch/powerpc/kernel/hw_breakpoint.c new file +37
-0+/* +* Handle debug exception notifications. +*/ +int __kprobes hw_breakpoint_handler (struct die_args *args) +{ +int rc =NOTIFY_STOP ; +struct hw_breakpoint *bp; +struct pt_regs *regs = args->regs; +unsigned long dar = regs->dar; +int cpu, stepped =1 ; + +/* Disable breakpoints during exception handling */ +set_dabr (0 ); + + cpu =get_cpu (); +/* Determine whether kernel- or user-space address is the trigger */ + bp = (hbp_kernel_pos ==HBP_NUM ) ? current->thread.hbp[0 ] : +per_cpu (this_hbp_kernel[0 ], cpu); +/* +* bp can be NULL due to lazy debug register switching +* or due to the delay between updates of hbp_kernel_pos +* and this_hbp_kernel. +*/ +if (!bp) + goto out; + +if (dar == bp->info.address) +per_cpu (dabr_data, cpu) = (hbp_kernel_pos ==HBP_NUM ) ? + current->thread.dabr : kdabr; +else { +/* +* This exception is triggered not because of a memory access on +* the monitored variable but in the double-word address range +* in which it is contained. We will consume this exception, +* considering it as 'noise'. +*/ + rc =NOTIFY_STOP ;
Quoted 9 lines
arch/powerpc/kernel/hw_breakpoint.c line 194
Quoted 3 lines
arch/powerpc/kernel/hw_breakpoint.c new file +3
-0+ goto out; + } + (bp->triggered)(bp, regs);This will fire the handler function before the instruction has executed. I remember seeing a comment in the other patchset saying the function would be triggered after execution, but I'm not sure if that was in generic of x86-specific code.
Yes, I see that the comment
" * @triggered: callback invoked after target address access"
in include/asm-generic/hw_breakpoint.h which has to be changed. I will do the same in a follow-on patch to the generic interface after its integration.
Quoted 7 lines
Quoted 7 lines
arch/powerpc/kernel/hw_breakpoint.c new file +7
-0+ + stepped =emulate_step (regs, regs->nip); +/* +* Single-step the causative instruction manually if +* emulate_step() could not execute it +*/ +if (stepped ==0 ) {
Quoted 9 lines
arch/powerpc/kernel/hw_breakpoint.c line 206
Quoted 5 lines
arch/powerpc/kernel/hw_breakpoint.c new file +5
-0+ regs->msr |=MSR_SE ; + goto out; + } +set_dabr (per_cpu (dabr_data, cpu)); +per_cpu (dabr_data, cpu) =0 ;This curly arrangement of
put_cpu()/get_cpu()could probably do with some more comments...
The put_cpu() usage in hw_breakpoint_handler() and single_step_dabr_instruction() is actually wrapped with comments.
Do you want a comment about the usage of the per_cpu data variable used above, or a more descriptive comment in places where put_cpu() is use?
Quoted 31 lines
Quoted 31 lines
arch/powerpc/kernel/hw_breakpoint.c new file +31
-0+out: +/* Enable pre-emption only if single-stepping is finished */ +if (stepped) +put_cpu_no_resched (); +return rc; +} + +/* +* Handle single-step exceptions following a DABR hit. +*/ +int __kprobes single_step_dabr_instruction (struct die_args *args) +{ +struct pt_regs *regs = args->regs; +int cpu =get_cpu (); +int ret =NOTIFY_DONE ; +siginfo_t info; +unsigned long this_dabr_data =per_cpu (dabr_data, cpu); + +/* +* Check if we are single-stepping as a result of a +* previous HW Breakpoint exception +*/ +if (this_dabr_data ==0 ) + goto out; + + regs->msr &= ~MSR_SE ; +/* Deliver signal to user-space */ +if (this_dabr_data <TASK_SIZE ) { + info.si_signo =SIGTRAP ; + info.si_errno =0 ; + info.si_code =TRAP_HWBKPT ;
Quoted 9 lines
arch/powerpc/kernel/hw_breakpoint.c line 241
Quoted 3 lines
arch/powerpc/kernel/hw_breakpoint.c new file +3
-0+ info.si_addr = (void __user *)(per_cpu (dabr_data, cpu)); +force_sig_info (SIGTRAP , &info, current); + }Ok, this is a behaviour change - the old
do_dabr()code fired the SIGTRAP before the instruction completed, but this will fire it after. It seems simpler and safer to move this into ptrace's triggered function.
Thanks, I realise that this changes the user-space behaviour. The one-shot hardware breakpoint exception behaviour and also single-stepping the instruction have changed.
I will modify the hw_breakpoint_handler() to overcome this problem.
Thanks,
K.Prasad
PATCH 3/6 Modify ptrace code to use Hardware Breakpoint interfaces
In reply to a message not in the archiveModify the ptrace code to use the hardware breakpoint interfaces for user-space.
--- arch/powerpc/kernel/ptrace.c | 44 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+)
arch/powerpc/kernel/ptrace.c +44 -0
@@ -37,6 +37,7 @@#include <asm/page.h> #include <asm/pgtable.h> #include <asm/system.h> +#include <asm/hw_breakpoint.h> /* * does not yet catch signals sent when the child dies.
@@ -735,9 +736,22 @@ void user_disable_single_step(struct tasclear_tsk_thread_flag (task,TIF_SINGLESTEP ); } +static void ptrace_triggered (struct hw_breakpoint *bp,struct pt_regs *regs) +{ +/* +* The SIGTRAP signal is generated automatically for us in do_dabr(). +* We don't have to do anything here +*/ +} +int ptrace_set_debugreg (struct task_struct *task,unsigned long addr,unsigned long data) { +#ifdef CONFIG_PPC64 +struct thread_struct *thread = &(task->thread); +struct hw_breakpoint *bp; +int ret; +#endif /* For ppc64 we support one DABR and no IABR's at the moment (ppc64). * For embedded processors we support one DAC and no IAC's at the * moment.
@@ -767,6 +781,36 @@ int ptrace_set_debugreg(struct task_struif (data && !(data &DABR_TRANSLATION ))return -EIO ; +#ifdef CONFIG_PPC64 + bp = thread->hbp[0 ]; +if (data ==0 ) { +if (bp) { +unregister_user_hw_breakpoint (task, bp); +kfree (bp); + thread->hbp[0 ] =NULL ; + } +return 0 ; + } + +if (bp) { + bp->info.type = data &HW_BREAKPOINT_RW ; + task->thread.dabr = bp->info.address = data; +return modify_user_hw_breakpoint (task, bp); + } + bp =kzalloc (sizeof (struct hw_breakpoint ),GFP_KERNEL ); +if (!bp) +return -ENOMEM ; + +/* Store the type of breakpoint */ + bp->info.type = data &HW_BREAKPOINT_RW ; + bp->triggered = ptrace_triggered; + task->thread.dabr = bp->info.address = data; + + ret =register_user_hw_breakpoint (task, bp); +if (ret) +return ret; +#endif /* CONFIG_PPC64 */ +/* Move contents to the DABR register */ task->thread.dabr = data;
PATCH 4/6 Modify process and processor handling code to recognise hardware debug registers
In reply to a message not in the archiveModify process handling code to recognise hardware debug registers during copy and flush operations. Introduce a new TIF_DEBUG task flag to indicate a process's use of debug register. Load the debug register values into a new CPU during initialisation.
--- arch/powerpc/include/asm/thread_info.h | 2 ++ arch/powerpc/kernel/process.c | 18 ++++++++++++++++++ arch/powerpc/kernel/smp.c | 2 ++ 3 files changed, 22 insertions(+)
arch/powerpc/include/asm/thread_info.h +2 -0
@@ -114,6 +114,7 @@ static inline struct thread_info *curren#define TIF_FREEZE 14/* Freezing for suspend */ #define TIF_RUNLATCH 15/* Is the runlatch enabled? */ #define TIF_ABI_PENDING 16/* 32/64 bit switch needed */ +#define TIF_DEBUG 17/* uses debug registers */ /* as above, but as bit values */ #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
@@ -132,6 +133,7 @@ static inline struct thread_info *curren#define _TIF_FREEZE (1<<TIF_FREEZE)#define _TIF_RUNLATCH (1<<TIF_RUNLATCH)#define _TIF_ABI_PENDING (1<<TIF_ABI_PENDING) +#define _TIF_DEBUG (1<<TIF_DEBUG)#define _TIF_SYSCALL_T_OR_A (_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SECCOMP)#define _TIF_USER_WORK_MASK (_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
arch/powerpc/kernel/process.c +18 -0
@@ -50,6 +50,7 @@#include <asm/syscalls.h> #ifdef CONFIG_PPC64 #include <asm/firmware.h> +#include <asm/hw_breakpoint.h> #endif #include <linux/kprobes.h> #include <linux/kdebug.h>
@@ -254,8 +255,10 @@ void do_dabr(struct pt_regs *regs, unsig 11, SIGSEGV) == NOTIFY_STOP)return ; +#ifndef CONFIG_PPC64 if (debugger_dabr_match (regs))return ; +#endif /* Clear the DAC and struct entries. One shot trigger */ #if defined(CONFIG_BOOKE )
@@ -372,8 +375,13 @@ struct task_struct *__switch_to(struct t#endif /* CONFIG_SMP */ +#ifdef CONFIG_PPC64 +if (unlikely (test_tsk_thread_flag (new,TIF_DEBUG ))) +arch_install_thread_hw_breakpoint (new); +#else if (unlikely (__get_cpu_var (current_dabr) != new->thread.dabr))set_dabr (new->thread.dabr); +#endif /* CONFIG_PPC64 */ #if defined(CONFIG_BOOKE )/* If new thread DAC (HW breakpoint) is the same then leave it */
@@ -550,6 +558,10 @@ void show_regs(struct pt_regs * regs)void exit_thread (void ) {discard_lazy_cpu_state (); +#ifdef CONFIG_PPC64 +if (unlikely (test_tsk_thread_flag (current,TIF_DEBUG ))) +flush_thread_hw_breakpoint (current); +#endif /* CONFIG_PPC64 */ }void flush_thread (void )
@@ -605,6 +617,9 @@ int copy_thread(unsigned long clone_flagstruct pt_regs *childregs, *kregs;extern void ret_from_fork (void );unsigned long sp = (unsigned long )task_stack_page (p) +THREAD_SIZE ; +#ifdef CONFIG_PPC64 +struct task_struct *tsk = current; +#endif CHECK_FULL_REGS (regs);/* Copy registers */
@@ -672,6 +687,9 @@ int copy_thread(unsigned long clone_flag* function. */ kregs->nip = *((unsigned long *)ret_from_fork); + +if (unlikely (test_tsk_thread_flag (tsk,TIF_DEBUG ))) +copy_thread_hw_breakpoint (tsk, p, clone_flags);#else kregs->nip = (unsigned long )ret_from_fork;#endif
arch/powerpc/kernel/smp.c +2 -0
@@ -48,6 +48,7 @@#include <asm/vdso_datapage.h> #ifdef CONFIG_PPC64 #include <asm/paca.h> +#include <asm/hw_breakpoint.h> #endif #ifdef DEBUG
@@ -536,6 +537,7 @@ int __devinit start_secondary(void *unuslocal_irq_enable (); +load_debug_registers ();cpu_idle ();return 0 ; }
Re: [Patch 4/6] Modify process and processor handling code to recognise hardware debug registers
Quoted 4 lines · K.Prasad
Modify process handling code to recognise hardware debug registers during copy and flush operations. Introduce a new
TIF_DEBUGtask flag to indicate a process's use of debug register. Load the debug register values into a new CPU during initialisation.
[snip]
Quoted 49 lines
Index:
linux-2.6-tip.hbkpt/arch/powerpc/kernel/process.c
===================================================================arch/powerpc/kernel/process.c +12
-0@@ -50,6 +50,7 @@#include <asm/syscalls.h> #ifdef CONFIG_PPC64 #include <asm/firmware.h> +#include <asm/hw_breakpoint.h> #endif #include <linux/kprobes.h> #include <linux/kdebug.h> @@ -254,8 +255,10 @@ void do_dabr(struct pt_regs *regs, unsig 11, SIGSEGV) == NOTIFY_STOP)return ; +#ifndef CONFIG_PPC64 if (debugger_dabr_match (regs))return ; +#endif /* Clear the DAC and struct entries. One shot trigger */ #if defined(CONFIG_BOOKE )@@ -372,8 +375,13 @@ struct task_struct *__switch_to(struct t#endif /* CONFIG_SMP */ +#ifdef CONFIG_PPC64 +if (unlikely (test_tsk_thread_flag (new,TIF_DEBUG ))) +arch_install_thread_hw_breakpoint (new); +#else if (unlikely (__get_cpu_var (current_dabr) != new->thread.dabr))set_dabr (new->thread.dabr); +#endif /* CONFIG_PPC64 */ #if defined(CONFIG_BOOKE )/* If new thread DAC (HW breakpoint) is the same then leave it */ @@ -550,6 +558,10 @@ void show_regs(struct pt_regs * regs)void exit_thread (void ) {discard_lazy_cpu_state (); +#ifdef CONFIG_PPC64 +if (unlikely (test_tsk_thread_flag (current,TIF_DEBUG ))) +flush_thread_hw_breakpoint (current); +#endif /* CONFIG_PPC64 */ }void flush_thread (void )
arch/powerpc/kernel/process.c int copy_thread(unsigned long clone_flag · line 621
Quoted 5 lines
arch/powerpc/kernel/process.c +2
-0@@ -605,6 +617,9 @@ int copy_thread(unsigned long clone_flagstruct pt_regs *childregs, *kregs;extern void ret_from_fork (void );unsigned long sp = (unsigned long )task_stack_page (p) +THREAD_SIZE ; +#ifdef CONFIG_PPC64 +struct task_struct *tsk = current;
I don't see any point to adding this variable, just reference current directly below.
Quoted 14 lines
arch/powerpc/kernel/process.c +4
-0+#endif CHECK_FULL_REGS (regs);/* Copy registers */ @@ -672,6 +687,9 @@ int copy_thread(unsigned long clone_flag* function. */ kregs->nip = *((unsigned long *)ret_from_fork); + +if (unlikely (test_tsk_thread_flag (tsk,TIF_DEBUG ))) +copy_thread_hw_breakpoint (tsk, p, clone_flags);#else kregs->nip = (unsigned long )ret_from_fork;#endif
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
PATCH 5/6 Modify Data storage exception code to recognise DABR match first
In reply to a message not in the archiveModify Data storage exception code to first lookout for a DABR match before recognising a kprobe or xmon exception.
--- arch/powerpc/mm/fault.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
arch/powerpc/mm/fault.c +6 -8
@@ -137,6 +137,12 @@ int __kprobes do_page_fault(struct pt_re error_code &=0x48200000 ; else is_write = error_code &DSISR_ISSTORE ; + +if (error_code &DSISR_DABRMATCH ) { +/* DABR match */ +do_dabr (regs, address, error_code); +return 0 ; + }#else is_write = error_code &ESR_DST ;#endif /* CONFIG_4xx || CONFIG_BOOKE */
@@ -151,14 +157,6 @@ int __kprobes do_page_fault(struct pt_reif (!user_mode (regs) && (address >=TASK_SIZE ))return SIGSEGV ; -#if !(defined(CONFIG_4xx) || defined(CONFIG_BOOKE )) -if (error_code &DSISR_DABRMATCH ) { -/* DABR match */ -do_dabr (regs, address, error_code); -return 0 ; - } -#endif /* !(CONFIG_4xx || CONFIG_BOOKE)*/ -if (in_atomic () || mm ==NULL ) {if (!user_mode (regs))return SIGSEGV ;
PATCH 6/6 Adapt kexec and samples code to recognise PPC64 hardware breakpoint usage
In reply to a message not in the archiveModify kexec code to disable DABR registers before a reboot. Adapt the samples code to populate PPC64-arch specific fields.
--- arch/powerpc/kernel/machine_kexec_64.c | 3 +++ samples/hw_breakpoint/data_breakpoint.c | 4 ++++ 2 files changed, 7 insertions(+)
arch/powerpc/kernel/machine_kexec_64.c +3 -0
@@ -24,6 +24,7 @@#include <asm/sections.h> /* _end */ #include <asm/prom.h> #include <asm/smp.h> +#include <asm/hw_breakpoint.h> int default_machine_kexec_prepare (struct kimage *image) {
@@ -214,6 +215,7 @@ static void kexec_prepare_cpus(void)put_cpu ();local_irq_disable (); + hw_breakpoint_disable(); }#else /* ! SMP */
@@ -233,6 +235,7 @@ static void kexec_prepare_cpus(void)if (ppc_md.kexec_cpu_down) ppc_md.kexec_cpu_down (0 ,0 );local_irq_disable (); + hw_breakpoint_disable(); }#endif /* SMP */
samples/hw_breakpoint/data_breakpoint.c +4 -0
@@ -54,6 +54,10 @@ static int __init hw_break_module_init(v sample_hbp.info.type =HW_BREAKPOINT_WRITE ; sample_hbp.info.len =HW_BREAKPOINT_LEN_4 ;#endif /* CONFIG_X86 */ +#ifdef CONFIG_PPC64 + sample_hbp.info.name = ksym_name; + sample_hbp.info.type =HW_BREAKPOINT_WRITE ; +#endif /* CONFIG_PPC64 */ sample_hbp.triggered = (void *)sample_hbp_handler;