Commit a4cbbf54 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:
 "Kernel side changes:

   - AMD range breakpoints support:

     Extend breakpoint tools and core to support address range through
     perf event with initial backend support for AMD extended
     breakpoints.

     The syntax is:

         perf record -e mem:addr/len:type

     For example set write breakpoint from 0x1000 to 0x1200 (0x1000 + 512)

         perf record -e mem:0x1000/512:w

   - event throttling/rotating fixes

   - various event group handling fixes, cleanups and general paranoia
     code to be more robust against bugs in the future.

    - kernel stack overhead fixes

  User-visible tooling side changes:

   - Show precise number of samples in at the end of a 'record' session,
     if processing build ids, since we will then traverse the whole
     perf.data file and see all the PERF_RECORD_SAMPLE records,
     otherwise stop showing the previous off-base heuristicly counted
     number of "samples" (Namhyung Kim).

   - Support to read compressed module from build-id cache (Namhyung
     Kim)

   - Enable sampling loads and stores simultaneously in 'perf mem'
     (Stephane Eranian)

   - 'perf diff' output improvements (Namhyung Kim)

   - Fix error reporting for evsel pgfault constructor (Arnaldo Carvalho
     de Melo)

  Tooling side infrastructure changes:

   - Cache eh/debug frame offset for dwarf unwind (Namhyung Kim)

   - Support parsing parameterized events (Cody P Schafer)

   - Add support for IP address formats in libtraceevent (David Ahern)

  Plus other misc fixes"

* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (48 commits)
  perf: Decouple unthrottling and rotating
  perf: Drop module reference on event init failure
  perf: Use POLLIN instead of POLL_IN for perf poll data in flag
  perf: Fix put_event() ctx lock
  perf: Fix move_group() order
  perf: Fix event->ctx locking
  perf: Add a bit of paranoia
  perf symbols: Convert lseek + read to pread
  perf tools: Use perf_data_file__fd() consistently
  perf symbols: Support to read compressed module from build-id cache
  perf evsel: Set attr.task bit for a tracking event
  perf header: Set header version correctly
  perf record: Show precise number of samples
  perf tools: Do not use __perf_session__process_events() directly
  perf callchain: Cache eh/debug frame offset for dwarf unwind
  perf tools: Provide stub for missing pthread_attr_setaffinity_np
  perf evsel: Don't rely on malloc working for sz 0
  tools lib traceevent: Add support for IP address formats
  perf ui/tui: Show fatal error message only if exists
  perf tests: Fix typo in sample-parsing.c
  ...
parents 8308756f 2fde4f94

Documentation/ABI/testing/sysfs-bus-event_source-devices-events

+6 −0
Original line number Diff line number Diff line
@@ -52,12 +52,18 @@ Description: Per-pmu performance monitoring events specific to the running syste 
			event=0x2abc

			event=0x423,inv,cmask=0x3

			domain=0x1,offset=0x8,starting_index=0xffff

			domain=0x1,offset=0x8,core=?



		Each of the assignments indicates a value to be assigned to a

		particular set of bits (as defined by the format file

		corresponding to the <term>) in the perf_event structure passed

		to the perf_open syscall.



		In the case of the last example, a value replacing "?" would

		need to be provided by the user selecting the particular event.

		This is referred to as "event parameterization". Event

		parameters have the format 'param=?'.



What: /sys/bus/event_source/devices/<pmu>/events/<event>.unit

Date: 2014/02/24

Contact:	Linux kernel mailing list <linux-kernel@vger.kernel.org>

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE