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

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

perf: Add lockdep assertions 



Make various bugs easier to see.

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 f5540ecb

kernel/events/core.c

+8 −2
Original line number Diff line number Diff line
@@ -1246,6 +1246,8 @@ ctx_group_list(struct perf_event *event, struct perf_event_context *ctx) 
static void

list_add_event(struct perf_event *event, struct perf_event_context *ctx)

{

	lockdep_assert_held(&ctx->lock);



	WARN_ON_ONCE(event->attach_state & PERF_ATTACH_CONTEXT);

	event->attach_state |= PERF_ATTACH_CONTEXT;
@@ -2342,8 +2344,10 @@ static void ctx_sched_out(struct perf_event_context *ctx, 
			  struct perf_cpu_context *cpuctx,

			  enum event_type_t event_type)

{

	struct perf_event *event;

	int is_active = ctx->is_active;

	struct perf_event *event;



	lockdep_assert_held(&ctx->lock);



	ctx->is_active &= ~event_type;

	if (likely(!ctx->nr_events))
@@ -2725,8 +2729,10 @@ ctx_sched_in(struct perf_event_context *ctx, 
	     enum event_type_t event_type,

	     struct task_struct *task)

{

	u64 now;

	int is_active = ctx->is_active;

	u64 now;



	lockdep_assert_held(&ctx->lock);



	ctx->is_active |= event_type;

	if (likely(!ctx->nr_events))