Commit bca1a5c0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull perf updates from Ingo Molnar:
 "The biggest changes are Intel Nehalem-EX PMU uncore support, uprobes
  updates/cleanups/fixes from Oleg and diverse tooling updates (mostly
  fixes) now that Arnaldo is back from vacation."

* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (40 commits)
  uprobes: __replace_page() needs munlock_vma_page()
  uprobes: Rename vma_address() and make it return "unsigned long"
  uprobes: Fix register_for_each_vma()->vma_address() check
  uprobes: Introduce vaddr_to_offset(vma, vaddr)
  uprobes: Teach build_probe_list() to consider the range
  uprobes: Remove insert_vm_struct()->uprobe_mmap()
  uprobes: Remove copy_vma()->uprobe_mmap()
  uprobes: Fix overflow in vma_address()/find_active_uprobe()
  uprobes: Suppress uprobe_munmap() from mmput()
  uprobes: Uprobe_mmap/munmap needs list_for_each_entry_safe()
  uprobes: Clean up and document write_opcode()->lock_page(old_page)
  uprobes: Kill write_opcode()->lock_page(new_page)
  uprobes: __replace_page() should not use page_address_in_vma()
  uprobes: Don't recheck vma/f_mapping in write_opcode()
  perf/x86: Fix missing struct before structure name
  perf/x86: Fix format definition of SNB-EP uncore QPI box
  perf/x86: Make bitfield unsigned
  perf/x86: Fix LLC-* and node-* events on Intel SandyBridge
  perf/x86: Add Intel Nehalem-EX uncore support
  perf/x86: Fix typo in format definition of uncore PCU filter
  ...
parents ec7a19bf 194f8dcb

arch/x86/include/asm/perf_event.h

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ extern struct perf_guest_switch_msr *perf_guest_get_msrs(int *nr); 
extern void perf_get_x86_pmu_capability(struct x86_pmu_capability *cap);

extern void perf_check_microcode(void);

#else

static inline perf_guest_switch_msr *perf_guest_get_msrs(int *nr)

static inline struct perf_guest_switch_msr *perf_guest_get_msrs(int *nr)

{

	*nr = 0;

	return NULL;

arch/x86/kernel/cpu/perf_event.h

+1 −1
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ struct x86_pmu { 
	/*

	 * Intel DebugStore bits

	 */

	int		bts		:1,

	unsigned int	bts		:1,

			bts_active	:1,

			pebs		:1,

			pebs_active	:1,

arch/x86/kernel/cpu/perf_event_intel.c

+86 −6
Original line number Diff line number Diff line
@@ -138,6 +138,84 @@ static u64 intel_pmu_event_map(int hw_event) 
	return intel_perfmon_event_map[hw_event];

}



#define SNB_DMND_DATA_RD	(1ULL << 0)

#define SNB_DMND_RFO		(1ULL << 1)

#define SNB_DMND_IFETCH		(1ULL << 2)

#define SNB_DMND_WB		(1ULL << 3)

#define SNB_PF_DATA_RD		(1ULL << 4)

#define SNB_PF_RFO		(1ULL << 5)

#define SNB_PF_IFETCH		(1ULL << 6)

#define SNB_LLC_DATA_RD		(1ULL << 7)

#define SNB_LLC_RFO		(1ULL << 8)

#define SNB_LLC_IFETCH		(1ULL << 9)

#define SNB_BUS_LOCKS		(1ULL << 10)

#define SNB_STRM_ST		(1ULL << 11)

#define SNB_OTHER		(1ULL << 15)

#define SNB_RESP_ANY		(1ULL << 16)

#define SNB_NO_SUPP		(1ULL << 17)

#define SNB_LLC_HITM		(1ULL << 18)

#define SNB_LLC_HITE		(1ULL << 19)

#define SNB_LLC_HITS		(1ULL << 20)

#define SNB_LLC_HITF		(1ULL << 21)

#define SNB_LOCAL		(1ULL << 22)

#define SNB_REMOTE		(0xffULL << 23)

#define SNB_SNP_NONE		(1ULL << 31)

#define SNB_SNP_NOT_NEEDED	(1ULL << 32)

#define SNB_SNP_MISS		(1ULL << 33)

#define SNB_NO_FWD		(1ULL << 34)

#define SNB_SNP_FWD		(1ULL << 35)

#define SNB_HITM		(1ULL << 36)

#define SNB_NON_DRAM		(1ULL << 37)



#define SNB_DMND_READ		(SNB_DMND_DATA_RD|SNB_LLC_DATA_RD)

#define SNB_DMND_WRITE		(SNB_DMND_RFO|SNB_LLC_RFO)

#define SNB_DMND_PREFETCH	(SNB_PF_DATA_RD|SNB_PF_RFO)



#define SNB_SNP_ANY		(SNB_SNP_NONE|SNB_SNP_NOT_NEEDED| \

				 SNB_SNP_MISS|SNB_NO_FWD|SNB_SNP_FWD| \

				 SNB_HITM)



