Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e801e01 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

perf: Fix STATE_EXIT usage 



We should never attempt to enable a STATE_EXIT event.

Signed-off-by: default avatarPeter 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: default avatarIngo Molnar <mingo@kernel.org>
parent 07c4a776

kernel/events/core.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -2253,7 +2253,8 @@ static void __perf_event_enable(struct perf_event *event, 
	struct perf_event *leader = event->group_leader;

	struct perf_event *leader = event->group_leader;

	struct perf_event_context *task_ctx;

	struct perf_event_context *task_ctx;





	if (event->state >= PERF_EVENT_STATE_INACTIVE)

	if (event->state >= PERF_EVENT_STATE_INACTIVE ||

	    event->state <= PERF_EVENT_STATE_ERROR)

		return;

		return;





	update_context_time(ctx);

	update_context_time(ctx);
@@ -2298,7 +2299,8 @@ static void _perf_event_enable(struct perf_event *event) 
	struct perf_event_context *ctx = event->ctx;

	struct perf_event_context *ctx = event->ctx;





	raw_spin_lock_irq(&ctx->lock);

	raw_spin_lock_irq(&ctx->lock);

	if (event->state >= PERF_EVENT_STATE_INACTIVE) {

	if (event->state >= PERF_EVENT_STATE_INACTIVE ||

	    event->state <  PERF_EVENT_STATE_ERROR) {

		raw_spin_unlock_irq(&ctx->lock);

		raw_spin_unlock_irq(&ctx->lock);

		return;

		return;

	}

	}