| From 8455e6ec70f33b0e8c3ffd47067e00481f09f454 Mon Sep 17 00:00:00 2001 |
| From: Will Deacon <will.deacon@arm.com> |
| Date: Tue, 20 Aug 2013 11:47:41 +0100 |
| Subject: arm64: perf: fix group validation when using enable_on_exec |
| |
| From: Will Deacon <will.deacon@arm.com> |
| |
| commit 8455e6ec70f33b0e8c3ffd47067e00481f09f454 upstream. |
| |
| This is a port of cb2d8b342aa0 ("ARM: 7698/1: perf: fix group validation |
| when using enable_on_exec") to arm64, which fixes the event validation |
| checking so that events in the OFF state are still considered when |
| enable_on_exec is true. |
| |
| Signed-off-by: Will Deacon <will.deacon@arm.com> |
| Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/arm64/kernel/perf_event.c | 5 ++++- |
| 1 file changed, 4 insertions(+), 1 deletion(-) |
| |
| --- a/arch/arm64/kernel/perf_event.c |
| +++ b/arch/arm64/kernel/perf_event.c |
| @@ -325,7 +325,10 @@ validate_event(struct pmu_hw_events *hw_ |
| if (is_software_event(event)) |
| return 1; |
| |
| - if (event->pmu != leader_pmu || event->state <= PERF_EVENT_STATE_OFF) |
| + if (event->pmu != leader_pmu || event->state < PERF_EVENT_STATE_OFF) |
| + return 1; |
| + |
| + if (event->state == PERF_EVENT_STATE_OFF && !event->attr.enable_on_exec) |
| return 1; |
| |
| return armpmu->get_event_idx(hw_events, &fake_event) >= 0; |
