diff options
| author | Stephane Eranian <eranian@googlemail.com> | 2009-10-06 10:42:08 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-10-09 09:56:10 -0400 |
| commit | 04a705df47d1ea27ca2b066f24b1951c51792d0d (patch) | |
| tree | cf4c9db5bd094a2b86b1ad1dd9bdb438aeb4f282 /arch | |
| parent | 26dd2cb074d9dc41c9e3cddd7bf175fd0a41febc (diff) | |
perf_events: Check for filters on fixed counter events
Intel fixed counters do not support all the filters possible with a
generic counter. Thus, if a fixed counter event is passed but with
certain filters set, then the fixed_mode_idx() function must fail
and the event must be measured in a generic counter instead.
Reject filters are: inv, edge, cnt-mask.
Signed-off-by: Stephane Eranian <eranian@gmail.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1254840129-6198-2-git-send-email-eranian@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/include/asm/perf_event.h | 13 | ||||
| -rw-r--r-- | arch/x86/kernel/cpu/perf_event.c | 6 |
2 files changed, 18 insertions, 1 deletions
diff --git a/arch/x86/include/asm/perf_event.h b/arch/x86/include/asm/perf_event.h index ad7ce3fd5065..8d9f8548a870 100644 --- a/arch/x86/include/asm/perf_event.h +++ b/arch/x86/include/asm/perf_event.h | |||
| @@ -28,9 +28,20 @@ | |||
| 28 | */ | 28 | */ |
| 29 | #define ARCH_PERFMON_EVENT_MASK 0xffff | 29 | #define ARCH_PERFMON_EVENT_MASK 0xffff |
| 30 | 30 | ||
| 31 | /* | ||
| 32 | * filter mask to validate fixed counter events. | ||
| 33 | * the following filters disqualify for fixed counters: | ||
| 34 | * - inv | ||
| 35 | * - edge | ||
| 36 | * - cnt-mask | ||
| 37 | * The other filters are supported by fixed counters. | ||
| 38 | * The any-thread option is supported starting with v3. | ||
| 39 | */ | ||
| 40 | #define ARCH_PERFMON_EVENT_FILTER_MASK 0xff840000 | ||
| 41 | |||
| 31 | #define ARCH_PERFMON_UNHALTED_CORE_CYCLES_SEL 0x3c | 42 | #define ARCH_PERFMON_UNHALTED_CORE_CYCLES_SEL 0x3c |
| 32 | #define ARCH_PERFMON_UNHALTED_CORE_CYCLES_UMASK (0x00 << 8) | 43 | #define ARCH_PERFMON_UNHALTED_CORE_CYCLES_UMASK (0x00 << 8) |
| 33 | #define ARCH_PERFMON_UNHALTED_CORE_CYCLES_INDEX 0 | 44 | #define ARCH_PERFMON_UNHALTED_CORE_CYCLES_INDEX 0 |
| 34 | #define ARCH_PERFMON_UNHALTED_CORE_CYCLES_PRESENT \ | 45 | #define ARCH_PERFMON_UNHALTED_CORE_CYCLES_PRESENT \ |
| 35 | (1 << (ARCH_PERFMON_UNHALTED_CORE_CYCLES_INDEX)) | 46 | (1 << (ARCH_PERFMON_UNHALTED_CORE_CYCLES_INDEX)) |
| 36 | 47 | ||
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c index b5801c311846..1d16bd69551e 100644 --- a/arch/x86/kernel/cpu/perf_event.c +++ b/arch/x86/kernel/cpu/perf_event.c | |||
| @@ -1349,6 +1349,12 @@ fixed_mode_idx(struct perf_event *event, struct hw_perf_event *hwc) | |||
| 1349 | if (!x86_pmu.num_events_fixed) | 1349 | if (!x86_pmu.num_events_fixed) |
| 1350 | return -1; | 1350 | return -1; |
| 1351 | 1351 | ||
| 1352 | /* | ||
| 1353 | * fixed counters do not take all possible filters | ||
| 1354 | */ | ||
| 1355 | if (hwc->config & ARCH_PERFMON_EVENT_FILTER_MASK) | ||
| 1356 | return -1; | ||
| 1357 | |||
| 1352 | if (unlikely(hw_event == x86_pmu.event_map(PERF_COUNT_HW_INSTRUCTIONS))) | 1358 | if (unlikely(hw_event == x86_pmu.event_map(PERF_COUNT_HW_INSTRUCTIONS))) |
| 1353 | return X86_PMC_IDX_FIXED_INSTRUCTIONS; | 1359 | return X86_PMC_IDX_FIXED_INSTRUCTIONS; |
| 1354 | if (unlikely(hw_event == x86_pmu.event_map(PERF_COUNT_HW_CPU_CYCLES))) | 1360 | if (unlikely(hw_event == x86_pmu.event_map(PERF_COUNT_HW_CPU_CYCLES))) |