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

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

perf/core: Simplify perf_event_free_task() 



We have ctx->event_list that contains all events; no need to
repeatedly iterate the group lists to find them all.

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Oleg Nesterov <oleg@redhat.com>
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>
Cc: fweisbec@gmail.com
Link: http://lkml.kernel.org/r/20170316125823.239678244@infradead.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent e7cc4865

kernel/events/core.c

+1 −11
Original line number Diff line number Diff line
@@ -10426,21 +10426,11 @@ void perf_event_free_task(struct task_struct *task) 
		WRITE_ONCE(ctx->task, TASK_TOMBSTONE);

		put_task_struct(task); /* cannot be last */

		raw_spin_unlock_irq(&ctx->lock);

again:

		list_for_each_entry_safe(event, tmp, &ctx->pinned_groups,

				group_entry)

			perf_free_event(event, ctx);



		list_for_each_entry_safe(event, tmp, &ctx->flexible_groups,

				group_entry)

		list_for_each_entry_safe(event, tmp, &ctx->event_list, event_entry)

			perf_free_event(event, ctx);



		if (!list_empty(&ctx->pinned_groups) ||

				!list_empty(&ctx->flexible_groups))

			goto again;



		mutex_unlock(&ctx->mutex);



		put_ctx(ctx);

	}

}