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

Merge branch 'perf/hw_breakpoints' into perf/core 



The new hw_breakpoint bits are now ready for v3.20, merge them
into the main branch, to avoid conflicts.

Conflicts:
	tools/perf/Documentation/perf-record.txt

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 29bf4dbc 2a2662bf

arch/x86/include/asm/cpufeature.h

+2 −0
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ 
#define X86_FEATURE_TOPOEXT	( 6*32+22) /* topology extensions CPUID leafs */

#define X86_FEATURE_PERFCTR_CORE ( 6*32+23) /* core performance counter extensions */

#define X86_FEATURE_PERFCTR_NB  ( 6*32+24) /* NB performance counter extensions */

#define X86_FEATURE_BPEXT	(6*32+26) /* data breakpoint extension */

#define X86_FEATURE_PERFCTR_L2	( 6*32+28) /* L2 performance counter extensions */



/*
@@ -388,6 +389,7 @@ extern const char * const x86_bug_flags[NBUGINTS*32]; 
#define cpu_has_cx16		boot_cpu_has(X86_FEATURE_CX16)

#define cpu_has_eager_fpu	boot_cpu_has(X86_FEATURE_EAGER_FPU)

#define cpu_has_topoext		boot_cpu_has(X86_FEATURE_TOPOEXT)

#define cpu_has_bpext		boot_cpu_has(X86_FEATURE_BPEXT)



#if __GNUC__ >= 4

extern void warn_pre_alternatives(void);

arch/x86/include/asm/debugreg.h

+5 −0
Original line number Diff line number Diff line
@@ -114,5 +114,10 @@ static inline void debug_stack_usage_inc(void) { } 
static inline void debug_stack_usage_dec(void) { }

#endif /* X86_64 */



#ifdef CONFIG_CPU_SUP_AMD

extern void set_dr_addr_mask(unsigned long mask, int dr);

#else

static inline void set_dr_addr_mask(unsigned long mask, int dr) { }

#endif



#endif /* _ASM_X86_DEBUGREG_H */

arch/x86/include/asm/hw_breakpoint.h

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
 */

struct arch_hw_breakpoint {

	unsigned long	address;

	unsigned long	mask;

	u8		len;

	u8		type;

};

arch/x86/include/uapi/asm/msr-index.h

+4 −0
Original line number Diff line number Diff line
@@ -251,6 +251,10 @@ 
/* Fam 16h MSRs */

#define MSR_F16H_L2I_PERF_CTL		0xc0010230

#define MSR_F16H_L2I_PERF_CTR		0xc0010231

#define MSR_F16H_DR1_ADDR_MASK		0xc0011019

#define MSR_F16H_DR2_ADDR_MASK		0xc001101a

#define MSR_F16H_DR3_ADDR_MASK		0xc001101b

#define MSR_F16H_DR0_ADDR_MASK		0xc0011027



/* Fam 15h MSRs */

#define MSR_F15H_PERF_CTL		0xc0010200

arch/x86/kernel/cpu/amd.c

+19 −0
Original line number Diff line number Diff line
@@ -869,3 +869,22 @@ static bool cpu_has_amd_erratum(struct cpuinfo_x86 *cpu, const int *erratum) 


	return false;

}



void set_dr_addr_mask(unsigned long mask, int dr)

{

	if (!cpu_has_bpext)

		return;



	switch (dr) {

	case 0:

		wrmsr(MSR_F16H_DR0_ADDR_MASK, mask, 0);

		break;

	case 1:

	case 2:

	case 3:

		wrmsr(MSR_F16H_DR1_ADDR_MASK - 1 + dr, mask, 0);

		break;

	default:

		break;

	}

}