Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

Pull perf updates and fixes from Ingo Molnar:
 "It's mostly fixes, but there's also two late items:

   - preliminary GTK GUI support for perf report
   - PMU raw event format descriptors in sysfs, to be parsed by tooling

  The raw event format in sysfs is a new ABI.  For example for the 'CPU'
  PMU we have:

    aldebaran:~> ll /sys/bus/event_source/devices/cpu/format/*
    -r--r--r--. 1 root root 4096 Mar 31 10:29 /sys/bus/event_source/devices/cpu/format/any
    -r--r--r--. 1 root root 4096 Mar 31 10:29 /sys/bus/event_source/devices/cpu/format/cmask
    -r--r--r--. 1 root root 4096 Mar 31 10:29 /sys/bus/event_source/devices/cpu/format/edge
    -r--r--r--. 1 root root 4096 Mar 31 10:29 /sys/bus/event_source/devices/cpu/format/event
    -r--r--r--. 1 root root 4096 Mar 31 10:29 /sys/bus/event_source/devices/cpu/format/inv
    -r--r--r--. 1 root root 4096 Mar 31 10:29 /sys/bus/event_source/devices/cpu/format/offcore_rsp
    -r--r--r--. 1 root root 4096 Mar 31 10:29 /sys/bus/event_source/devices/cpu/format/pc
    -r--r--r--. 1 root root 4096 Mar 31 10:29 /sys/bus/event_source/devices/cpu/format/umask

  those lists of fields contain a specific format:

    aldebaran:~> cat /sys/bus/event_source/devices/cpu/format/offcore_rsp
    config1:0-63

  So, those who wish to specify raw events can now use the following
  event format:

    -e cpu/cmask=1,event=2,umask=3

  Most people will not want to specify any events (let alone raw
  events), they'll just use whatever default event the tools use.

  But for more obscure PMU events that have no cross-architecture
  generic events the above syntax is more usable and a bit more
  structured than specifying hex numbers."

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (41 commits)
  perf tools: Remove auto-generated bison/flex files
  perf annotate: Fix off by one symbol hist size allocation and hit accounting
  perf tools: Add missing ref-cycles event back to event parser
  perf annotate: addr2line wants addresses in same format as objdump
  perf probe: Finder fails to resolve function name to address
  tracing: Fix ent_size in trace output
  perf symbols: Handle NULL dso in dso__name_len
  perf symbols: Do not include libgen.h
  perf tools: Fix bug in raw sample parsing
  perf tools: Fix display of first level of callchains
  perf tools: Switch module.h into export.h
  perf: Move mmap page data_head offset assertion out of header
  perf: Fix mmap_page capabilities and docs
  perf diff: Fix to work with new hists design
  perf tools: Fix modifier to be applied on correct events
  perf tools: Fix various casting issues for 32 bits
  perf tools: Simplify event_read_id exit path
  tracing: Fix ftrace stack trace entries
  tracing: Move the tracing_on/off() declarations into CONFIG_TRACING
  perf report: Add a simple GTK2-based 'perf report' browser
  ...
parents adb3b1f3 8ebfdf2b

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

0 → 100644
+14 −0
Original line number Diff line number Diff line 
Where:		/sys/bus/event_source/devices/<dev>/format

Date:		January 2012

Kernel Version: 3.3

Contact:	Jiri Olsa <jolsa@redhat.com>

Description:

		Attribute group to describe the magic bits that go into

		perf_event_attr::config[012] for a particular pmu.

		Each attribute of this group defines the 'hardware' bitmask

		we want to export, so that userspace can deal with sane

		name/value pairs.



		Example: 'config1:1,6-10,44'

		Defines contents of attribute that occupies bits 1,6-10,44 of

		perf_event_attr::config1.

arch/x86/kernel/cpu/perf_event.c

+16 −1
Original line number Diff line number Diff line
@@ -1313,6 +1313,11 @@ static void __init pmu_check_apic(void) 
	pr_info("no hardware sampling interrupt available.\n");

}



static struct attribute_group x86_pmu_format_group = {

	.name = "format",

	.attrs = NULL,

};



static int __init init_hw_perf_events(void)

{

	struct x86_pmu_quirk *quirk;
@@ -1387,6 +1392,7 @@ static int __init init_hw_perf_events(void) 
	}



	x86_pmu.attr_rdpmc = 1; /* enable userspace RDPMC usage by default */

	x86_pmu_format_group.attrs = x86_pmu.format_attrs;



	pr_info("... version:                %d\n",     x86_pmu.version);

	pr_info("... bit width:              %d\n",     x86_pmu.cntval_bits);
