Commit 96200591 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'tracing/hw-breakpoints' into perf/core 



Conflicts:
	arch/x86/kernel/kprobes.c
	kernel/trace/Makefile

Merge reason: hw-breakpoints perf integration is looking
              good in testing and in reviews, plus conflicts
              are mounting up - so merge & resolve.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 7031281e 68efa37d

arch/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -126,4 +126,11 @@ config HAVE_DMA_API_DEBUG 
config HAVE_DEFAULT_NO_SPIN_MUTEXES

	bool



config HAVE_HW_BREAKPOINT

	bool

	depends on HAVE_PERF_EVENTS

	select ANON_INODES

	select PERF_EVENTS





source "kernel/gcov/Kconfig"

arch/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ config X86 
	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_BZIP2

	select HAVE_KERNEL_LZMA

	select HAVE_HW_BREAKPOINT

	select HAVE_ARCH_KMEMCHECK



config OUTPUT_FORMAT

arch/x86/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ header-y += ptrace-abi.h 
header-y += sigcontext32.h

header-y += ucontext.h

header-y += processor-flags.h

header-y += hw_breakpoint.h



unifdef-y += e820.h

unifdef-y += ist.h

arch/x86/include/asm/a.out-core.h

+2 −8
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


#include <linux/user.h>

#include <linux/elfcore.h>

#include <asm/debugreg.h>



/*

 * fill in the user structure for an a.out core dump
@@ -32,14 +33,7 @@ static inline void aout_dump_thread(struct pt_regs *regs, struct user *dump) 
			>> PAGE_SHIFT;

	dump->u_dsize -= dump->u_tsize;

	dump->u_ssize = 0;

	dump->u_debugreg[0] = current->thread.debugreg0;

	dump->u_debugreg[1] = current->thread.debugreg1;

	dump->u_debugreg[2] = current->thread.debugreg2;

	dump->u_debugreg[3] = current->thread.debugreg3;

	dump->u_debugreg[4] = 0;

	dump->u_debugreg[5] = 0;

	dump->u_debugreg[6] = current->thread.debugreg6;

	dump->u_debugreg[7] = current->thread.debugreg7;

	aout_dump_debugregs(dump);



	if (dump->start_stack < TASK_SIZE)

		dump->u_ssize = ((unsigned long)(TASK_SIZE - dump->start_stack))

arch/x86/include/asm/debugreg.h

+33 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#define DR_TRAP1	(0x2)		/* db1 */

#define DR_TRAP2	(0x4)		/* db2 */

#define DR_TRAP3	(0x8)		/* db3 */

#define DR_TRAP_BITS	(DR_TRAP0|DR_TRAP1|DR_TRAP2|DR_TRAP3)



#define DR_STEP		(0x4000)	/* single-step */

#define DR_SWITCH	(0x8000)	/* task switch */
@@ -49,6 +50,8 @@ 


#define DR_LOCAL_ENABLE_SHIFT 0    /* Extra shift to the local enable bit */

#define DR_GLOBAL_ENABLE_SHIFT 1   /* Extra shift to the global enable bit */

#define DR_LOCAL_ENABLE (0x1)      /* Local enable for reg 0 */

#define DR_GLOBAL_ENABLE (0x2)     /* Global enable for reg 0 */

#define DR_ENABLE_SIZE 2           /* 2 enable bits per register */



#define DR_LOCAL_ENABLE_MASK (0x55)  /* Set  local bits for all 4 regs */
@@ -67,4 +70,34 @@ 
#define DR_LOCAL_SLOWDOWN (0x100)   /* Local slow the pipeline */

#define DR_GLOBAL_SLOWDOWN (0x200)  /* Global slow the pipeline */



/*

 * HW breakpoint additions

 */

#ifdef __KERNEL__



DECLARE_PER_CPU(unsigned long, dr7);



static inline void hw_breakpoint_disable(void)

{

	/* Zero the control register for HW Breakpoint */

	set_debugreg(0UL, 7);



	/* Zero-out the individual HW breakpoint address registers */

	set_debugreg(0UL, 0);

	set_debugreg(0UL, 1);

	set_debugreg(0UL, 2);

	set_debugreg(0UL, 3);

}



static inline int hw_breakpoint_active(void)

{

	return __get_cpu_var(dr7) & DR_GLOBAL_ENABLE_MASK;

}



extern void aout_dump_debugregs(struct user *dump);



extern void hw_breakpoint_restore(void);



#endif	/* __KERNEL__ */



#endif /* _ASM_X86_DEBUGREG_H */