forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

perf: Disable PERF_SAMPLE_BRANCH_* when not supported

Browse source 
PERF_SAMPLE_BRANCH_* is disabled for:

 - SW events (sw counters, tracepoints)
 - HW breakpoints
 - ALL but Intel x86 architecture
 - AMD64 processors

Signed-off-by: Stephane Eranian <eranian@google.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1328826068-11713-10-git-send-email-eranian@google.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Stephane Eranian 2012-02-09 23:20:59 +01:00 • committed by Ingo Molnar
commit 2481c5fa6d
9 changed files with 57 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
arch/alpha/kernel/perf_event.c
View file

@ -685,6 +685,10 @@ static int alpha_pmu_event_init(struct perf_event *event)
{ {
int err; int err;
/* does not support taken branch sampling */
if (has_branch_stack(event))
return -EOPNOTSUPP;
switch (event->attr.type) { switch (event->attr.type) {
case PERF_TYPE_RAW: case PERF_TYPE_RAW:
case PERF_TYPE_HARDWARE: case PERF_TYPE_HARDWARE:

4
arch/arm/kernel/perf_event.c
View file

@ -539,6 +539,10 @@ static int armpmu_event_init(struct perf_event *event)
int err = 0; int err = 0;
atomic_t *active_events = &armpmu->active_events; atomic_t *active_events = &armpmu->active_events;
/* does not support taken branch sampling */
if (has_branch_stack(event))
return -EOPNOTSUPP;
if (armpmu->map_event(event) == -ENOENT) if (armpmu->map_event(event) == -ENOENT)
return -ENOENT; return -ENOENT;

4
arch/mips/kernel/perf_event_mipsxx.c
View file

@ -606,6 +606,10 @@ static int mipspmu_event_init(struct perf_event *event)
{ {
int err = 0; int err = 0;
/* does not support taken branch sampling */
if (has_branch_stack(event))
return -EOPNOTSUPP;
switch (event->attr.type) { switch (event->attr.type) {
case PERF_TYPE_RAW: case PERF_TYPE_RAW:
case PERF_TYPE_HARDWARE: case PERF_TYPE_HARDWARE:

4
arch/powerpc/kernel/perf_event.c
View file

@ -1084,6 +1084,10 @@ static int power_pmu_event_init(struct perf_event *event)
if (!ppmu) if (!ppmu)
return -ENOENT; return -ENOENT;
/* does not support taken branch sampling */
if (has_branch_stack(event))
return -EOPNOTSUPP;
switch (event->attr.type) { switch (event->attr.type) {
case PERF_TYPE_HARDWARE: case PERF_TYPE_HARDWARE:
ev = event->attr.config; ev = event->attr.config;

4
arch/sh/kernel/perf_event.c
View file

@ -310,6 +310,10 @@ static int sh_pmu_event_init(struct perf_event *event)
{ {
int err; int err;
/* does not support taken branch sampling */
if (has_branch_stack(event))
return -EOPNOTSUPP;
switch (event->attr.type) { switch (event->attr.type) {
case PERF_TYPE_RAW: case PERF_TYPE_RAW:
case PERF_TYPE_HW_CACHE: case PERF_TYPE_HW_CACHE:

4
arch/sparc/kernel/perf_event.c
View file

@ -1105,6 +1105,10 @@ static int sparc_pmu_event_init(struct perf_event *event)
if (atomic_read(&nmi_active) < 0) if (atomic_read(&nmi_active) < 0)
return -ENODEV; return -ENODEV;
/* does not support taken branch sampling */
if (has_branch_stack(event))
return -EOPNOTSUPP;
switch (attr->type) { switch (attr->type) {
case PERF_TYPE_HARDWARE: case PERF_TYPE_HARDWARE:
if (attr->config >= sparc_pmu->max_events) if (attr->config >= sparc_pmu->max_events)

3
arch/x86/kernel/cpu/perf_event_amd.c
View file

@ -139,6 +139,9 @@ static int amd_pmu_hw_config(struct perf_event *event)
if (ret) if (ret)
return ret; return ret;
if (has_branch_stack(event))
return -EOPNOTSUPP;
if (event->attr.exclude_host && event->attr.exclude_guest) if (event->attr.exclude_host && event->attr.exclude_guest)
/* /*
* When HO == GO == 1 the hardware treats that as GO == HO == 0 * When HO == GO == 1 the hardware treats that as GO == HO == 0

24
kernel/events/core.c
View file

@ -5044,6 +5044,12 @@ static int perf_swevent_init(struct perf_event *event)
if (event->attr.type != PERF_TYPE_SOFTWARE) if (event->attr.type != PERF_TYPE_SOFTWARE)
return -ENOENT; return -ENOENT;
/*
* no branch sampling for software events
*/
if (has_branch_stack(event))
return -EOPNOTSUPP;
switch (event_id) { switch (event_id) {
case PERF_COUNT_SW_CPU_CLOCK: case PERF_COUNT_SW_CPU_CLOCK:
case PERF_COUNT_SW_TASK_CLOCK: case PERF_COUNT_SW_TASK_CLOCK:
@ -5154,6 +5160,12 @@ static int perf_tp_event_init(struct perf_event *event)
if (event->attr.type != PERF_TYPE_TRACEPOINT) if (event->attr.type != PERF_TYPE_TRACEPOINT)
return -ENOENT; return -ENOENT;
/*
* no branch sampling for tracepoint events
*/
if (has_branch_stack(event))
return -EOPNOTSUPP;
err = perf_trace_init(event); err = perf_trace_init(event);
if (err) if (err)
return err; return err;
@ -5379,6 +5391,12 @@ static int cpu_clock_event_init(struct perf_event *event)
if (event->attr.config != PERF_COUNT_SW_CPU_CLOCK) if (event->attr.config != PERF_COUNT_SW_CPU_CLOCK)
return -ENOENT; return -ENOENT;
/*
* no branch sampling for software events
*/
if (has_branch_stack(event))
return -EOPNOTSUPP;
perf_swevent_init_hrtimer(event); perf_swevent_init_hrtimer(event);
return 0; return 0;
@ -5453,6 +5471,12 @@ static int task_clock_event_init(struct perf_event *event)
if (event->attr.config != PERF_COUNT_SW_TASK_CLOCK) if (event->attr.config != PERF_COUNT_SW_TASK_CLOCK)
return -ENOENT; return -ENOENT;
/*
* no branch sampling for software events
*/
if (has_branch_stack(event))
return -EOPNOTSUPP;
perf_swevent_init_hrtimer(event); perf_swevent_init_hrtimer(event);
return 0; return 0;

6
kernel/events/hw_breakpoint.c
View file

@ -581,6 +581,12 @@ static int hw_breakpoint_event_init(struct perf_event *bp)
if (bp->attr.type != PERF_TYPE_BREAKPOINT) if (bp->attr.type != PERF_TYPE_BREAKPOINT)
return -ENOENT; return -ENOENT;
/*
* no branch sampling for breakpoint events
*/
if (has_branch_stack(bp))
return -EOPNOTSUPP;
err = register_perf_hw_breakpoint(bp); err = register_perf_hw_breakpoint(bp);
if (err) if (err)
return err; return err;