diff options
author | Peter Zijlstra <peterz@infradead.org> | 2016-01-26 06:17:08 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-01-29 02:35:30 -0500 |
commit | 6e801e016917989ab8a7ddfc4229a15a5621622a (patch) | |
tree | 686a1b6ed2e8f8520df8a7a01e4329fa398a11bf | |
parent | 07c4a776135ea6d808ea19aabeb51de6b8648402 (diff) |
perf: Fix STATE_EXIT usage
We should never attempt to enable a STATE_EXIT event.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r-- | kernel/events/core.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index d345964c2bd6..d84374fa44e5 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c | |||
@@ -2253,7 +2253,8 @@ static void __perf_event_enable(struct perf_event *event, | |||
2253 | struct perf_event *leader = event->group_leader; | 2253 | struct perf_event *leader = event->group_leader; |
2254 | struct perf_event_context *task_ctx; | 2254 | struct perf_event_context *task_ctx; |
2255 | 2255 | ||
2256 | if (event->state >= PERF_EVENT_STATE_INACTIVE) | 2256 | if (event->state >= PERF_EVENT_STATE_INACTIVE || |
2257 | event->state <= PERF_EVENT_STATE_ERROR) | ||
2257 | return; | 2258 | return; |
2258 | 2259 | ||
2259 | update_context_time(ctx); | 2260 | update_context_time(ctx); |
@@ -2298,7 +2299,8 @@ static void _perf_event_enable(struct perf_event *event) | |||
2298 | struct perf_event_context *ctx = event->ctx; | 2299 | struct perf_event_context *ctx = event->ctx; |
2299 | 2300 | ||
2300 | raw_spin_lock_irq(&ctx->lock); | 2301 | raw_spin_lock_irq(&ctx->lock); |
2301 | if (event->state >= PERF_EVENT_STATE_INACTIVE) { | 2302 | if (event->state >= PERF_EVENT_STATE_INACTIVE || |
2303 | event->state < PERF_EVENT_STATE_ERROR) { | ||
2302 | raw_spin_unlock_irq(&ctx->lock); | 2304 | raw_spin_unlock_irq(&ctx->lock); |
2303 | return; | 2305 | return; |
2304 | } | 2306 | } |