@@ -1615,6 +1621,9 @@ static int x86_pmu_event_idx(struct perf_event *event) 
{

	int idx = event->hw.idx;



	if (!x86_pmu.attr_rdpmc)

		return 0;



	if (x86_pmu.num_counters_fixed && idx >= X86_PMC_IDX_FIXED) {

		idx -= X86_PMC_IDX_FIXED;

		idx |= 1 << 30;
@@ -1667,6 +1676,7 @@ static struct attribute_group x86_pmu_attr_group = { 


static const struct attribute_group *x86_pmu_attr_groups[] = {

	&x86_pmu_attr_group,

	&x86_pmu_format_group,

	NULL,

};
@@ -1698,14 +1708,19 @@ static struct pmu pmu = { 
	.flush_branch_stack	= x86_pmu_flush_branch_stack,

};



void perf_update_user_clock(struct perf_event_mmap_page *userpg, u64 now)

void arch_perf_update_userpage(struct perf_event_mmap_page *userpg, u64 now)

{

	userpg->cap_usr_time = 0;

	userpg->cap_usr_rdpmc = x86_pmu.attr_rdpmc;

	userpg->pmc_width = x86_pmu.cntval_bits;



	if (!boot_cpu_has(X86_FEATURE_CONSTANT_TSC))

		return;



	if (!boot_cpu_has(X86_FEATURE_NONSTOP_TSC))

		return;



	userpg->cap_usr_time = 1;

	userpg->time_mult = this_cpu_read(cyc2ns);

	userpg->time_shift = CYC2NS_SCALE_FACTOR;

	userpg->time_offset = this_cpu_read(cyc2ns_offset) - now;

arch/x86/kernel/cpu/perf_event.h

+1 −0
Original line number Diff line number Diff line
@@ -339,6 +339,7 @@ struct x86_pmu { 
	 * sysfs attrs

	 */

	int		attr_rdpmc;

	struct attribute **format_attrs;



	/*

	 * CPU Hotplug hooks

arch/x86/kernel/cpu/perf_event_amd.c

+18 −0
Original line number Diff line number Diff line
@@ -404,6 +404,21 @@ static void amd_pmu_cpu_dead(int cpu) 
	}

}



PMU_FORMAT_ATTR(event,	"config:0-7,32-35");

PMU_FORMAT_ATTR(umask,	"config:8-15"	);

PMU_FORMAT_ATTR(edge,	"config:18"	);

PMU_FORMAT_ATTR(inv,	"config:23"	);

PMU_FORMAT_ATTR(cmask,	"config:24-31"	);



static struct attribute *amd_format_attr[] = {

	&format_attr_event.attr,

	&format_attr_umask.attr,

	&format_attr_edge.attr,

	&format_attr_inv.attr,

	&format_attr_cmask.attr,

	NULL,

};



static __initconst const struct x86_pmu amd_pmu = {

	.name			= "AMD",

	.handle_irq		= x86_pmu_handle_irq,
@@ -426,6 +441,8 @@ static __initconst const struct x86_pmu amd_pmu = { 
	.get_event_constraints	= amd_get_event_constraints,

	.put_event_constraints	= amd_put_event_constraints,



	.format_attrs		= amd_format_attr,



	.cpu_prepare		= amd_pmu_cpu_prepare,

	.cpu_starting		= amd_pmu_cpu_starting,

	.cpu_dead		= amd_pmu_cpu_dead,
@@ -596,6 +613,7 @@ static __initconst const struct x86_pmu amd_pmu_f15h = { 
	.cpu_dead		= amd_pmu_cpu_dead,

#endif

	.cpu_starting		= amd_pmu_cpu_starting,

	.format_attrs		= amd_format_attr,

};



__init int amd_pmu_init(void)

arch/x86/kernel/cpu/perf_event_intel.c

+36 −0
Original line number Diff line number Diff line
@@ -1431,6 +1431,24 @@ static void core_pmu_enable_all(int added) 
	}

}



PMU_FORMAT_ATTR(event,	"config:0-7"	);

PMU_FORMAT_ATTR(umask,	"config:8-15"	);

PMU_FORMAT_ATTR(edge,	"config:18"	);

PMU_FORMAT_ATTR(pc,	"config:19"	);

PMU_FORMAT_ATTR(any,	"config:21"	); /* v3 + */

PMU_FORMAT_ATTR(inv,	"config:23"	);

PMU_FORMAT_ATTR(cmask,	"config:24-31"	);



static struct attribute *intel_arch_formats_attr[] = {

	&format_attr_event.attr,

	&format_attr_umask.attr,

	&format_attr_edge.attr,

	&format_attr_pc.attr,

	&format_attr_inv.attr,

	&format_attr_cmask.attr,

	NULL,

};



static __initconst const struct x86_pmu core_pmu = {

	.name			= "core",

	.handle_irq		= x86_pmu_handle_irq,
@@ -1455,6 +1473,7 @@ static __initconst const struct x86_pmu core_pmu = { 
	.put_event_constraints	= intel_put_event_constraints,

	.event_constraints	= intel_core_event_constraints,

	.guest_get_msrs		= core_guest_get_msrs,

	.format_attrs		= intel_arch_formats_attr,

};



struct intel_shared_regs *allocate_shared_regs(int cpu)
@@ -1553,6 +1572,21 @@ static void intel_pmu_flush_branch_stack(void) 
		intel_pmu_lbr_reset();

}



PMU_FORMAT_ATTR(offcore_rsp, "config1:0-63");



static struct attribute *intel_arch3_formats_attr[] = {

	&format_attr_event.attr,

	&format_attr_umask.attr,

	&format_attr_edge.attr,

	&format_attr_pc.attr,

	&format_attr_any.attr,

	&format_attr_inv.attr,

	&format_attr_cmask.attr,



	&format_attr_offcore_rsp.attr, /* XXX do NHM/WSM + SNB breakout */

	NULL,

};



static __initconst const struct x86_pmu intel_pmu = {

	.name			= "Intel",

	.handle_irq		= intel_pmu_handle_irq,
@@ -1576,6 +1610,8 @@ static __initconst const struct x86_pmu intel_pmu = { 
	.get_event_constraints	= intel_get_event_constraints,

	.put_event_constraints	= intel_put_event_constraints,



	.format_attrs		= intel_arch3_formats_attr,



	.cpu_prepare		= intel_pmu_cpu_prepare,

	.cpu_starting		= intel_pmu_cpu_starting,

	.cpu_dying		= intel_pmu_cpu_dying,