#define SNB_DRAM_ANY		(SNB_LOCAL|SNB_REMOTE|SNB_SNP_ANY)

#define SNB_DRAM_REMOTE		(SNB_REMOTE|SNB_SNP_ANY)



#define SNB_L3_ACCESS		SNB_RESP_ANY

#define SNB_L3_MISS		(SNB_DRAM_ANY|SNB_NON_DRAM)



static __initconst const u64 snb_hw_cache_extra_regs

				[PERF_COUNT_HW_CACHE_MAX]

				[PERF_COUNT_HW_CACHE_OP_MAX]

				[PERF_COUNT_HW_CACHE_RESULT_MAX] =

{

 [ C(LL  ) ] = {

	[ C(OP_READ) ] = {

		[ C(RESULT_ACCESS) ] = SNB_DMND_READ|SNB_L3_ACCESS,

		[ C(RESULT_MISS)   ] = SNB_DMND_READ|SNB_L3_MISS,

	},

	[ C(OP_WRITE) ] = {

		[ C(RESULT_ACCESS) ] = SNB_DMND_WRITE|SNB_L3_ACCESS,

		[ C(RESULT_MISS)   ] = SNB_DMND_WRITE|SNB_L3_MISS,

	},

	[ C(OP_PREFETCH) ] = {

		[ C(RESULT_ACCESS) ] = SNB_DMND_PREFETCH|SNB_L3_ACCESS,

		[ C(RESULT_MISS)   ] = SNB_DMND_PREFETCH|SNB_L3_MISS,

	},

 },

 [ C(NODE) ] = {

	[ C(OP_READ) ] = {

		[ C(RESULT_ACCESS) ] = SNB_DMND_READ|SNB_DRAM_ANY,

		[ C(RESULT_MISS)   ] = SNB_DMND_READ|SNB_DRAM_REMOTE,

	},

	[ C(OP_WRITE) ] = {

		[ C(RESULT_ACCESS) ] = SNB_DMND_WRITE|SNB_DRAM_ANY,

		[ C(RESULT_MISS)   ] = SNB_DMND_WRITE|SNB_DRAM_REMOTE,

	},

	[ C(OP_PREFETCH) ] = {

		[ C(RESULT_ACCESS) ] = SNB_DMND_PREFETCH|SNB_DRAM_ANY,

		[ C(RESULT_MISS)   ] = SNB_DMND_PREFETCH|SNB_DRAM_REMOTE,

	},

 },

};



static __initconst const u64 snb_hw_cache_event_ids

				[PERF_COUNT_HW_CACHE_MAX]

				[PERF_COUNT_HW_CACHE_OP_MAX]
@@ -235,16 +313,16 @@ static __initconst const u64 snb_hw_cache_event_ids 
 },

 [ C(NODE) ] = {

	[ C(OP_READ) ] = {

		[ C(RESULT_ACCESS) ] = -1,

		[ C(RESULT_MISS)   ] = -1,

		[ C(RESULT_ACCESS) ] = 0x01b7,

		[ C(RESULT_MISS)   ] = 0x01b7,

	},

	[ C(OP_WRITE) ] = {

		[ C(RESULT_ACCESS) ] = -1,

		[ C(RESULT_MISS)   ] = -1,

		[ C(RESULT_ACCESS) ] = 0x01b7,

		[ C(RESULT_MISS)   ] = 0x01b7,

	},

	[ C(OP_PREFETCH) ] = {

		[ C(RESULT_ACCESS) ] = -1,

		[ C(RESULT_MISS)   ] = -1,

		[ C(RESULT_ACCESS) ] = 0x01b7,

		[ C(RESULT_MISS)   ] = 0x01b7,

	},

 },
@@ -1964,6 +2042,8 @@ __init int intel_pmu_init(void) 
	case 58: /* IvyBridge */

		memcpy(hw_cache_event_ids, snb_hw_cache_event_ids,

		       sizeof(hw_cache_event_ids));

		memcpy(hw_cache_extra_regs, snb_hw_cache_extra_regs,

		       sizeof(hw_cache_extra_regs));



		intel_pmu_lbr_init_snb();

CRA Git | Maintained and supported by SUSTech CRA and CCSE