Messages in this thread | | | Date | Fri, 27 Jan 2012 10:56:45 +0100 | Subject | Re: [PATCH 09/13] perf_events: disable PERF_SAMPLE_BRANCH_* when not supported (v3) | From | Stephane Eranian <> |
| |
On Fri, Jan 27, 2012 at 8:15 AM, Anshuman Khandual <khandual@linux.vnet.ibm.com> wrote: > On Monday 09 January 2012 10:19 PM, Stephane Eranian wrote: >> 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> >> --- >> arch/alpha/kernel/perf_event.c | 4 ++++ >> arch/arm/kernel/perf_event.c | 4 ++++ >> arch/mips/kernel/perf_event_mipsxx.c | 4 ++++ >> arch/powerpc/kernel/perf_event.c | 4 ++++ >> arch/sh/kernel/perf_event.c | 4 ++++ >> arch/sparc/kernel/perf_event.c | 4 ++++ >> arch/x86/kernel/cpu/perf_event_amd.c | 3 +++ >> kernel/events/core.c | 24 ++++++++++++++++++++++++ >> kernel/events/hw_breakpoint.c | 6 ++++++ >> 9 files changed, 57 insertions(+), 0 deletions(-) >> >> diff --git a/arch/alpha/kernel/perf_event.c b/arch/alpha/kernel/perf_event.c >> index 8143cd7..0dae252 100644 >> --- a/arch/alpha/kernel/perf_event.c >> +++ b/arch/alpha/kernel/perf_event.c >> @@ -685,6 +685,10 @@ static int alpha_pmu_event_init(struct perf_event *event) >> { >> int err; >> >> + /* does not support taken branch sampling */ >> + if (has_branch_stack(event)) >> + return -EOPNOTSUPP; >> + >> switch (event->attr.type) { >> case PERF_TYPE_RAW: >> case PERF_TYPE_HARDWARE: >> diff --git a/arch/arm/kernel/perf_event.c b/arch/arm/kernel/perf_event.c >> index 88b0941..42262ff 100644 >> --- a/arch/arm/kernel/perf_event.c >> +++ b/arch/arm/kernel/perf_event.c >> @@ -540,6 +540,10 @@ static int armpmu_event_init(struct perf_event *event) >> int err = 0; >> atomic_t *active_events = &armpmu->active_events; >> >> + /* does not support taken branch sampling */ >> + if (has_branch_smpl(event)) > I guess this would be 'has_branch_stack' instead of 'has_branch_smpl'. > 'has_branch_smpl' has not been defined any where but getting called here.
Good catch. Will post a patch to fix that.
>> + return -EOPNOTSUPP; >> + >> if (armpmu->map_event(event) == -ENOENT) >> return -ENOENT; >> >> diff --git a/arch/mips/kernel/perf_event_mipsxx.c b/arch/mips/kernel/perf_event_mipsxx.c >> index 315fc0b..7070f8c 100644 >> --- a/arch/mips/kernel/perf_event_mipsxx.c >> +++ b/arch/mips/kernel/perf_event_mipsxx.c >> @@ -606,6 +606,10 @@ static int mipspmu_event_init(struct perf_event *event) >> { >> int err = 0; >> >> + /* does not support taken branch sampling */ >> + if (has_branch_stack(event)) >> + return -EOPNOTSUPP; >> + >> switch (event->attr.type) { >> case PERF_TYPE_RAW: >> case PERF_TYPE_HARDWARE: >> diff --git a/arch/powerpc/kernel/perf_event.c b/arch/powerpc/kernel/perf_event.c >> index d614ab5..4e0b265 100644 >> --- a/arch/powerpc/kernel/perf_event.c >> +++ b/arch/powerpc/kernel/perf_event.c >> @@ -1078,6 +1078,10 @@ static int power_pmu_event_init(struct perf_event *event) >> if (!ppmu) >> return -ENOENT; >> >> + /* does not support taken branch sampling */ >> + if (has_branch_stack(event)) >> + return -EOPNOTSUPP; >> + >> switch (event->attr.type) { >> case PERF_TYPE_HARDWARE: >> ev = event->attr.config; >> diff --git a/arch/sh/kernel/perf_event.c b/arch/sh/kernel/perf_event.c >> index 10b14e3..068b8a2 100644 >> --- a/arch/sh/kernel/perf_event.c >> +++ b/arch/sh/kernel/perf_event.c >> @@ -310,6 +310,10 @@ static int sh_pmu_event_init(struct perf_event *event) >> { >> int err; >> >> + /* does not support taken branch sampling */ >> + if (has_branch_stack(event)) >> + return -EOPNOTSUPP; >> + >> switch (event->attr.type) { >> case PERF_TYPE_RAW: >> case PERF_TYPE_HW_CACHE: >> diff --git a/arch/sparc/kernel/perf_event.c b/arch/sparc/kernel/perf_event.c >> index 614da62..8e16a4a 100644 >> --- a/arch/sparc/kernel/perf_event.c >> +++ b/arch/sparc/kernel/perf_event.c >> @@ -1105,6 +1105,10 @@ static int sparc_pmu_event_init(struct perf_event *event) >> if (atomic_read(&nmi_active) < 0) >> return -ENODEV; >> >> + /* does not support taken branch sampling */ >> + if (has_branch_stack(event)) >> + return -EOPNOTSUPP; >> + >> switch (attr->type) { >> case PERF_TYPE_HARDWARE: >> if (attr->config >= sparc_pmu->max_events) >> diff --git a/arch/x86/kernel/cpu/perf_event_amd.c b/arch/x86/kernel/cpu/perf_event_amd.c >> index 0397b23..0d8da03 100644 >> --- a/arch/x86/kernel/cpu/perf_event_amd.c >> +++ b/arch/x86/kernel/cpu/perf_event_amd.c >> @@ -138,6 +138,9 @@ static int amd_pmu_hw_config(struct perf_event *event) >> if (ret) >> return ret; >> >> + if (has_branch_stack(event)) >> + return -EOPNOTSUPP; >> + >> if (event->attr.exclude_host && event->attr.exclude_guest) >> /* >> * When HO == GO == 1 the hardware treats that as GO == HO == 0 >> diff --git a/kernel/events/core.c b/kernel/events/core.c >> index ed39225..36d1a63 100644 >> --- a/kernel/events/core.c >> +++ b/kernel/events/core.c >> @@ -5000,6 +5000,12 @@ static int perf_swevent_init(struct perf_event *event) >> if (event->attr.type != PERF_TYPE_SOFTWARE) >> return -ENOENT; >> >> + /* >> + * no branch sampling for software events >> + */ >> + if (has_branch_stack(event)) >> + return -EOPNOTSUPP; >> + >> switch (event_id) { >> case PERF_COUNT_SW_CPU_CLOCK: >> case PERF_COUNT_SW_TASK_CLOCK: >> @@ -5110,6 +5116,12 @@ static int perf_tp_event_init(struct perf_event *event) >> if (event->attr.type != PERF_TYPE_TRACEPOINT) >> return -ENOENT; >> >> + /* >> + * no branch sampling for tracepoint events >> + */ >> + if (has_branch_stack(event)) >> + return -EOPNOTSUPP; >> + >> err = perf_trace_init(event); >> if (err) >> return err; >> @@ -5335,6 +5347,12 @@ static int cpu_clock_event_init(struct perf_event *event) >> if (event->attr.config != PERF_COUNT_SW_CPU_CLOCK) >> return -ENOENT; >> >> + /* >> + * no branch sampling for software events >> + */ >> + if (has_branch_stack(event)) >> + return -EOPNOTSUPP; >> + >> perf_swevent_init_hrtimer(event); >> >> return 0; >> @@ -5409,6 +5427,12 @@ static int task_clock_event_init(struct perf_event *event) >> if (event->attr.config != PERF_COUNT_SW_TASK_CLOCK) >> return -ENOENT; >> >> + /* >> + * no branch sampling for software events >> + */ >> + if (has_branch_stack(event)) >> + return -EOPNOTSUPP; >> + >> perf_swevent_init_hrtimer(event); >> >> return 0; >> diff --git a/kernel/events/hw_breakpoint.c b/kernel/events/hw_breakpoint.c >> index b0309f7..cee5423 100644 >> --- a/kernel/events/hw_breakpoint.c >> +++ b/kernel/events/hw_breakpoint.c >> @@ -581,6 +581,12 @@ static int hw_breakpoint_event_init(struct perf_event *bp) >> if (bp->attr.type != PERF_TYPE_BREAKPOINT) >> return -ENOENT; >> >> + /* >> + * no branch sampling for breakpoint events >> + */ >> + if (has_branch_stack(bp)) >> + return -EOPNOTSUPP; >> + >> err = register_perf_hw_breakpoint(bp); >> if (err) >> return err; > > > -- > Linux Technology Centre > IBM Systems and Technology Group > Bangalore India > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |